diff options
Diffstat (limited to 'tests/benchmarks')
| -rw-r--r-- | tests/benchmarks/dbus/qdbustype/main.cpp | 9 | ||||
| -rw-r--r-- | tests/benchmarks/dbus/qdbustype/qdbustype.pro | 11 |
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 |