summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--kabc/converter/sharpdtm/sharpdtmE.pro30
-rw-r--r--kabc/plugins/sharpdtm/sharpdtmE.pro6
-rw-r--r--kabc/plugins/sharpdtm/sharpdtmconverter.cpp (renamed from kabc/converter/sharpdtm/sharpdtmconverter.cpp)0
-rw-r--r--kabc/plugins/sharpdtm/sharpdtmconverter.h (renamed from kabc/converter/sharpdtm/sharpdtmconverter.h)0
4 files changed, 4 insertions, 32 deletions
diff --git a/kabc/converter/sharpdtm/sharpdtmE.pro b/kabc/converter/sharpdtm/sharpdtmE.pro
deleted file mode 100644
index 89b4e64..0000000
--- a/kabc/converter/sharpdtm/sharpdtmE.pro
+++ b/dev/null
@@ -1,30 +0,0 @@
-TEMPLATE = lib
-INCLUDEPATH += . ../.. $(SHARPDTMSDK)/include ../../../microkde ../../../microkde/kdecore $(QPEDIR)/include
-#CONFIG += staticlib
-OBJECTS_DIR = obj/$(PLATFORM)
-MOC_DIR = moc/$(PLATFORM)
-
-#for static linkage, put it here
-#DESTDIR=../../lib/$(PLATFORM)
-
-#for dynamic linkage, put it here
-DESTDIR=$(QPEDIR)/lib
-
-LIBS += -lmicrokde
-LIBS += -lmicrokabc
-LIBS += -L$(QPEDIR)/lib
-#LIBS += -lqpepim
-LIBS += -lqpe
-LIBS += -lzdtm
-
-TARGET = microkabc_sharpdtmconverter
-
-# Input
-
-HEADERS += \
- sharpdtmconverter.h \
-
-
-SOURCES += \
- sharpdtmconverter.cpp \
-
diff --git a/kabc/plugins/sharpdtm/sharpdtmE.pro b/kabc/plugins/sharpdtm/sharpdtmE.pro
index a03454f..54ef083 100644
--- a/kabc/plugins/sharpdtm/sharpdtmE.pro
+++ b/kabc/plugins/sharpdtm/sharpdtmE.pro
@@ -4,3 +4,3 @@ TARGET = microkabc_sharpdtm
-INCLUDEPATH += ../.. $(SHARPDTMSDK)/include ../../converter/sharpdtm ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../qtcompat $(QPEDIR)/include
+INCLUDEPATH += ../.. $(SHARPDTMSDK)/include ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../qtcompat $(QPEDIR)/include
@@ -16,3 +16,3 @@ LIBS += -lqte
LIBS += -lzdtm
-LIBS += -lmicrokabc_sharpdtmconverter
+
@@ -24,2 +24,3 @@ HEADERS = \
resourcesharpdtmconfig.h \
+ sharpdtmconverter.h
@@ -28,2 +29,3 @@ SOURCES = \
resourcesharpdtmconfig.cpp \
+ sharpdtmconverter.cpp
diff --git a/kabc/converter/sharpdtm/sharpdtmconverter.cpp b/kabc/plugins/sharpdtm/sharpdtmconverter.cpp
index 8f8334e..8f8334e 100644
--- a/kabc/converter/sharpdtm/sharpdtmconverter.cpp
+++ b/kabc/plugins/sharpdtm/sharpdtmconverter.cpp
diff --git a/kabc/converter/sharpdtm/sharpdtmconverter.h b/kabc/plugins/sharpdtm/sharpdtmconverter.h
index 99e0413..99e0413 100644
--- a/kabc/converter/sharpdtm/sharpdtmconverter.h
+++ b/kabc/plugins/sharpdtm/sharpdtmconverter.h