diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-07-25 13:57:13 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-07-25 13:57:13 +0200 |
| commit | ae8ac2eb2f118cfb96efec7a40aa8d55be2704ee (patch) | |
| tree | fd36ac3e15c7c243d890d5e91544af5307f8c9fc /src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp | |
| parent | 76a5b1953ca230d813340a9d536d636aacd0929b (diff) | |
| parent | 899cc0300336a51f0d553c10d0769b145f99af00 (diff) | |
| download | qt-creator-ae8ac2eb2f118cfb96efec7a40aa8d55be2704ee.tar.gz | |
Merge branch '2.3'
Conflicts:
qtcreator.pri
src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp
src/plugins/remotelinux/maemodeploystepfactory.cpp
src/plugins/remotelinux/maemodirectdeviceuploadstep.cpp
Change-Id: I195163713145e72df20aec4ac9058f0c9158083e
Diffstat (limited to 'src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp')
| -rw-r--r-- | src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp index 64cb00d08c..59721e2804 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; |