aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2012-02-27 10:19:01 +1000
committerQt by Nokia <qt-info@nokia.com>2012-02-27 22:45:31 +0100
commitccd859d2c47e926415c5b1307e84efd4197583c4 (patch)
treef9ade4f5403005341ad20bb58c985c6040b3bfaa /tests
parentcfad9eb4df8b8e389143b138ca4536bca0d163eb (diff)
Skip c++ examples in sgexamples test
They should be tested separately, QTBUG-24516 has been raised to implement this. Change-Id: Ic90bc8327e6c07164ed34b3d02f2612561491ec0 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qtquick2/examples/tst_examples.cpp17
1 files changed, 9 insertions, 8 deletions
diff --git a/tests/auto/qtquick2/examples/tst_examples.cpp b/tests/auto/qtquick2/examples/tst_examples.cpp
index ce8f214efd..e80bfec0e2 100644
--- a/tests/auto/qtquick2/examples/tst_examples.cpp
+++ b/tests/auto/qtquick2/examples/tst_examples.cpp
@@ -88,10 +88,11 @@ tst_examples::tst_examples()
// Add files to exclude here
excludedFiles << "doc/src/snippets/declarative/listmodel.qml"; //Just a ListModel, no root QQuickItem
- // Add directories you want excluded here
- excludedDirs << "examples/shared"; //Not an example
- excludedDirs << "examples/qtquick/text/fonts"; // QTBUG-21415
+ // Add directories you want excluded here (don't add examples/, because they install to examples/qtdeclarative/)
+ excludedDirs << "shared"; //Not an example
+ excludedDirs << "qtquick/text/fonts"; // QTBUG-21415
excludedDirs << "doc/src/snippets/declarative/path"; //No root QQuickItem
+ excludedDirs << "tutorials/gettingStartedQml"; //C++ example, but no cpp files in root dir
// These snippets are not expected to run on their own.
excludedDirs << "doc/src/snippets/declarative/visualdatamodel_rootindex";
@@ -99,15 +100,15 @@ tst_examples::tst_examples()
excludedDirs << "doc/src/snippets/declarative/imports";
#ifdef QT_NO_WEBKIT
- excludedDirs << "examples/qtquick/modelviews/webview";
- excludedDirs << "examples/demos/webbrowser";
+ excludedDirs << "qtquick/modelviews/webview";
+ excludedDirs << "demos/webbrowser";
excludedDirs << "doc/src/snippets/declarative/webview";
#endif
#ifdef QT_NO_XMLPATTERNS
- excludedDirs << "examples/demos/twitter";
- excludedDirs << "examples/demos/flickr";
- excludedDirs << "examples/demos/photoviewer";
+ excludedDirs << "demos/twitter";
+ excludedDirs << "demos/flickr";
+ excludedDirs << "demos/photoviewer";
#endif
}