author | ulf69 <ulf69> | 2004-07-26 22:16:13 (UTC) |
---|---|---|
committer | ulf69 <ulf69> | 2004-07-26 22:16:13 (UTC) |
commit | ebbf4f7ac33ccaa1d1c46647b58a92da4a552615 (patch) (side-by-side diff) | |
tree | 85106123e4be215d571522a2524fb9ba10103fd3 /kabc | |
parent | d7336fb5466f19b2757392fa96b7c4eb713b7bd9 (diff) | |
download | kdepimpi-ebbf4f7ac33ccaa1d1c46647b58a92da4a552615.zip kdepimpi-ebbf4f7ac33ccaa1d1c46647b58a92da4a552615.tar.gz kdepimpi-ebbf4f7ac33ccaa1d1c46647b58a92da4a552615.tar.bz2 |
transfered converter to the resource plugin
-rw-r--r-- | kabc/converter/qtopia/qtopiaE.pro | 29 | ||||
-rw-r--r-- | kabc/plugins/qtopia/qtopiaE.pro | 9 | ||||
-rw-r--r-- | kabc/plugins/qtopia/qtopiaconverter.cpp (renamed from kabc/converter/qtopia/qtopiaconverter.cpp) | 0 | ||||
-rw-r--r-- | kabc/plugins/qtopia/qtopiaconverter.h (renamed from kabc/converter/qtopia/qtopiaconverter.h) | 0 |
4 files changed, 5 insertions, 33 deletions
diff --git a/kabc/converter/qtopia/qtopiaE.pro b/kabc/converter/qtopia/qtopiaE.pro deleted file mode 100644 index ab47091..0000000 --- a/kabc/converter/qtopia/qtopiaE.pro +++ b/dev/null @@ -1,29 +0,0 @@ -TEMPLATE = lib -INCLUDEPATH += . ../.. ../../../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 - -TARGET = microkabc_qtopiaconverter - -# Input - -HEADERS += \ - qtopiaconverter.h \ - - -SOURCES += \ - qtopiaconverter.cpp \ - diff --git a/kabc/plugins/qtopia/qtopiaE.pro b/kabc/plugins/qtopia/qtopiaE.pro index d9fa87f..56eae87 100644 --- a/kabc/plugins/qtopia/qtopiaE.pro +++ b/kabc/plugins/qtopia/qtopiaE.pro @@ -4,5 +4,5 @@ CONFIG += qt warn_on TARGET = microkabc_qtopia -INCLUDEPATH += ../.. ../../converter/qtopia ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../qtcompat $(QPEDIR)/include +INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../qtcompat $(QPEDIR)/include OBJECTS_DIR = obj/$(PLATFORM) @@ -14,5 +14,4 @@ LIBS += -L$(QPEDIR)/lib LIBS += -lqpepim LIBS += -lqpe -LIBS += -lmicrokabc_qtopiaconverter INTERFACES = \ @@ -20,7 +19,9 @@ INTERFACES = \ HEADERS = \ resourceqtopia.h \ - resourceqtopiaconfig.h + resourceqtopiaconfig.h \ + qtopiaconverter.h SOURCES = \ resourceqtopia.cpp \ - resourceqtopiaconfig.cpp + resourceqtopiaconfig.cpp \ + qtopiaconverter.cpp diff --git a/kabc/converter/qtopia/qtopiaconverter.cpp b/kabc/plugins/qtopia/qtopiaconverter.cpp index ac513b6..ac513b6 100644 --- a/kabc/converter/qtopia/qtopiaconverter.cpp +++ b/kabc/plugins/qtopia/qtopiaconverter.cpp diff --git a/kabc/converter/qtopia/qtopiaconverter.h b/kabc/plugins/qtopia/qtopiaconverter.h index 8f4c698..8f4c698 100644 --- a/kabc/converter/qtopia/qtopiaconverter.h +++ b/kabc/plugins/qtopia/qtopiaconverter.h |