summaryrefslogtreecommitdiffstats
path: root/benchmarks
diff options
context:
space:
mode:
authorRobin Burchell <robin.burchell@jollamobile.com>2014-01-21 10:19:06 +0100
committerRobin Burchell <robin+qt@viroteck.net>2014-01-23 19:51:24 +0100
commit8fd59a4d2f87c76dbd85d05cf81b96a4566ccc8c (patch)
treef930ebf22fbc7b99129baaf1546137c9abec37ea /benchmarks
parent3abb395592bdac9c8166efa0e785c0424b9ca219 (diff)
Convert qmfclient & qmfmessageserver into Qt modules: QmfClient & QmfMessageServer.
This was not possible prior to now due to Qt 4 support hanging around like the undead vampire it is, but now we purged it with fire and light, and the build system looks a lot less like a stinky, decomposed corpse. There's still a lot of surprises lurking: qtmail is one such surprise. I don't quite grasp why it's so heavy on plugins, and qmfutil also needs some... attention. But at least it's a start. As part of this work, we rename the qcop headers to fit the private convention. This could have been done in a prior commit, but given that I didn't have an easy way to build prior to this commit, I opted to roll them together. Change-Id: Ia3e288ffc3639a7751c9040ceecb54fca77a31b1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au> Reviewed-by: Valerio Valerio <valerio.valerio@jollamobile.com>
Diffstat (limited to 'benchmarks')
-rw-r--r--benchmarks/tst_messageserver/tst_messageserver.pro15
1 files changed, 2 insertions, 13 deletions
diff --git a/benchmarks/tst_messageserver/tst_messageserver.pro b/benchmarks/tst_messageserver/tst_messageserver.pro
index f143f608..eb302aa1 100644
--- a/benchmarks/tst_messageserver/tst_messageserver.pro
+++ b/benchmarks/tst_messageserver/tst_messageserver.pro
@@ -1,7 +1,6 @@
TEMPLATE = app
CONFIG += unittest
-CONFIG += qmfmessageserver qmfclient
-QT += testlib widgets
+QT += testlib widgets qmfclient qmfmessageserver
TARGET = tst_messageserver
target.path += $$QMF_INSTALL_ROOT/tests5
@@ -20,20 +19,10 @@ DEFINES += PLUGIN_STATIC_LINK
IMAP_PLUGIN=$$BASE/src/plugins/messageservices/imap/
MESSAGE_SERVER=$$BASE/src/tools/messageserver
-INCLUDEPATH += . 3rdparty $$BASE/src/libraries/qmfclient \
- $$BASE/src/libraries/qmfclient/support \
- $$BASE/src/libraries/qmfmessageserver \
+INCLUDEPATH += . 3rdparty \
$$IMAP_PLUGIN \
$$MESSAGE_SERVER
-LIBS += -L$$BASE/src/libraries/qmfmessageserver/build \
- -L$$BASE/src/libraries/qmfclient/build
-
-LIBS += -lqmfmessageserver5 -lqmfclient5
-
-QMAKE_LFLAGS += -Wl,-rpath,$$BASE/src/libraries/qmfclient \
- -Wl,-rpath,$$BASE/src/libraries/qmfmessageserver
-
HEADERS += benchmarkcontext.h \
qscopedconnection.h \
testfsusage.h \