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: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

2 files changed, 4 insertions, 1 deletions

diff --git a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp
index 19c323f3db..d29a7d7638 100644
--- a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp
+++ b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp
@@ -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);
             }
         }
diff --git a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
index 5949cd4e90..9cadf8100c 100644
--- a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
+++ b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
@@ -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;