summaryrefslogtreecommitdiffstats
path: root/tests/benchmarks/dbus
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2014-12-09 14:16:33 -0800
committerThiago Macieira <thiago.macieira@intel.com>2015-01-06 18:16:32 +0100
commitcf4b413fa4a81dbfaaaf50cb52f92ecc0d3c3f2a (patch)
tree5941f10bd4c147d9d274b3d7feb28d5e8cf12f1f /tests/benchmarks/dbus
parent1fc4053337b55c98b66de63b4fae223f1eb72563 (diff)
Make QtDBus unit tests compile with runtime dbus-1 too
There's a change in Qt 5.4.0 that makes Qt compile with its own set of D-Bus headers, which means QT_CFLAGS_DBUS may be empty. Thus, we can't compile or link if we're using the actual libdbus-1 API to build the test. This commit makes these unit tests use the same dynamic loading mechanism. Change-Id: I56b2a7320086ef88793f6552cb54ca6224010451 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'tests/benchmarks/dbus')
-rw-r--r--tests/benchmarks/dbus/qdbustype/main.cpp9
-rw-r--r--tests/benchmarks/dbus/qdbustype/qdbustype.pro11
2 files changed, 14 insertions, 6 deletions
diff --git a/tests/benchmarks/dbus/qdbustype/main.cpp b/tests/benchmarks/dbus/qdbustype/main.cpp
index 4723ed1b97..ae7eb6582a 100644
--- a/tests/benchmarks/dbus/qdbustype/main.cpp
+++ b/tests/benchmarks/dbus/qdbustype/main.cpp
@@ -35,8 +35,11 @@
#include <QtCore/QCoreApplication>
#include <QtDBus/private/qdbusutil_p.h>
+#include <QtDBus/private/qdbus_symbols_p.h>
-#include <dbus/dbus.h>
+DEFINEFUNC(dbus_bool_t, dbus_signature_validate, (const char *signature,
+ DBusError *error),
+ (signature, error), return)
class tst_QDBusType: public QObject
{
@@ -85,9 +88,9 @@ void tst_QDBusType::benchmarkSignature()
bool result;
if (useNative) {
- dbus_signature_validate(data.toLatin1(), 0);
+ q_dbus_signature_validate(data.toLatin1(), 0);
QBENCHMARK {
- result = dbus_signature_validate(data.toLatin1(), 0);
+ result = q_dbus_signature_validate(data.toLatin1(), 0);
}
} else {
QDBusUtil::isValidSignature(data);
diff --git a/tests/benchmarks/dbus/qdbustype/qdbustype.pro b/tests/benchmarks/dbus/qdbustype/qdbustype.pro
index 0307dda4a0..1437e4d9eb 100644
--- a/tests/benchmarks/dbus/qdbustype/qdbustype.pro
+++ b/tests/benchmarks/dbus/qdbustype/qdbustype.pro
@@ -1,8 +1,13 @@
TARGET = tst_bench_qdbustype
QT -= gui
-QT += dbus dbus-private testlib
-QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS
-LIBS_PRIVATE += $$QT_LIBS_DBUS
+QT += core-private dbus-private testlib
+contains(QT_CONFIG, dbus-linked) {
+ DEFINES += QT_LINKED_LIBDBUS
+ LIBS += $$QT_LIBS_DBUS
+ QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS
+} else {
+ SOURCES += ../../../../src/dbus/qdbus_symbols.cpp
+}
SOURCES += main.cpp
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0