summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorValerio Valerio <valerio.valerio@jollamobile.com>2013-04-22 09:32:02 +0300
committerValerio Valerio <valerio.valerio@jollamobile.com>2013-04-26 10:37:41 +0200
commite116de6a0d4ccb58435105d2f7ecf5ea80c9541b (patch)
treee2aa42f89b7136f3e86a1ff1dce91a5c8459dbfd /examples
parenta5d645d6a7ca026c5e43c54b24891a4b8947e2a5 (diff)
Allow parallel installation of qt4 and qt5 builds
Signed-off-by: Valerio Valerio <valerio.valerio@jollamobile.com> Change-Id: I2c03d287fc871098cf45d75d4a1262b9c6c4378d Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au>
Diffstat (limited to 'examples')
-rw-r--r--examples/messagingaccounts/messagingaccounts.pro13
-rw-r--r--examples/qtmail/app/app.pro16
-rw-r--r--examples/qtmail/libs/qmfutil/qmfutil.pro9
-rw-r--r--examples/qtmail/plugins/composers/email/email.pro8
-rw-r--r--examples/qtmail/plugins/viewers/generic/generic.pro8
-rw-r--r--examples/serverobserver/serverobserver.pro16
6 files changed, 46 insertions, 24 deletions
diff --git a/examples/messagingaccounts/messagingaccounts.pro b/examples/messagingaccounts/messagingaccounts.pro
index 9b73dfcb..09de123f 100644
--- a/examples/messagingaccounts/messagingaccounts.pro
+++ b/examples/messagingaccounts/messagingaccounts.pro
@@ -1,9 +1,16 @@
TEMPLATE = app
-TARGET = messagingaccounts
target.path += $$QMF_INSTALL_ROOT/bin
CONFIG += qmfclient qmfmessageserver
-equals(QT_MAJOR_VERSION, 5): QT += widgets
+equals(QT_MAJOR_VERSION, 4){
+ TARGET = messagingaccounts
+ LIBS += -lqmfmessageserver -lqmfclient
+}
+equals(QT_MAJOR_VERSION, 5){
+ TARGET = messagingaccounts5
+ QT += widgets
+ LIBS += -lqmfmessageserver5 -lqmfclient5
+}
DEPENDPATH += .
@@ -24,8 +31,6 @@ LIBS += -L../../src/libraries/qmfclient/build \
macx:LIBS += -F../../src/libraries/qmfclient/build \
-F../../src/libraries/qmfmessageserver/build
-LIBS += -lqmfmessageserver -lqmfclient
-
HEADERS += $$QTMAIL_EXAMPLE/app/accountsettings.h \
$$QTMAIL_EXAMPLE/app/editaccount.h \
$$QTMAIL_EXAMPLE/app/statusbar.h \
diff --git a/examples/qtmail/app/app.pro b/examples/qtmail/app/app.pro
index a9db0caa..b81d9e2a 100644
--- a/examples/qtmail/app/app.pro
+++ b/examples/qtmail/app/app.pro
@@ -1,10 +1,18 @@
TEMPLATE = app
-TARGET = qtmail
+
+equals(QT_MAJOR_VERSION, 4){
+ TARGET = qtmail
+ LIBS += -lqmfmessageserver -lqmfclient -lqmfutil
+}
+equals(QT_MAJOR_VERSION, 5){
+ TARGET = qtmail5
+ QT += widgets
+ LIBS += -lqmfmessageserver5 -lqmfclient5 -lqmfutil5
+}
+
CONFIG += qmfutil qmfclient qmfmessageserver
target.path += $$QMF_INSTALL_ROOT/bin
-equals(QT_MAJOR_VERSION, 5): QT += widgets
-
DEPENDPATH += .
INCLUDEPATH += . ../../../src/libraries/qmfclient \
@@ -20,8 +28,6 @@ macx:LIBS += -F../../../src/libraries/qmfclient/build \
-F../libs/qmfutil/build \
-F../../../src/libraries/qmfmessageserver/build
-LIBS += -lqmfmessageserver -lqmfclient -lqmfutil
-
HEADERS += emailclient.h \
messagelistview.h \
searchview.h \
diff --git a/examples/qtmail/libs/qmfutil/qmfutil.pro b/examples/qtmail/libs/qmfutil/qmfutil.pro
index 1d1d5cf1..02d286f4 100644
--- a/examples/qtmail/libs/qmfutil/qmfutil.pro
+++ b/examples/qtmail/libs/qmfutil/qmfutil.pro
@@ -1,14 +1,15 @@
TEMPLATE = lib
CONFIG += warn_on
CONFIG += qmfclient
-TARGET = qmfutil
-
+equals(QT_MAJOR_VERSION, 4): TARGET = qmfutil
+equals(QT_MAJOR_VERSION, 5){
+ TARGET = qmfutil5
+ QT += widgets
+}
target.path += $$QMF_INSTALL_ROOT/lib
DEFINES += QMFUTIL_INTERNAL
-equals(QT_MAJOR_VERSION, 5): QT += widgets
-
DEPENDPATH += .
INCLUDEPATH += . ../../../../src/libraries/qmfclient ../../../../src/libraries/qmfclient/support
diff --git a/examples/qtmail/plugins/composers/email/email.pro b/examples/qtmail/plugins/composers/email/email.pro
index 4b8ef1a7..e3c0513d 100644
--- a/examples/qtmail/plugins/composers/email/email.pro
+++ b/examples/qtmail/plugins/composers/email/email.pro
@@ -2,9 +2,11 @@ TEMPLATE = lib
TARGET = emailcomposer
CONFIG += qmfclient qmfutil plugin
-equals(QT_MAJOR_VERSION, 5): QT += widgets
-
-target.path += $$QMF_INSTALL_ROOT/lib/qmf/plugins/composers
+equals(QT_MAJOR_VERSION, 4): target.path += $$QMF_INSTALL_ROOT/lib/qmf/plugins/composers
+equals(QT_MAJOR_VERSION, 5) {
+ target.path += $$QMF_INSTALL_ROOT/lib/qmf/plugins5/composers
+ QT += widgets
+}
DEFINES += PLUGIN_INTERNAL
diff --git a/examples/qtmail/plugins/viewers/generic/generic.pro b/examples/qtmail/plugins/viewers/generic/generic.pro
index d020b49d..42f2bcec 100644
--- a/examples/qtmail/plugins/viewers/generic/generic.pro
+++ b/examples/qtmail/plugins/viewers/generic/generic.pro
@@ -2,9 +2,11 @@ TEMPLATE = lib
TARGET = genericviewer
CONFIG += qmfclient qmfutil plugin
-equals(QT_MAJOR_VERSION, 5): QT += widgets
-
-target.path += $$QMF_INSTALL_ROOT/lib/qmf/plugins/viewers
+equals(QT_MAJOR_VERSION, 4): target.path += $$QMF_INSTALL_ROOT/lib/qmf/plugins/viewers
+equals(QT_MAJOR_VERSION, 5){
+ target.path += $$QMF_INSTALL_ROOT/lib/qmf/plugins5/viewers
+ QT += widgets
+}
# Use webkit to render mail if available
contains(QT_CONFIG,webkit){
diff --git a/examples/serverobserver/serverobserver.pro b/examples/serverobserver/serverobserver.pro
index b1aa74ac..32d47ea1 100644
--- a/examples/serverobserver/serverobserver.pro
+++ b/examples/serverobserver/serverobserver.pro
@@ -1,10 +1,18 @@
TEMPLATE = app
-TARGET = serverobserver
+
+equals(QT_MAJOR_VERSION, 4){
+ TARGET = serverobserver
+ LIBS += -lqmfmessageserver -lqmfclient
+}
+equals(QT_MAJOR_VERSION, 5){
+ TARGET = serverobserver5
+ QT += widgets
+ LIBS += -lqmfmessageserver5 -lqmfclient5
+}
+
target.path += $$QMF_INSTALL_ROOT/bin
CONFIG += qmfclient qmfmessageserver
-equals(QT_MAJOR_VERSION, 5): QT += widgets
-
DEPENDPATH += .
INCLUDEPATH += . ../../src/libraries/qmfclient \
../../src/libraries/qmfclient/support \
@@ -16,8 +24,6 @@ LIBS += -L../../src/libraries/qmfclient/build \
macx:LIBS += -F../../src/libraries/qmfclient/build \
-F../../src/libraries/qmfmessageserver/build
-LIBS += -lqmfmessageserver -lqmfclient
-
HEADERS += serverobserver.h
SOURCES += serverobserver.cpp \
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-15 21:54:48 +0000