diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2014-12-09 14:16:33 -0800 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2015-01-06 18:16:32 +0100 |
| commit | cf4b413fa4a81dbfaaaf50cb52f92ecc0d3c3f2a (patch) | |
| tree | 5941f10bd4c147d9d274b3d7feb28d5e8cf12f1f /tests/auto/tools/qdbusxml2cpp | |
| parent | 1fc4053337b55c98b66de63b4fae223f1eb72563 (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/auto/tools/qdbusxml2cpp')
| -rw-r--r-- | tests/auto/tools/qdbusxml2cpp/tst_qdbusxml2cpp.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/auto/tools/qdbusxml2cpp/tst_qdbusxml2cpp.cpp b/tests/auto/tools/qdbusxml2cpp/tst_qdbusxml2cpp.cpp index eac61a38b8..7d0c5d8d99 100644 --- a/tests/auto/tools/qdbusxml2cpp/tst_qdbusxml2cpp.cpp +++ b/tests/auto/tools/qdbusxml2cpp/tst_qdbusxml2cpp.cpp @@ -34,7 +34,9 @@ #include <QtTest/QtTest> #include <QtCore/QProcess> #include <QtCore/QRegularExpression> -#include <dbus/dbus.h> + +// We just need the DBUS_TYPE_* constants, so use our own copy +#include "../../../../src/dbus/dbus_minimal_p.h" class tst_qdbusxml2cpp : public QObject { |