aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2011-06-25 00:49:39 +1000
committerQt by Nokia <qt-info@nokia.com>2011-06-24 16:57:07 +0200
commit944143997567e711dc74004bbe3334325656fcab (patch)
treec644360b341ec56df6deb77e7d6642f8668098cb
parentd1b0bb5607718185c048eb9a2f9eda19ab628f8c (diff)
Fixed failure of tst_examples::namingConvention
Since 1fab62b930edd4abed076e57ee997eae09159f22 in qtbase, demos and examples are merged. This was causing the test to unintentionally iterate over the entire source tree. Change-Id: I8e60c5742a3c15a4187f6c8cdac3cdc7f7ee24c0 Reviewed-on: http://codereview.qt.nokia.com/729 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
-rw-r--r--tests/auto/declarative/examples/tst_examples.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/tests/auto/declarative/examples/tst_examples.cpp b/tests/auto/declarative/examples/tst_examples.cpp
index 42e0b5b8ba..1a07f6ba81 100644
--- a/tests/auto/declarative/examples/tst_examples.cpp
+++ b/tests/auto/declarative/examples/tst_examples.cpp
@@ -136,10 +136,8 @@ void tst_examples::namingConvention(const QDir &d)
void tst_examples::namingConvention()
{
QString examples = QLibraryInfo::location(QLibraryInfo::ExamplesPath);
- QString demos = QLibraryInfo::location(QLibraryInfo::DemosPath);
namingConvention(QDir(examples));
- namingConvention(QDir(demos));
}
QStringList tst_examples::findQmlFiles(const QDir &d)