diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-08-25 11:47:24 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-08-25 12:52:15 +0200 |
| commit | 8e6ecb56e5d61ce661422779c9d9cbf22f081a34 (patch) | |
| tree | 227aeb360800a49de58472bd39bc5f4c596c1b15 /tests/auto/declarative/examples | |
| parent | c9224b6cf5cceb7d5314f7504d44bfe72bc66950 (diff) | |
| parent | 0d84e957297b4ffa6ab5b0b5bcf8b169d567d298 (diff) | |
Merge branch 'master' into refactor
Conflicts:
src/declarative/items/qsgcanvas.cpp
src/declarative/items/qsgitem.cpp
src/declarative/items/qsgtextnode.cpp
tests/auto/declarative/examples/examples.pro
tools/qmlviewer/qmlviewer.pro
Change-Id: Icbb0ef5dc79b658c62fd2b2c25a66c9bb3cbeb10
Diffstat (limited to 'tests/auto/declarative/examples')
| -rw-r--r-- | tests/auto/declarative/examples/examples.pro | 2 | ||||
| -rw-r--r-- | tests/auto/declarative/examples/tst_examples.cpp | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/tests/auto/declarative/examples/examples.pro b/tests/auto/declarative/examples/examples.pro index 6748d7518b..297559ef97 100644 --- a/tests/auto/declarative/examples/examples.pro +++ b/tests/auto/declarative/examples/examples.pro @@ -19,3 +19,5 @@ symbian: { CONFIG += parallel_test QT += core-private gui-private declarative-private qtquick1-private widgets-private + +qpa:CONFIG+=insignificant_test # QTBUG-20990, aborts diff --git a/tests/auto/declarative/examples/tst_examples.cpp b/tests/auto/declarative/examples/tst_examples.cpp index 5368a0eda4..e2edc3e93c 100644 --- a/tests/auto/declarative/examples/tst_examples.cpp +++ b/tests/auto/declarative/examples/tst_examples.cpp @@ -76,14 +76,20 @@ private: tst_examples::tst_examples() { // Add directories you want excluded here + + // These snippets are not expected to run on their own. excludedDirs << "doc/src/snippets/declarative/visualdatamodel_rootindex"; excludedDirs << "doc/src/snippets/declarative/qtbinding"; excludedDirs << "doc/src/snippets/declarative/imports"; + excludedDirs << "doc/src/snippets/qtquick1/visualdatamodel_rootindex"; + excludedDirs << "doc/src/snippets/qtquick1/qtbinding"; + excludedDirs << "doc/src/snippets/qtquick1/imports"; #ifdef QT_NO_WEBKIT excludedDirs << "examples/declarative/modelviews/webview"; excludedDirs << "examples/declarative/webbrowser"; excludedDirs << "doc/src/snippets/declarative/webview"; + excludedDirs << "doc/src/snippets/qtquick1/webview"; #endif #ifdef QT_NO_XMLPATTERNS |