From: Rohan McGovern <rohan.mcgovern@nokia.com>
Date: Fri, 24 Jun 2011 14:49:39 +0000 (+1000)
Subject: Fixed failure of tst_examples::namingConvention
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=944143997567e711dc74004bbe3334325656fcab;p=konrad%2Fqtdeclarative.git

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>
---

diff --git a/tests/auto/declarative/examples/tst_examples.cpp b/tests/auto/declarative/examples/tst_examples.cpp
index 42e0b5b..1a07f6b 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)