diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-03-31 18:47:56 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-01 09:10:26 +0200 |
commit | 0e6ee136c91432d4ceeeda64e5a5fa88231398d4 (patch) | |
tree | 6060e002af2900007895f6efa757989dd4c190c9 /tests/auto/dbus/qdbusmarshall | |
parent | 418869d9158ea5cd998ba30778b0b7173b48161b (diff) | |
parent | 17294c5e4d15d5776f6e414b03671a4a9ed4993d (diff) |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
src/testlib/qtestblacklist.cpp
src/widgets/accessible/qaccessiblewidgets.cpp
Change-Id: If032adb9296428f62384ed835dbf41ee7a0b886c
Diffstat (limited to 'tests/auto/dbus/qdbusmarshall')
-rw-r--r-- | tests/auto/dbus/qdbusmarshall/test/test.pro | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tests/auto/dbus/qdbusmarshall/test/test.pro b/tests/auto/dbus/qdbusmarshall/test/test.pro index 4999080453..b0656231d2 100644 --- a/tests/auto/dbus/qdbusmarshall/test/test.pro +++ b/tests/auto/dbus/qdbusmarshall/test/test.pro @@ -13,5 +13,3 @@ contains(QT_CONFIG, dbus-linked) { SOURCES += ../../../../../src/dbus/qdbus_symbols.cpp } DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 - -macx:CONFIG += insignificant_test # QTBUG-37469 |