diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-29 09:25:51 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-29 09:25:51 (GMT) |
| commit | f80d04ea96a52090e939a53779aa04d4bd174f24 (patch) | |
| tree | ca54caec0d7891bafdfe4813036db5f3dcca7f61 /tests/auto/declarative/qdeclarativetext/qdeclarativetext.pro | |
| parent | 8c94ee1f77f665d80a0590e7dd003e8089ff353f (diff) | |
| parent | 12cb4aac35904a493cb0d34f6d7767955aad84fe (diff) | |
| download | Qt-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/declarative/qdeclarativetext/qdeclarativetext.pro')
| -rw-r--r-- | tests/auto/declarative/qdeclarativetext/qdeclarativetext.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/declarative/qdeclarativetext/qdeclarativetext.pro b/tests/auto/declarative/qdeclarativetext/qdeclarativetext.pro index 290cda3..c0831f7 100644 --- a/tests/auto/declarative/qdeclarativetext/qdeclarativetext.pro +++ b/tests/auto/declarative/qdeclarativetext/qdeclarativetext.pro @@ -18,4 +18,4 @@ symbian: { } CONFIG += parallel_test - +CONFIG+=insignificant_test # QTQAINFRA-428 |