summaryrefslogtreecommitdiffstats
path: root/tests/auto/qgraphicsitem
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-12-29 09:25:51 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-12-29 09:25:51 (GMT)
commitf80d04ea96a52090e939a53779aa04d4bd174f24 (patch)
treeca54caec0d7891bafdfe4813036db5f3dcca7f61 /tests/auto/qgraphicsitem
parent8c94ee1f77f665d80a0590e7dd003e8089ff353f (diff)
parent12cb4aac35904a493cb0d34f6d7767955aad84fe (diff)
downloadQt-f80d04ea96a52090e939a53779aa04d4bd174f24.zip
Qt-f80d04ea96a52090e939a53779aa04d4bd174f24.tar.gz
Qt-f80d04ea96a52090e939a53779aa04d4bd174f24.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging: tests: allow unstable tests to be marked with CONFIG+=insignificant_test
Diffstat (limited to 'tests/auto/qgraphicsitem')
-rw-r--r--tests/auto/qgraphicsitem/qgraphicsitem.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qgraphicsitem/qgraphicsitem.pro b/tests/auto/qgraphicsitem/qgraphicsitem.pro
index 20acf35..7d2deb2 100644
--- a/tests/auto/qgraphicsitem/qgraphicsitem.pro
+++ b/tests/auto/qgraphicsitem/qgraphicsitem.pro
@@ -4,4 +4,4 @@ DEFINES += QT_NO_CAST_TO_ASCII
win32:!wince*: LIBS += -lUser32
-
+CONFIG+=insignificant_test # QTQAINFRA-428