summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/libopie.pro13
-rw-r--r--libopie2/opiepim/backend/backends.pro22
-rw-r--r--libopie2/opiepim/opiepim.pro7
3 files changed, 18 insertions, 24 deletions
diff --git a/libopie/libopie.pro b/libopie/libopie.pro
index 145743d..783c11d 100644
--- a/libopie/libopie.pro
+++ b/libopie/libopie.pro
@@ -1,3 +1,3 @@
1TEMPLATE = lib 1TEMPLATE = lib
2CONFIG += qte warn_on release 2CONFIG += qte warn_on
3HEADERS = ofontmenu.h \ 3HEADERS = ofontmenu.h \
@@ -97,13 +97,2 @@ LIBS += -lqpe
97 97
98# Add SQL-Support if selected by config (eilers)
99CONFTEST = $$system( echo $CONFIG_SQL_PIM_BACKEND )
100contains( CONFTEST, y ){
101
102DEFINES += __USE_SQL
103LIBS += -lopiedb2
104HEADERS += pim/otodoaccesssql.h pim/ocontactaccessbackend_sql.h pim/odatebookaccessbackend_sql.h
105SOURCES += pim/otodoaccesssql.cpp pim/ocontactaccessbackend_sql.cpp pim/odatebookaccessbackend_sql.cpp
106
107}
108
109INTERFACES = otimepickerbase.ui orecurrancebase.ui 98INTERFACES = otimepickerbase.ui orecurrancebase.ui
diff --git a/libopie2/opiepim/backend/backends.pro b/libopie2/opiepim/backend/backends.pro
index 953d928..7049aab 100644
--- a/libopie2/opiepim/backend/backends.pro
+++ b/libopie2/opiepim/backend/backends.pro
@@ -1,2 +1,2 @@
1SOURCES += core/backends/ocontactaccessbackend_sql.cpp \ 1SOURCES += \
2 core/backends/ocontactaccessbackend_vcard.cpp \ 2 core/backends/ocontactaccessbackend_vcard.cpp \
@@ -11,8 +11,7 @@ SOURCES += core/backends/ocontactaccessbackend_sql.cpp \
11 core/backends/otodoaccessxml.cpp \ 11 core/backends/otodoaccessxml.cpp \
12 core/backends/odatebookaccess.cpp \ 12 core/backends/odatebookaccess.cpp
13 core/backends/odatebookaccessbackend_sql.cpp
14 13
15HEADERS += core/backends/obackendfactory.h \ 14HEADERS += \
15 core/backends/obackendfactory.h \
16 core/backends/ocontactaccessbackend.h \ 16 core/backends/ocontactaccessbackend.h \
17 core/backends/ocontactaccessbackend_sql.h \
18 core/backends/ocontactaccessbackend_vcard.h \ 17 core/backends/ocontactaccessbackend_vcard.h \
@@ -21,3 +20,2 @@ HEADERS += core/backends/obackendfactory.h \
21 core/backends/odatebookaccessbackend.h \ 20 core/backends/odatebookaccessbackend.h \
22 core/backends/odatebookaccessbackend_sql.h \
23 core/backends/odatebookaccessbackend_xml.h \ 21 core/backends/odatebookaccessbackend_xml.h \
@@ -27,3 +25,2 @@ HEADERS += core/backends/obackendfactory.h \
27 core/backends/otodoaccess.h \ 25 core/backends/otodoaccess.h \
28 core/backends/otodoaccesssql.h \
29 core/backends/otodoaccessvcal.h \ 26 core/backends/otodoaccessvcal.h \
@@ -31 +28,12 @@ HEADERS += core/backends/obackendfactory.h \
31 core/backends/odatebookaccess.h 28 core/backends/odatebookaccess.h
29
30contains( ENABLE_SQL_PIM_BACKEND, y ) {
31 DEFINES += __USE_SQL
32 LIBS += -lopiedb2
33 HEADERS += core/backends/otodoaccesssql.h \
34 core/backends/ocontactaccessbackend_sql.h \
35 core/backends/odatebookaccessbackend_sql.h
36 SOURCES += core/backends/otodoaccesssql.cpp \
37 core/backends/ocontactaccessbackend_sql.cpp \
38 core/backends/odatebookaccessbackend_sql.cpp
39}
diff --git a/libopie2/opiepim/opiepim.pro b/libopie2/opiepim/opiepim.pro
index c328315..416765e 100644
--- a/libopie2/opiepim/opiepim.pro
+++ b/libopie2/opiepim/opiepim.pro
@@ -1,3 +1,3 @@
1TEMPLATE = lib 1TEMPLATE = lib
2CONFIG += qt warn_on debug 2CONFIG += qt warn_on
3DESTDIR = $(OPIEDIR)/lib 3DESTDIR = $(OPIEDIR)/lib
@@ -10,3 +10,3 @@ INTERFACES =
10TARGET = opiepim2 10TARGET = opiepim2
11VERSION = 1.8.4 11VERSION = 1.8.5
12INCLUDEPATH += $(OPIEDIR)/include 12INCLUDEPATH += $(OPIEDIR)/include
@@ -19,5 +19,2 @@ include ( ui/ui.pro )
19 19
20contains( ENABLE_SQL_PIM_BACKEND, y )
21 LIBS += -lopiedb2
22
23!contains( platform, x11 ) { 20!contains( platform, x11 ) {