diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-02 15:57:44 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-02 15:57:44 +0100 |
| commit | d3e6e732c70ebc2340d6376d727b3c623be23810 (patch) | |
| tree | 18d469f02ac36edd04b87a9bfa4886ceef0490f0 /tests/auto/dbus | |
| parent | fdfd63053ae6b10af06553be3c1b15de274bebf7 (diff) | |
| parent | ba8d3430029d8c4342e9a47c110ee8c9879818f4 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
config.tests/unix/compile.test
src/plugins/platforms/cocoa/qcocoahelpers.mm
src/tools/qlalr/cppgenerator.cpp
Change-Id: I0103ca076a9aca7118b2fd99f0fdaf81055998c3
Diffstat (limited to 'tests/auto/dbus')
| -rw-r--r-- | tests/auto/dbus/qdbusconnection_no_libdbus/qdbusconnection_no_libdbus.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/dbus/qdbusconnection_no_libdbus/qdbusconnection_no_libdbus.pro b/tests/auto/dbus/qdbusconnection_no_libdbus/qdbusconnection_no_libdbus.pro index cb0eab1a18..d1b27ee8c0 100644 --- a/tests/auto/dbus/qdbusconnection_no_libdbus/qdbusconnection_no_libdbus.pro +++ b/tests/auto/dbus/qdbusconnection_no_libdbus/qdbusconnection_no_libdbus.pro @@ -1,5 +1,5 @@ CONFIG += testcase parallel_test TARGET = tst_qdbusconnection_no_libdbus QT = core dbus testlib -DEFINES += SIMULATE_LOAD_FAIL +DEFINES += SIMULATE_LOAD_FAIL tst_QDBusConnectionNoBus=tst_QDBusConnectionNoLibDBus1 SOURCES += ../qdbusconnection_no_bus/tst_qdbusconnection_no_bus.cpp |