diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-05 15:00:41 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-12-05 16:45:27 +0100 |
| commit | 8c0014213b97cf3bde80fbae63d5a46ad425673c (patch) | |
| tree | 4ce055a8b6f881ffdb514027b834292f3863ad69 /tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp | |
| parent | c43133c81ea9abc10b42f1bd46c756167cad35d3 (diff) | |
| parent | 7644faa881d3054e79cf886dc60080ba33dd540a (diff) | |
Merge "Merge remote-tracking branch 'origin/5.4.0' into 5.4" into refs/staging/5.4
Diffstat (limited to 'tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp')
| -rw-r--r-- | tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp b/tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp index 6372fbb0e2..972205566a 100644 --- a/tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp +++ b/tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp @@ -33,14 +33,16 @@ #include <QtCore/QtCore> #include <QtTest/QtTest> #include <QtDBus/QtDBus> -#include <QtDBus/private/qdbusutil_p.h> -#include <QtDBus/private/qdbusconnection_p.h> #include "common.h" #include <limits> #include <dbus/dbus.h> +#define QT_LINKED_LIBDBUS +#include <QtDBus/private/qdbusutil_p.h> +#include <QtDBus/private/qdbusconnection_p.h> + static const char serviceName[] = "org.qtproject.autotests.qpong"; static const char objectPath[] = "/org/qtproject/qpong"; static const char *interfaceName = serviceName; |