From 1b06792a30b2914c59b1fb5816cb2f6abf601c63 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Sat, 7 Nov 2015 12:32:46 +0100 Subject: Update tst_sanity for multiple styles Change-Id: I8e4cf5eb65e6e5f0196704f707c9b9764e36a75b Reviewed-by: Mitch Curtis --- tests/auto/sanity/tst_sanity.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests') diff --git a/tests/auto/sanity/tst_sanity.cpp b/tests/auto/sanity/tst_sanity.cpp index ac5bcfba..2f0753df 100644 --- a/tests/auto/sanity/tst_sanity.cpp +++ b/tests/auto/sanity/tst_sanity.cpp @@ -142,7 +142,7 @@ void tst_Sanity::initTestCase() it.next(); QFileInfo info = it.fileInfo(); if (info.dir().dirName() != QStringLiteral("snippets") && info.dir().dirName() != QStringLiteral("designer")) - files.insert(info.baseName(), info.filePath()); + files.insert(info.dir().dirName() + "/" + info.fileName(), info.filePath()); } } @@ -259,8 +259,8 @@ void tst_Sanity::attachedObjects() QVERIFY(object.data()); foreach (QObject *object, *qt_qobjects) { QString className = object->metaObject()->className(); - if (className.endsWith("Attached")) - QVERIFY2(!classNames.contains(className), qPrintable(QString("Multiple instances of attached type %1").arg(className))); + if (className.endsWith("Attached") || className.endsWith("Style")) + QVERIFY2(!classNames.contains(className), qPrintable(QString("Multiple %1 instances").arg(className))); classNames.insert(className); } } -- cgit v1.2.3