diff options
| author | Valerio Valerio <valerio.valerio@jollamobile.com> | 2013-04-10 12:59:23 +0300 |
|---|---|---|
| committer | Robin Burchell <robin+qt@viroteck.net> | 2013-04-19 21:38:19 +0200 |
| commit | 081657c21cf42710e416119aac2527f0c095e64d (patch) | |
| tree | f34c175d8c5b7242dc2bec506ab9f0c3ee2326e7 /benchmarks | |
| parent | 9ba564c159fd6b951bf5e14e9c796b32623a063d (diff) | |
Update Qt 5 port to match latest release
Update code base to match latest release of Qt.
Signed-off-by: Valerio Valerio <valerio.valerio@jollamobile.com>
Change-Id: I02c2ff250ea8cd960938b81903e92b04c745ae9c
Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Diffstat (limited to 'benchmarks')
| -rw-r--r-- | benchmarks/tst_messageserver/testmalloc.cpp | 1 | ||||
| -rw-r--r-- | benchmarks/tst_messageserver/tst_messageserver.cpp | 4 | ||||
| -rw-r--r-- | benchmarks/tst_messageserver/tst_messageserver.pro | 8 |
3 files changed, 11 insertions, 2 deletions
diff --git a/benchmarks/tst_messageserver/testmalloc.cpp b/benchmarks/tst_messageserver/testmalloc.cpp index 439f6a6c..948688cb 100644 --- a/benchmarks/tst_messageserver/testmalloc.cpp +++ b/benchmarks/tst_messageserver/testmalloc.cpp @@ -44,6 +44,7 @@ #include <QHash> #include <QMutex> #include <QMutexLocker> +#include <QByteArray> #include <errno.h> #include <malloc.h> diff --git a/benchmarks/tst_messageserver/tst_messageserver.cpp b/benchmarks/tst_messageserver/tst_messageserver.cpp index bb37f57e..78956f85 100644 --- a/benchmarks/tst_messageserver/tst_messageserver.cpp +++ b/benchmarks/tst_messageserver/tst_messageserver.cpp @@ -209,7 +209,11 @@ void tst_MessageServer::runInCallgrind(QString const& testfunc) for (int i = 0; i < mo->methodCount(); ++i) { QMetaMethod mm = mo->method(i); if (mm.methodType() == QMetaMethod::Slot && mm.access() == QMetaMethod::Private) { +#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) + QByteArray sig = mm.methodSignature(); +#else QByteArray sig = mm.signature(); +#endif testfunctions << QString::fromLatin1(sig.left(sig.indexOf('('))); } } diff --git a/benchmarks/tst_messageserver/tst_messageserver.pro b/benchmarks/tst_messageserver/tst_messageserver.pro index 46ce5131..f6388e97 100644 --- a/benchmarks/tst_messageserver/tst_messageserver.pro +++ b/benchmarks/tst_messageserver/tst_messageserver.pro @@ -1,7 +1,9 @@ TEMPLATE = app -CONFIG += qtestlib unittest +CONFIG += unittest CONFIG += qmfmessageserver qmfclient -QT += widgets + +QT += testlib +equals(QT_MAJOR_VERSION, 5): QT += widgets TARGET = tst_messageserver target.path += $$QMF_INSTALL_ROOT/tests @@ -30,6 +32,8 @@ INCLUDEPATH += . 3rdparty $$BASE/src/libraries/qmfclient \ LIBS += -L$$BASE/src/libraries/qmfmessageserver/build \ -L$$BASE/src/libraries/qmfclient/build +LIBS += -lqmfmessageserver -lqmfclient + QMAKE_LFLAGS += -Wl,-rpath,$$BASE/src/libraries/qmfclient \ -Wl,-rpath,$$BASE/src/libraries/qmfmessageserver |