diff options
| author | Tim Jenssen <tim.jenssen@qt.io> | 2024-03-13 18:25:08 +0100 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2024-03-13 18:25:08 +0100 |
| commit | 6ea8c6290c45510e6fa1af552537cefaaef57634 (patch) | |
| tree | 56ac8b4291281dda31b6b2df5b6908cf71f0eca8 /src/plugins/qmldesigner | |
| parent | 43ee39361f2a1790161c2fab2e637438083c3098 (diff) | |
| parent | cdad61d08a8ef3f02cdc3b11275b4dee461b9e8f (diff) | |
Merge remote-tracking branch 'origin/13.0' into qds/dev
Change-Id: I3adcadf18eb19344461c5a6a0b6d3aec9045430c
Diffstat (limited to 'src/plugins/qmldesigner')
| -rw-r--r-- | src/plugins/qmldesigner/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/qmldesigner/CMakeLists.txt b/src/plugins/qmldesigner/CMakeLists.txt index be7d5fa042..3f503c4231 100644 --- a/src/plugins/qmldesigner/CMakeLists.txt +++ b/src/plugins/qmldesigner/CMakeLists.txt @@ -478,6 +478,7 @@ add_qtc_plugin(QmlDesigner PLUGIN_DEPENDS Core ProjectExplorer QmlDesignerBase QmlJSEditor QmakeProjectManager QmlProjectManager QtSupport + PLUGIN_MANUAL_DEPENDS LicenseChecker ${IDE_VERSION} optional DEPENDS QmlJS LanguageUtils QmlEditorWidgets AdvancedDockingSystem Qt::QuickWidgets Qt::CorePrivate Qt::Xml Qt::Svg QmlDesignerCore Sqlite diff --git a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp index 3002f4d8de..85f904666c 100644 --- a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp +++ b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp @@ -1724,7 +1724,7 @@ bool NodeMetaInfo::hasProperty(Utils::SmallStringView propertyName) const if constexpr (useProjectStorage()) return isValid() && bool(propertyId(*m_projectStorage, m_typeId, propertyName)); else - return isValid() && m_privateData->properties().contains(propertyName); + return isValid() && m_privateData->properties().contains(QByteArrayView(propertyName)); } PropertyMetaInfos NodeMetaInfo::properties() const |