summaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/examples
diff options
context:
space:
mode:
authorPeter Yard <peter.yard@nokia.com>2010-05-14 00:17:40 (GMT)
committerPeter Yard <peter.yard@nokia.com>2010-05-14 00:17:40 (GMT)
commit124e9a761b3cab7414d3ddeaa8e8f2455b6598ad (patch)
tree518c22b7317c5646d2ce0adc5deb5818b2ea0af6 /tests/auto/declarative/examples
parentdcc9a7e72fe4c283df59378d08d75aecfa3b3b05 (diff)
parentac519ee416e06f4ab471f102da306f94de21c90d (diff)
downloadQt-124e9a761b3cab7414d3ddeaa8e8f2455b6598ad.zip
Qt-124e9a761b3cab7414d3ddeaa8e8f2455b6598ad.tar.gz
Qt-124e9a761b3cab7414d3ddeaa8e8f2455b6598ad.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Conflicts: examples/declarative/dial/dial-example.qml
Diffstat (limited to 'tests/auto/declarative/examples')
-rw-r--r--tests/auto/declarative/examples/tst_examples.cpp22
1 files changed, 9 insertions, 13 deletions
diff --git a/tests/auto/declarative/examples/tst_examples.cpp b/tests/auto/declarative/examples/tst_examples.cpp
index 16b0cbe..3759cb5 100644
--- a/tests/auto/declarative/examples/tst_examples.cpp
+++ b/tests/auto/declarative/examples/tst_examples.cpp
@@ -80,14 +80,7 @@ tst_examples::tst_examples()
// Add directories you want excluded here
- excludedDirs << "examples/declarative/extending";
- excludedDirs << "examples/declarative/tutorials/extending";
- excludedDirs << "examples/declarative/plugins";
- excludedDirs << "examples/declarative/proxywidgets";
- excludedDirs << "examples/declarative/gestures";
-
- excludedDirs << "examples/declarative/imageprovider";
- excludedDirs << "demos/declarative/minehunt";
+ excludedDirs << "doc/src/snippets/declarative/graphicswidgets";
#ifdef QT_NO_WEBKIT
excludedDirs << "examples/declarative/webview";
@@ -157,11 +150,14 @@ QStringList tst_examples::findQmlFiles(const QDir &d)
QStringList rv;
- QStringList files = d.entryList(QStringList() << QLatin1String("*.qml"),
- QDir::Files);
- foreach (const QString &file, files) {
- if (file.at(0).isLower()) {
- rv << d.absoluteFilePath(file);
+ QStringList cppfiles = d.entryList(QStringList() << QLatin1String("*.cpp"), QDir::Files);
+ if (cppfiles.isEmpty()) {
+ QStringList files = d.entryList(QStringList() << QLatin1String("*.qml"),
+ QDir::Files);
+ foreach (const QString &file, files) {
+ if (file.at(0).isLower()) {
+ rv << d.absoluteFilePath(file);
+ }
}
}