diff options
| author | Valerio Valerio <valerio.valerio@jollamobile.com> | 2013-04-22 09:32:02 +0300 |
|---|---|---|
| committer | Valerio Valerio <valerio.valerio@jollamobile.com> | 2013-04-26 10:37:41 +0200 |
| commit | e116de6a0d4ccb58435105d2f7ecf5ea80c9541b (patch) | |
| tree | e2aa42f89b7136f3e86a1ff1dce91a5c8459dbfd /benchmarks | |
| parent | a5d645d6a7ca026c5e43c54b24891a4b8947e2a5 (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 'benchmarks')
| -rw-r--r-- | benchmarks/tst_messageserver/tst_messageserver.pro | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/benchmarks/tst_messageserver/tst_messageserver.pro b/benchmarks/tst_messageserver/tst_messageserver.pro index f6388e97..62774447 100644 --- a/benchmarks/tst_messageserver/tst_messageserver.pro +++ b/benchmarks/tst_messageserver/tst_messageserver.pro @@ -1,12 +1,14 @@ TEMPLATE = app CONFIG += unittest CONFIG += qmfmessageserver qmfclient - QT += testlib -equals(QT_MAJOR_VERSION, 5): QT += widgets +TARGET = tst_messageserver -TARGET = tst_messageserver -target.path += $$QMF_INSTALL_ROOT/tests +equals(QT_MAJOR_VERSION, 4): target.path += $$QMF_INSTALL_ROOT/tests +equals(QT_MAJOR_VERSION, 5){ + target.path += $$QMF_INSTALL_ROOT/tests5 + QT += widgets +} BASE=../../ include($$BASE/common.pri) @@ -32,7 +34,8 @@ INCLUDEPATH += . 3rdparty $$BASE/src/libraries/qmfclient \ LIBS += -L$$BASE/src/libraries/qmfmessageserver/build \ -L$$BASE/src/libraries/qmfclient/build -LIBS += -lqmfmessageserver -lqmfclient +equals(QT_MAJOR_VERSION, 4): LIBS += -lqmfmessageserver -lqmfclient +equals(QT_MAJOR_VERSION, 5): LIBS += -lqmfmessageserver5 -lqmfclient5 QMAKE_LFLAGS += -Wl,-rpath,$$BASE/src/libraries/qmfclient \ -Wl,-rpath,$$BASE/src/libraries/qmfmessageserver |