summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Hartmann <thomas.hartmann@qt.io>2019-01-15 10:23:31 +0100
committerTim Jenssen <tim.jenssen@qt.io>2019-01-21 11:07:59 +0000
commit6068f4e299df4c5bfeef71f64e84c5393a7a5b35 (patch)
treee83ac22c026e8d58a98c41981378c00a75316a67
parentd8920f923faaf5b8ad827d03e637bad71af645c0 (diff)
downloadqt-creator-6068f4e299df4c5bfeef71f64e84c5393a7a5b35.tar.gz
QmlDesigner: Add some extra info to warnings and asserts
Change-Id: Ib9c924f7a619b5e79480b5a99291cb9969e7f629 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
-rw-r--r--src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp2
-rw-r--r--src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp5
2 files changed, 6 insertions, 1 deletions
diff --git a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
index f92358efc9..7c7df6b457 100644
--- a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
+++ b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
@@ -1519,7 +1519,7 @@ bool NodeMetaInfo::availableInVersion(int majorVersion, int minorVersion) const
bool NodeMetaInfo::isSubclassOf(const TypeName &type, int majorVersion, int minorVersion) const
{
if (!isValid()) {
- qWarning() << "NodeMetaInfo is invalid";
+ qWarning() << "NodeMetaInfo is invalid" << type;
return false;
}
diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
index 125c6d12bd..2f47407f69 100644
--- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
+++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
@@ -1736,6 +1736,11 @@ void ModelValidator::typeDiffers(bool /*isRootNode*/,
qDebug() << typeName << modelNode.majorVersion() << majorVersion;
}
+ if (modelNode.minorVersion() != minorVersion) {
+ qDebug() << Q_FUNC_INFO << modelNode;
+ qDebug() << typeName << modelNode.minorVersion() << minorVersion;
+ }
+
QTC_ASSERT(modelNode.majorVersion() == majorVersion, return);
QTC_ASSERT(modelNode.minorVersion() == minorVersion, return);
QTC_ASSERT(0, return);