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