Commit 0173ecbc authored by Thomas Hartmann's avatar Thomas Hartmann
Browse files

QmlDesigner.navigator: fix missing <cpp>

This enables front and back for flipable.
I also fixed isSubclassOf() for empty strings.

Change-Id: Id807d10339813df7c0412ceeaa5877264267f2e1
Reviewed-on: http://codereview.qt.nokia.com/1705


Reviewed-by: default avatarQt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: default avatarThomas Hartmann <Thomas.Hartmann@nokia.com>
parent f2d01e10
......@@ -610,7 +610,7 @@ QStringList NavigatorTreeModel::visibleProperties(const ModelNode &node) const
QString qmlType = qmlTypeInQtContainer(node.metaInfo().propertyTypeName(propertyName));
if (node.model()->metaInfo(qmlType).isValid() &&
node.model()->metaInfo(qmlType).isSubclassOf("QGraphicsObject", -1, -1)) {
node.model()->metaInfo(qmlType).isSubclassOf("<cpp>.QGraphicsObject", -1, -1)) {
propertyList.append(propertyName);
}
}
......
......@@ -1096,6 +1096,9 @@ bool NodeMetaInfo::isSubclassOf(const QString &type, int majorVersion, int minor
return false;
}
if (typeName().isEmpty())
return false;
if (typeName() == type
&& availableInVersion(majorVersion, minorVersion))
return true;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment