diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-19 09:47:35 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-19 09:47:35 +0200 |
| commit | d2628d9d7015e4b75007471d150acedecaa0c6c1 (patch) | |
| tree | 00ab012c7ae190d5a64788ee945ca006e3759e41 /tests/auto/quick/qquickgridview | |
| parent | b6a6a6387e279c431d520243345530fa19bd96c5 (diff) | |
| parent | 566afc2d2e4156712ffec081715f12307cf46628 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
tests/auto/quick/qquickgridview/qquickgridview.pro
tests/auto/quick/qquickitem/qquickitem.pro
Change-Id: Ic54cafbdda1ac22757d2ee65dcc63a1b167c7556
Diffstat (limited to 'tests/auto/quick/qquickgridview')
| -rw-r--r-- | tests/auto/quick/qquickgridview/qquickgridview.pro | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/quick/qquickgridview/qquickgridview.pro b/tests/auto/quick/qquickgridview/qquickgridview.pro index 3a4155256f..40b43fa2c0 100644 --- a/tests/auto/quick/qquickgridview/qquickgridview.pro +++ b/tests/auto/quick/qquickgridview/qquickgridview.pro @@ -11,4 +11,8 @@ include (../shared/util.pri) TESTDATA = data/* QT += core-private gui-private qml-private quick-private testlib + +win32:CONFIG += insignificant_test # QTBUG-33017 +macx:CONFIG += insignificant_test # QTBUG-33017 + DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 |