From d65fb68de12b6d811f7b94ba3209847f73ca94cc Mon Sep 17 00:00:00 2001 From: Alan Alpert Date: Tue, 7 Aug 2012 17:31:46 +1000 Subject: Only test qtdeclarative examples for naming convention Change-Id: Id34e29546a22a74a7ae2ad90ee3a8deabccddddd Reviewed-by: Michael Brasser --- tests/auto/quick/examples/tst_examples.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'tests') diff --git a/tests/auto/quick/examples/tst_examples.cpp b/tests/auto/quick/examples/tst_examples.cpp index 22df7b89a5..f9994a76bc 100644 --- a/tests/auto/quick/examples/tst_examples.cpp +++ b/tests/auto/quick/examples/tst_examples.cpp @@ -179,9 +179,16 @@ void tst_examples::namingConvention(const QDir &d) void tst_examples::namingConvention() { - QString examples = QLibraryInfo::location(QLibraryInfo::ExamplesPath); - - namingConvention(QDir(examples)); + QStringList examplesLocations; + examplesLocations << QLibraryInfo::location(QLibraryInfo::ExamplesPath) + QLatin1String("/qtdeclarative"); + examplesLocations << QLibraryInfo::location(QLibraryInfo::ExamplesPath) + QLatin1String("/qtquick"); + examplesLocations << QLibraryInfo::location(QLibraryInfo::ExamplesPath) + QLatin1String("/qtqml"); + + foreach(const QString &examples, examplesLocations) { + QDir d(examples); + if (d.exists()) + namingConvention(d); + } } QStringList tst_examples::findQmlFiles(const QDir &d) -- cgit v1.2.3