diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2016-04-12 10:43:10 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2016-04-12 11:34:46 +0200 |
| commit | 5c874322603444ef02bd578ae302c03a9b1cd034 (patch) | |
| tree | 6339db7c3a2683e18208e75895444f2d2d251ebe /src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp | |
| parent | 04acb9d643060811dbba8f66d807b2a7574c3a6f (diff) | |
| parent | 8dadafb9e0a2fbb49ab08b9eea0ff307088ba3f8 (diff) | |
Merge remote-tracking branch 'origin/4.0'
Conflicts:
src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp
Change-Id: I6ae2d37290643d69390f679a54f7596782f3d97f
Diffstat (limited to 'src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp')
| -rw-r--r-- | src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp index e013561d89..e7f13239fd 100644 --- a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp +++ b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp @@ -1520,7 +1520,7 @@ bool NodeMetaInfo::isSubclassOf(const TypeName &type, int majorVersion, int mino bool NodeMetaInfo::isGraphicalItem() const { - return isSubclassOf("QtQuick.Item", -1, -1) || isSubclassOf("QtQuick.Window.Window", -1, -1); + return isSubclassOf("QtQuick.Item") || isSubclassOf("QtQuick.Window.Window"); } void NodeMetaInfo::clearCache() @@ -1530,25 +1530,25 @@ void NodeMetaInfo::clearCache() bool NodeMetaInfo::isLayoutable() const { - if (isSubclassOf("<cpp>.QDeclarativeBasePositioner", -1, -1)) + if (isSubclassOf("<cpp>.QDeclarativeBasePositioner")) return true; //QtQuick 1 - return isSubclassOf("QtQuick.Positioner", -1, -1) - || isSubclassOf("QtQuick.Layouts.Layout", -1, -1) - || isSubclassOf("QtQuick.Controls.SplitView", -1, -1); + return isSubclassOf("QtQuick.Positioner") + || isSubclassOf("QtQuick.Layouts.Layout") + || isSubclassOf("QtQuick.Controls.SplitView"); } bool NodeMetaInfo::isView() const { return isValid() && - (isSubclassOf("QtQuick.ListView", -1, -1) || - isSubclassOf("QtQuick.GridView", -1, -1) || - isSubclassOf("QtQuick.PathView", -1, -1)); + (isSubclassOf("QtQuick.ListView") || + isSubclassOf("QtQuick.GridView") || + isSubclassOf("QtQuick.PathView")); } bool NodeMetaInfo::isTabView() const { - return isSubclassOf("QtQuick.Controls.TabView", -1, -1); + return isSubclassOf("QtQuick.Controls.TabView"); } } // namespace QmlDesigner |