summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--kaddressbook/kaddressbook.pro4
-rw-r--r--korganizer/korganizer.pro4
-rw-r--r--variables.pri1
3 files changed, 5 insertions, 4 deletions
diff --git a/kaddressbook/kaddressbook.pro b/kaddressbook/kaddressbook.pro
index f9d22d5..3386ffe 100644
--- a/kaddressbook/kaddressbook.pro
+++ b/kaddressbook/kaddressbook.pro
@@ -5,109 +5,109 @@ DESTDIR= ../bin
5 5
6include( ../variables.pri ) 6include( ../variables.pri )
7 7
8 8
9INCLUDEPATH += . ./details ./features ./xxport ../libkdepim ../microkde ../microkde/kdecore ../microkde/kutils ../microkde/kio/kfile ../microkde/kio/kio ../microkde/kdeui ../microkde/kresources ../kabc ../ interfaces 9INCLUDEPATH += . ./details ./features ./xxport ../libkdepim ../microkde ../microkde/kdecore ../microkde/kutils ../microkde/kio/kfile ../microkde/kio/kio ../microkde/kdeui ../microkde/kresources ../kabc ../ interfaces
10DEFINES += KAB_EMBEDDED KAB_NOSPLITTER DESKTOP_VERSION 10DEFINES += KAB_EMBEDDED KAB_NOSPLITTER DESKTOP_VERSION
11 11
12unix : { 12unix : {
13 13
14staticlib: { 14staticlib: {
15LIBS += ../bin/libmicrokabc_qtopia.a 15LIBS += ../bin/libmicrokabc_qtopia.a
16LIBS += ../bin/libmicrokabc_file.a 16LIBS += ../bin/libmicrokabc_file.a
17LIBS += ../bin/libmicrokabc_dir.a 17LIBS += ../bin/libmicrokabc_dir.a
18LIBS += ../bin/libmicrokdepim.a 18LIBS += ../bin/libmicrokdepim.a
19LIBS += ../bin/libmicrokcal.a 19LIBS += ../bin/libmicrokcal.a
20LIBS += ../bin/libmicrokabc.a 20LIBS += ../bin/libmicrokabc.a
21LIBS += ../bin/libmicrokde.a 21LIBS += ../bin/libmicrokde.a
22LIBS += ../bin/libmicrokabc_qtopia.a 22LIBS += ../bin/libmicrokabc_qtopia.a
23LIBS += ../bin/libmicrokabc_file.a 23LIBS += ../bin/libmicrokabc_file.a
24LIBS += ../bin/libmicrokabc_dir.a 24LIBS += ../bin/libmicrokabc_dir.a
25LIBS += ../bin/libmicrokdepim.a 25LIBS += ../bin/libmicrokdepim.a
26LIBS += ../bin/libmicrokcal.a 26LIBS += ../bin/libmicrokcal.a
27LIBS += ../bin/libmicrokabc.a 27LIBS += ../bin/libmicrokabc.a
28LIBS += ../bin/libmicrokde.a 28LIBS += ../bin/libmicrokde.a
29LIBS += ../libical/lib/libical.a 29LIBS += ../libical/lib/libical.a
30LIBS += ../libical/lib/libicalss.a 30LIBS += ../libical/lib/libicalss.a
31 31
32} else { 32} else {
33LIBS += ../bin/libmicrokdepim.so 33LIBS += ../bin/libmicrokdepim.so
34LIBS += ../bin/libmicrokde.so 34LIBS += ../bin/libmicrokde.so
35LIBS += ../bin/libmicrokabc.so 35LIBS += ../bin/libmicrokabc.so
36LIBS += ../bin/libmicrokcal.so 36LIBS += ../bin/libmicrokcal.so
37#LIBS += -lldap 37#LIBS += -lldap
38} 38}
39OBJECTS_DIR = obj/unix 39OBJECTS_DIR = obj/unix
40MOC_DIR = moc/unix 40MOC_DIR = moc/unix
41} 41}
42win32: { 42win32: {
43RC_FILE = winicons.rc 43RC_FILE = winicons.rc
44DEFINES += _WIN32_ 44DEFINES += _WIN32_
45LIBS += ../bin/microkdepim.lib 45LIBS += ../bin/microkdepim.lib
46LIBS += ../bin/microkcal.lib 46LIBS += ../bin/microkcal.lib
47LIBS += ../bin/microkde.lib 47LIBS += ../bin/microkde.lib
48LIBS += ../bin/microkabc.lib 48LIBS += ../bin/microkabc.lib
49QMAKE_LINK += /NODEFAULTLIB:LIBC 49QMAKE_LINK += /NODEFAULTLIB:LIBC
50OBJECTS_DIR = obj/win 50OBJECTS_DIR = obj/win
51MOC_DIR = moc/win 51MOC_DIR = moc/win
52#olimport section 52#olimport section
53#blabla: { 53importol {
54debug: { 54debug: {
55LIBS += mfc71ud.lib 55LIBS += mfc71ud.lib
56} 56}
57release: { 57release: {
58LIBS += mfc71u.lib 58LIBS += mfc71u.lib
59} 59}
60DEFINES += _OL_IMPORT_ 60DEFINES += _OL_IMPORT_
61HEADERS = ../outport/msoutl9.h \ 61HEADERS = ../outport/msoutl9.h \
62 kaimportoldialog.h 62 kaimportoldialog.h
63SOURCES = ../outport/msoutl9.cpp \ 63SOURCES = ../outport/msoutl9.cpp \
64 kaimportoldialog.cpp 64 kaimportoldialog.cpp
65#} 65}
66#olimport section end 66#olimport section end
67} 67}
68 68
69INTERFACES = \ 69INTERFACES = \
70# filteredit_base.ui \ 70# filteredit_base.ui \
71# kofilterview_base.ui \ 71# kofilterview_base.ui \
72 72
73HEADERS += \ 73HEADERS += \
74features/mergewidget.h \ 74features/mergewidget.h \
75features/distributionlistwidget.h \ 75features/distributionlistwidget.h \
76kcmconfigs/addresseewidget.h \ 76kcmconfigs/addresseewidget.h \
77kcmconfigs/extensionconfigdialog.h \ 77kcmconfigs/extensionconfigdialog.h \
78kcmconfigs/kcmkabconfig.h \ 78kcmconfigs/kcmkabconfig.h \
79kcmconfigs/kabconfigwidget.h \ 79kcmconfigs/kabconfigwidget.h \
80addresseeeditordialog.h \ 80addresseeeditordialog.h \
81addresseeeditorwidget.h \ 81addresseeeditorwidget.h \
82addresseditwidget.h \ 82addresseditwidget.h \
83addresseeconfig.h \ 83addresseeconfig.h \
84addresseeutil.h \ 84addresseeutil.h \
85emaileditwidget.h \ 85emaileditwidget.h \
86filtereditdialog.h \ 86filtereditdialog.h \
87kaddressbookmain.h \ 87kaddressbookmain.h \
88kabprefs.h \ 88kabprefs.h \
89kabcore.h \ 89kabcore.h \
90viewmanager.h \ 90viewmanager.h \
91extensionmanager.h \ 91extensionmanager.h \
92extensionwidget.h \ 92extensionwidget.h \
93kaddressbookview.h \ 93kaddressbookview.h \
94geowidget.h \ 94geowidget.h \
95imagewidget.h \ 95imagewidget.h \
96incsearchwidget.h \ 96incsearchwidget.h \
97jumpbuttonbar.h \ 97jumpbuttonbar.h \
98phoneeditwidget.h \ 98phoneeditwidget.h \
99secrecywidget.h \ 99secrecywidget.h \
100keywidget.h \ 100keywidget.h \
101nameeditdialog.h \ 101nameeditdialog.h \
102filter.h \ 102filter.h \
103addviewdialog.h \ 103addviewdialog.h \
104configurewidget.h \ 104configurewidget.h \
105viewconfigurewidget.h \ 105viewconfigurewidget.h \
106viewconfigurefieldspage.h \ 106viewconfigurefieldspage.h \
107viewconfigurefilterpage.h \ 107viewconfigurefilterpage.h \
108typecombo.h \ 108typecombo.h \
109undo.h \ 109undo.h \
110undocmds.h \ 110undocmds.h \
111xxportmanager.h \ 111xxportmanager.h \
112xxportobject.h \ 112xxportobject.h \
113xxportselectdialog.h \ 113xxportselectdialog.h \
diff --git a/korganizer/korganizer.pro b/korganizer/korganizer.pro
index bb5f29e..0750083 100644
--- a/korganizer/korganizer.pro
+++ b/korganizer/korganizer.pro
@@ -14,113 +14,113 @@ DEFINES += KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER
14#KORG_NOPRINTER KORG_NOKABC KORG_NODND 14#KORG_NOPRINTER KORG_NOKABC KORG_NODND
15DEFINES += KORG_NOLVALTERNATION 15DEFINES += KORG_NOLVALTERNATION
16DEFINES += DESKTOP_VERSION 16DEFINES += DESKTOP_VERSION
17unix : { 17unix : {
18staticlib: { 18staticlib: {
19LIBS += ../bin/libmicrokabc_qtopia.a 19LIBS += ../bin/libmicrokabc_qtopia.a
20LIBS += ../bin/libmicrokabc_file.a 20LIBS += ../bin/libmicrokabc_file.a
21LIBS += ../bin/libmicrokabc_dir.a 21LIBS += ../bin/libmicrokabc_dir.a
22LIBS += ../bin/libmicrokdepim.a 22LIBS += ../bin/libmicrokdepim.a
23LIBS += ../bin/libmicrokcal.a 23LIBS += ../bin/libmicrokcal.a
24LIBS += ../bin/libmicrokabc.a 24LIBS += ../bin/libmicrokabc.a
25LIBS += ../bin/libmicrokde.a 25LIBS += ../bin/libmicrokde.a
26LIBS += ../bin/libmicrokabc_qtopia.a 26LIBS += ../bin/libmicrokabc_qtopia.a
27LIBS += ../bin/libmicrokabc_file.a 27LIBS += ../bin/libmicrokabc_file.a
28LIBS += ../bin/libmicrokabc_dir.a 28LIBS += ../bin/libmicrokabc_dir.a
29LIBS += ../bin/libmicrokdepim.a 29LIBS += ../bin/libmicrokdepim.a
30LIBS += ../bin/libmicrokcal.a 30LIBS += ../bin/libmicrokcal.a
31LIBS += ../bin/libmicrokabc.a 31LIBS += ../bin/libmicrokabc.a
32LIBS += ../bin/libmicrokde.a 32LIBS += ../bin/libmicrokde.a
33LIBS += ../libical/lib/libical.a 33LIBS += ../libical/lib/libical.a
34LIBS += ../libical/lib/libicalss.a 34LIBS += ../libical/lib/libicalss.a
35} else { 35} else {
36LIBS += ../bin/libmicrokdepim.so 36LIBS += ../bin/libmicrokdepim.so
37LIBS += ../bin/libmicrokcal.so 37LIBS += ../bin/libmicrokcal.so
38LIBS += ../bin/libmicrokde.so 38LIBS += ../bin/libmicrokde.so
39LIBS += ../bin/libmicrokabc.so 39LIBS += ../bin/libmicrokabc.so
40#LIBS += -lbluetooth 40#LIBS += -lbluetooth
41#LIBS += -lsdp 41#LIBS += -lsdp
42 42
43#LIBS += -lldap 43#LIBS += -lldap
44} 44}
45OBJECTS_DIR = obj/unix 45OBJECTS_DIR = obj/unix
46MOC_DIR = moc/unix 46MOC_DIR = moc/unix
47} 47}
48win32: { 48win32: {
49RC_FILE = winicons.rc 49RC_FILE = winicons.rc
50DEFINES += _WIN32_ 50DEFINES += _WIN32_
51LIBS += ../bin/microkdepim.lib 51LIBS += ../bin/microkdepim.lib
52LIBS += ../bin/microkcal.lib 52LIBS += ../bin/microkcal.lib
53LIBS += ../bin/microkde.lib 53LIBS += ../bin/microkde.lib
54LIBS += ../bin/microkabc.lib 54LIBS += ../bin/microkabc.lib
55LIBS += ../libical/lib/ical.lib 55LIBS += ../libical/lib/ical.lib
56LIBS += ../libical/lib/icalss.lib 56LIBS += ../libical/lib/icalss.lib
57#LIBS += atls.lib 57#LIBS += atls.lib
58QMAKE_LINK += /NODEFAULTLIB:LIBC 58QMAKE_LINK += /NODEFAULTLIB:LIBC
59OBJECTS_DIR = obj/win 59OBJECTS_DIR = obj/win
60MOC_DIR = moc/win 60MOC_DIR = moc/win
61#olimport section 61#olimport section
62#blabla: { 62importol: {
63debug: { 63debug: {
64LIBS += mfc71ud.lib 64LIBS += mfc71ud.lib
65QMAKE_LINK += /NODEFAULTLIB:MSVCRT 65QMAKE_LINK += /NODEFAULTLIB:MSVCRT
66QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib 66QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib
67} 67}
68release: { 68release: {
69LIBS += mfc71u.lib 69LIBS += mfc71u.lib
70} 70}
71DEFINES += _OL_IMPORT_ 71DEFINES += _OL_IMPORT_
72 72
73HEADERS += ../outport/msoutl9.h \ 73HEADERS += ../outport/msoutl9.h \
74 koimportoldialog.h 74 koimportoldialog.h
75 75
76SOURCES += ../outport/msoutl9.cpp \ 76SOURCES += ../outport/msoutl9.cpp \
77 koimportoldialog.cpp 77 koimportoldialog.cpp
78#} 78}
79#olimport section end 79#olimport section end
80 80
81} 81}
82 82
83 83
84INTERFACES = kofilterview_base.ui 84INTERFACES = kofilterview_base.ui
85#filteredit_base.ui 85#filteredit_base.ui
86 86
87# kdateedit.h \ 87# kdateedit.h \
88 88
89HEADERS += datenavigatorcontainer.h \ 89HEADERS += datenavigatorcontainer.h \
90 filteredit_base.h \ 90 filteredit_base.h \
91 alarmclient.h \ 91 alarmclient.h \
92 calendarview.h \ 92 calendarview.h \
93 customlistviewitem.h \ 93 customlistviewitem.h \
94 datenavigator.h \ 94 datenavigator.h \
95 docprefs.h \ 95 docprefs.h \
96 filtereditdialog.h \ 96 filtereditdialog.h \
97 incomingdialog.h \ 97 incomingdialog.h \
98 incomingdialog_base.h \ 98 incomingdialog_base.h \
99 interfaces/korganizer/baseview.h \ 99 interfaces/korganizer/baseview.h \
100 interfaces/korganizer/calendarviewbase.h \ 100 interfaces/korganizer/calendarviewbase.h \
101 journalentry.h \ 101 journalentry.h \
102 kdatenavigator.h \ 102 kdatenavigator.h \
103 koagenda.h \ 103 koagenda.h \
104 koagendaitem.h \ 104 koagendaitem.h \
105 koagendaview.h \ 105 koagendaview.h \
106 kocounterdialog.h \ 106 kocounterdialog.h \
107 kodaymatrix.h \ 107 kodaymatrix.h \
108 kodialogmanager.h \ 108 kodialogmanager.h \
109 koeditordetails.h \ 109 koeditordetails.h \
110 koeditorgeneral.h \ 110 koeditorgeneral.h \
111 koeditorgeneralevent.h \ 111 koeditorgeneralevent.h \
112 koeditorgeneraltodo.h \ 112 koeditorgeneraltodo.h \
113 koeditorrecurrence.h \ 113 koeditorrecurrence.h \
114 koeventeditor.h \ 114 koeventeditor.h \
115 koeventpopupmenu.h \ 115 koeventpopupmenu.h \
116 koeventview.h \ 116 koeventview.h \
117 koeventviewer.h \ 117 koeventviewer.h \
118 koeventviewerdialog.h \ 118 koeventviewerdialog.h \
119 kofilterview.h \ 119 kofilterview.h \
120 koglobals.h \ 120 koglobals.h \
121 koincidenceeditor.h \ 121 koincidenceeditor.h \
122 kojournalview.h \ 122 kojournalview.h \
123 kolistview.h \ 123 kolistview.h \
124 kolocationbox.h \ 124 kolocationbox.h \
125 komonthview.h \ 125 komonthview.h \
126 koprefs.h \ 126 koprefs.h \
diff --git a/variables.pri b/variables.pri
index 67c144d..4144b8e 100644
--- a/variables.pri
+++ b/variables.pri
@@ -1,13 +1,14 @@
1 1
2# variables settings for compilation for Linux desktop and Qt 3.x.x 2# variables settings for compilation for Linux desktop and Qt 3.x.x
3 3
4unix { 4unix {
5CONFIG += release 5CONFIG += release
6#for statically linking 6#for statically linking
7#CONFIG += staticlib 7#CONFIG += staticlib
8} 8}
9win32 { 9win32 {
10CONFIG += release 10CONFIG += release
11CONFIG += importol
11 12
12} 13}
13CONFIG += thread 14CONFIG += thread