diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-20 16:15:09 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-20 16:15:26 +0200 |
| commit | a2457771ed7c4ab533a7d2a00c9e26661c3062db (patch) | |
| tree | 858a378c3ddb70421266c463d3e91ddf653450a0 /tests | |
| parent | 5d4b006181d009e6245d5d38c7798603ddcab06a (diff) | |
| parent | 24947fb8cc1859d5d193b2d66746c1541f30ab9b (diff) | |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I6bd61ebda17c34f51a4c4ece4852ab144bf542a6
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/quick/examples/tst_examples.cpp | 1 | ||||
| -rw-r--r-- | tests/auto/quick/touchmouse/touchmouse.pro | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/tests/auto/quick/examples/tst_examples.cpp b/tests/auto/quick/examples/tst_examples.cpp index 9c5fb88af2..7ef07e4896 100644 --- a/tests/auto/quick/examples/tst_examples.cpp +++ b/tests/auto/quick/examples/tst_examples.cpp @@ -89,6 +89,7 @@ tst_examples::tst_examples() // Add files to exclude here excludedFiles << "examples/quick/canvas/tiger/tiger.qml"; // QTBUG-26528 excludedFiles << "snippets/qml/listmodel/listmodel.qml"; //Just a ListModel, no root QQuickItem + excludedFiles << "examples/quick/demos/photosurface/photosurface.qml"; // root item is Window rather than Item // Add directories you want excluded here (don't add examples/, because they install to examples/qtdeclarative/) excludedDirs << "shared"; //Not an example diff --git a/tests/auto/quick/touchmouse/touchmouse.pro b/tests/auto/quick/touchmouse/touchmouse.pro index bba0abdc17..378e199bf5 100644 --- a/tests/auto/quick/touchmouse/touchmouse.pro +++ b/tests/auto/quick/touchmouse/touchmouse.pro @@ -13,8 +13,6 @@ TESTDATA = data/* # OTHER_FILES += data/foo.qml -CONFIG += parallel_test - DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 mac:CONFIG+=insignificant_test # QTBUG-27890 |