diff --git a/src/plugins/qmldesigner/designercore/include/itemlibraryinfo.h b/src/plugins/qmldesigner/designercore/include/itemlibraryinfo.h index 4374aa0030acde7783e2841ea4db78e2266cd9f9..6218a04c429fe46f250b57ffd71860373b2b1b87 100644 --- a/src/plugins/qmldesigner/designercore/include/itemlibraryinfo.h +++ b/src/plugins/qmldesigner/designercore/include/itemlibraryinfo.h @@ -69,7 +69,7 @@ public: int minorVersion() const; QString category() const; QIcon dragIcon() const; - QString qml() const; + QString qmlPath() const; QString qmlSource() const; QString requiredImport() const; bool forceImport() const; @@ -89,7 +89,7 @@ public: void setDragIcon(const QIcon &icon); void setIcon(const QIcon &icon); void setCategory(const QString &category); - void setQml(const QString &qml); + void setQmlPath(const QString &qml); void setRequiredImport(const QString &requiredImport); void setForceImport(bool b); private: diff --git a/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp index 023590bd0c4e6355c3018a34a7562c1a19296c2c..c59e554cf8139aaa36a0d312c5ced5ac86aa7d06 100644 --- a/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp +++ b/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp @@ -121,7 +121,7 @@ TypeName ItemLibraryEntry::typeName() const return m_data->typeName; } -QString ItemLibraryEntry::qml() const +QString ItemLibraryEntry::qmlPath() const { return m_data->qml; } @@ -199,7 +199,7 @@ static QString getSourceForUrl(const QString &fileURl) } } -void ItemLibraryEntry::setQml(const QString &qml) +void ItemLibraryEntry::setQmlPath(const QString &qml) { m_data->qml = qml; diff --git a/src/plugins/qmldesigner/designercore/metainfo/metainforeader.cpp b/src/plugins/qmldesigner/designercore/metainfo/metainforeader.cpp index f697b3127c5c5a34d4f2a01f5c60fb7b364171a5..7bb5224cdea224d4495c3f96ea8deea5acc69236 100644 --- a/src/plugins/qmldesigner/designercore/metainfo/metainforeader.cpp +++ b/src/plugins/qmldesigner/designercore/metainfo/metainforeader.cpp @@ -252,7 +252,7 @@ void MetaInfoReader::readPropertyProperty(const QString &name, const QVariant &v void MetaInfoReader::readQmlSourceProperty(const QString &name, const QVariant &value) { if (name == QLatin1String("source")) { - m_currentEntry.setQml(absoluteFilePathForDocument(value.toString())); + m_currentEntry.setQmlPath(absoluteFilePathForDocument(value.toString())); } else { addError(tr("Unknown property for QmlSource %1").arg(name), currentSourceLocation()); setParserState(Error);