-rw-r--r-- | korganizer/korganizer.pro | 57 |
1 files changed, 32 insertions, 25 deletions
diff --git a/korganizer/korganizer.pro b/korganizer/korganizer.pro index df8f8d7..0f3b328 100644 --- a/korganizer/korganizer.pro +++ b/korganizer/korganizer.pro | |||
@@ -1,67 +1,67 @@ | |||
1 | TEMPLATE= app | 1 | TEMPLATE= app |
2 | CONFIG = qt warn_on | 2 | CONFIG += qt warn_on |
3 | TARGET = kopi | 3 | TARGET = kopi |
4 | OBJECTS_DIR = _obj/ | 4 | OBJECTS_DIR = _obj/ |
5 | MOC_DIR = _moc | 5 | MOC_DIR = _moc |
6 | DESTDIR= ../bin | 6 | DESTDIR= ../bin |
7 | 7 | ||
8 | include( ../variables.pri ) | 8 | include( ../variables.pri ) |
9 | 9 | ||
10 | INCLUDEPATH += ../microkde ../ interfaces ../microkde/kdecore ../microkde/kdeui ../microkde/kio/kfile ../microkde/kio/kio ../libkdepim | 10 | INCLUDEPATH += ../microkde ../ interfaces ../microkde/kdecore ../microkde/kdeui ../microkde/kio/kfile ../microkde/kio/kio ../libkdepim |
11 | #../qtcompat | 11 | #../qtcompat |
12 | DEFINES += KORG_NOPLUGINS KORG_NOARCHIVE KORG_NOMAIL | 12 | DEFINES += KORG_NOPLUGINS KORG_NOARCHIVE KORG_NOMAIL |
13 | DEFINES += KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER | 13 | DEFINES += KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER |
14 | #KORG_NOPRINTER KORG_NOKABC KORG_NODND | 14 | #KORG_NOPRINTER KORG_NOKABC KORG_NODND |
15 | DEFINES += KORG_NOLVALTERNATION | 15 | DEFINES += KORG_NOLVALTERNATION |
16 | DEFINES += DESKTOP_VERSION | 16 | DEFINES += DESKTOP_VERSION |
17 | unix : { | 17 | unix : { |
18 | staticlib: { | 18 | staticlib: { |
19 | TARGET = kopi_linux | 19 | TARGET = kopi_linux |
20 | LIBS += ../bin/libmicrokabc_qtopia.a | 20 | LIBS += ../bin/libxmicrokabc_qtopia.a |
21 | LIBS += ../bin/libmicrokabc_file.a | 21 | LIBS += ../bin/libxmicrokabc_file.a |
22 | LIBS += ../bin/libmicrokabc_dir.a | 22 | LIBS += ../bin/libxmicrokabc_dir.a |
23 | LIBS += ../bin/libmicrokdepim.a | 23 | LIBS += ../bin/libxmicrokdepim.a |
24 | LIBS += ../bin/libmicrokcal.a | 24 | LIBS += ../bin/libxmicrokcal.a |
25 | LIBS += ../bin/libmicrokabc.a | 25 | LIBS += ../bin/libxmicrokabc.a |
26 | LIBS += ../bin/libmicrokde.a | 26 | LIBS += ../bin/libxmicrokde.a |
27 | LIBS += ../bin/libmicrokabc_qtopia.a | 27 | LIBS += ../bin/libxmicrokabc_qtopia.a |
28 | LIBS += ../bin/libmicrokabc_file.a | 28 | LIBS += ../bin/libxmicrokabc_file.a |
29 | LIBS += ../bin/libmicrokabc_dir.a | 29 | LIBS += ../bin/libxmicrokabc_dir.a |
30 | LIBS += ../bin/libmicrokdepim.a | 30 | LIBS += ../bin/libxmicrokdepim.a |
31 | LIBS += ../bin/libmicrokcal.a | 31 | LIBS += ../bin/libxmicrokcal.a |
32 | LIBS += ../bin/libmicrokabc.a | 32 | LIBS += ../bin/libxmicrokabc.a |
33 | LIBS += ../bin/libmicrokde.a | 33 | LIBS += ../bin/libxmicrokde.a |
34 | LIBS += ../libical/lib/libical.a | 34 | LIBS += ../libical/lib/libical.a |
35 | LIBS += ../libical/lib/libicalss.a | 35 | LIBS += ../libical/lib/libicalss.a |
36 | } else { | 36 | } else { |
37 | LIBS += ../bin/libmicrokdepim.so | 37 | LIBS += ../bin/libxmicrokdepim.so |
38 | LIBS += ../bin/libmicrokcal.so | 38 | LIBS += ../bin/libxmicrokcal.so |
39 | LIBS += ../bin/libmicrokde.so | 39 | LIBS += ../bin/libxmicrokde.so |
40 | LIBS += ../bin/libmicrokabc.so | 40 | LIBS += ../bin/libxmicrokabc.so |
41 | #LIBS += -lbluetooth | 41 | #LIBS += -lbluetooth |
42 | #LIBS += -lsdp | 42 | #LIBS += -lsdp |
43 | 43 | ||
44 | #LIBS += -lldap | 44 | #LIBS += -lldap |
45 | } | 45 | } |
46 | OBJECTS_DIR = obj/unix | 46 | OBJECTS_DIR = obj/unix |
47 | MOC_DIR = moc/unix | 47 | MOC_DIR = moc/unix |
48 | } | 48 | } |
49 | win32: { | 49 | win32: { |
50 | RC_FILE = winicons.rc | 50 | RC_FILE = winicons.rc |
51 | DEFINES += _WIN32_ | 51 | DEFINES += _WIN32_ |
52 | LIBS += ../bin/microkdepim.lib | 52 | LIBS += ../bin/xmicrokdepim.lib |
53 | LIBS += ../bin/microkcal.lib | 53 | LIBS += ../bin/xmicrokcal.lib |
54 | LIBS += ../bin/microkde.lib | 54 | LIBS += ../bin/xmicrokde.lib |
55 | LIBS += ../bin/microkabc.lib | 55 | LIBS += ../bin/xmicrokabc.lib |
56 | LIBS += ../libical/lib/ical.lib | 56 | LIBS += ../libical/lib/ical.lib |
57 | LIBS += ../libical/lib/icalss.lib | 57 | LIBS += ../libical/lib/icalss.lib |
58 | #LIBS += atls.lib | 58 | #LIBS += atls.lib |
59 | QMAKE_LINK += /NODEFAULTLIB:LIBC | 59 | QMAKE_LINK += /NODEFAULTLIB:LIBC |
60 | OBJECTS_DIR = obj/win | 60 | OBJECTS_DIR = obj/win |
61 | MOC_DIR = moc/win | 61 | MOC_DIR = moc/win |
62 | #olimport section | 62 | #olimport section |
63 | importol: { | 63 | importol: { |
64 | debug: { | 64 | debug: { |
65 | LIBS += mfc71ud.lib | 65 | LIBS += mfc71ud.lib |
66 | QMAKE_LINK += /NODEFAULTLIB:MSVCRT | 66 | QMAKE_LINK += /NODEFAULTLIB:MSVCRT |
67 | QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib | 67 | QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib |
@@ -76,25 +76,26 @@ HEADERS += ../outport/msoutl9.h \ | |||
76 | 76 | ||
77 | SOURCES += ../outport/msoutl9.cpp \ | 77 | SOURCES += ../outport/msoutl9.cpp \ |
78 | koimportoldialog.cpp | 78 | koimportoldialog.cpp |
79 | #olimport section end | 79 | #olimport section end |
80 | TARGET = kopi_xp | 80 | TARGET = kopi_xp |
81 | } else { | 81 | } else { |
82 | TARGET = kopi_me | 82 | TARGET = kopi_me |
83 | } | 83 | } |
84 | 84 | ||
85 | } | 85 | } |
86 | 86 | ||
87 | 87 | ||
88 | INTERFACES = kofilterview_base.ui | 88 | #The following line was changed from INTERFACES to FORMS3 by qt3to4 |
89 | FORMS3 = kofilterview_base.ui | ||
89 | #filteredit_base.ui | 90 | #filteredit_base.ui |
90 | 91 | ||
91 | # kdateedit.h \ | 92 | # kdateedit.h \ |
92 | 93 | ||
93 | HEADERS += datenavigatorcontainer.h \ | 94 | HEADERS += datenavigatorcontainer.h \ |
94 | filteredit_base.h \ | 95 | filteredit_base.h \ |
95 | alarmclient.h \ | 96 | alarmclient.h \ |
96 | calendarview.h \ | 97 | calendarview.h \ |
97 | customlistviewitem.h \ | 98 | customlistviewitem.h \ |
98 | datenavigator.h \ | 99 | datenavigator.h \ |
99 | docprefs.h \ | 100 | docprefs.h \ |
100 | filtereditdialog.h \ | 101 | filtereditdialog.h \ |
@@ -201,18 +202,24 @@ filteredit_base.cpp \ | |||
201 | outgoingdialog.cpp \ | 202 | outgoingdialog.cpp \ |
202 | outgoingdialog_base.cpp \ | 203 | outgoingdialog_base.cpp \ |
203 | publishdialog.cpp \ | 204 | publishdialog.cpp \ |
204 | publishdialog_base.cpp \ | 205 | publishdialog_base.cpp \ |
205 | savetemplatedialog.cpp \ | 206 | savetemplatedialog.cpp \ |
206 | searchdialog.cpp \ | 207 | searchdialog.cpp \ |
207 | statusdialog.cpp \ | 208 | statusdialog.cpp \ |
208 | timeline.cpp \ | 209 | timeline.cpp \ |
209 | timespanview.cpp \ | 210 | timespanview.cpp \ |
210 | ../kalarmd/alarmdialog.cpp | 211 | ../kalarmd/alarmdialog.cpp |
211 | 212 | ||
212 | HEADERS += calprintbase.h calprinter.h calprintplugins.h cellitem.h | 213 | HEADERS += calprintbase.h calprinter.h calprintplugins.h cellitem.h |
213 | INTERFACES += calprintdayconfig_base.ui \ | 214 | #The following line was changed from INTERFACES to FORMS3 by qt3to4 |
215 | FORMS3 += calprintdayconfig_base.ui \ | ||
214 | calprintmonthconfig_base.ui \ | 216 | calprintmonthconfig_base.ui \ |
215 | calprinttodoconfig_base.ui \ | 217 | calprinttodoconfig_base.ui \ |
216 | calprintweekconfig_base.ui | 218 | calprintweekconfig_base.ui |
217 | SOURCES += calprintbase.cpp calprinter.cpp calprintplugins.cpp cellitem.cpp | 219 | SOURCES += calprintbase.cpp calprinter.cpp calprintplugins.cpp cellitem.cpp |
218 | 220 | ||
221 | #The following line was inserted by qt3to4 | ||
222 | QT += xml qt3support | ||
223 | #The following line was inserted by qt3to4 | ||
224 | CONFIG += uic3 | ||
225 | |||