From 944143997567e711dc74004bbe3334325656fcab Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Sat, 25 Jun 2011 00:49:39 +1000 Subject: [PATCH] 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 Reviewed-by: Jiang Jiang --- tests/auto/declarative/examples/tst_examples.cpp | 2 -- 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 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) -- 1.7.2.5