aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMitch Curtis <mitch.curtis@qt.io>2018-03-23 10:39:20 +0100
committerMitch Curtis <mitch.curtis@qt.io>2018-03-23 12:15:52 +0000
commit81f656eeac522532ff98a32aac68a1571ea54c99 (patch)
treecc6e364eaa34ee25c4d93fe734e4ac5a80f7b4ff
parent2acf527d54049cfb17d1d2aaf4d77c97716e1dc6 (diff)
tst_customization: only track objectNames we're interested in
Change-Id: I496a6a60383c0332ec52e9349892c8923ed42c76 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
-rw-r--r--tests/auto/customization/tst_customization.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/auto/customization/tst_customization.cpp b/tests/auto/customization/tst_customization.cpp
index 91646653..41efc2a6 100644
--- a/tests/auto/customization/tst_customization.cpp
+++ b/tests/auto/customization/tst_customization.cpp
@@ -180,7 +180,9 @@ extern "C" Q_DECL_EXPORT void qt_addQObject(QObject *object)
QString oldObjectName = qt_objectNames()->value(object);
if (!oldObjectName.isEmpty())
qt_createdQObjects()->removeOne(oldObjectName);
- if (!objectName.isEmpty()) {
+ // Only track object names from our QML files,
+ // not e.g. contentItem object names (like "ApplicationWindow").
+ if (objectName.contains("-")) {
qt_createdQObjects()->append(objectName);
qt_objectNames()->insert(object, objectName);
}