diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-08-15 20:56:56 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-08-15 20:56:56 +0200 |
| commit | 42a4a0df5880f217ecb0e1e748c5233a569bf4c7 (patch) | |
| tree | 4fa928054fa9a58bc3b565ca0166262f60941416 /tests | |
| parent | 463524fac8942c5b81b6cccb6050d2b3db4ee0fa (diff) | |
| parent | 7ec1d9797b1a9c058945fad20a6c8d3171f89555 (diff) | |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I3953f2473e3b2cf9768286fef1c5efd08c61c6f0
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/quick/qquickitem/qquickitem.pro | 2 | ||||
| -rw-r--r-- | tests/auto/quick/qquickmousearea/qquickmousearea.pro | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/quick/qquickitem/qquickitem.pro b/tests/auto/quick/qquickitem/qquickitem.pro index ea6ae8f4af..5641ca5a6d 100644 --- a/tests/auto/quick/qquickitem/qquickitem.pro +++ b/tests/auto/quick/qquickitem/qquickitem.pro @@ -8,5 +8,7 @@ macx:CONFIG -= app_bundle TESTDATA = data/* +win32:CONFIG += insignificant_test # QTBUG-32664 + QT += core-private gui-private v8-private qml-private quick-private testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquickmousearea/qquickmousearea.pro b/tests/auto/quick/qquickmousearea/qquickmousearea.pro index dd7b434898..e9b06fd1df 100644 --- a/tests/auto/quick/qquickmousearea/qquickmousearea.pro +++ b/tests/auto/quick/qquickmousearea/qquickmousearea.pro @@ -10,5 +10,7 @@ include (../../shared/util.pri) TESTDATA = data/* +win32:CONFIG += insignificant_test # QTBUG-33006 + QT += core-private gui-private qml-private quick-private network testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 |