Commit 35473d9f authored by Thomas Hartmann's avatar Thomas Hartmann Committed by Marco Bubke

QmlDesigner.MetaInfo: rename qml() to qmlPath()

qml() is too ambiguous.

Change-Id: I7b56f53f64ce349657e3a462769c11880a1afe04
Reviewed-by: default avatarMarco Bubke <marco.bubke@digia.com>
parent 13e2e711
...@@ -69,7 +69,7 @@ public: ...@@ -69,7 +69,7 @@ public:
int minorVersion() const; int minorVersion() const;
QString category() const; QString category() const;
QIcon dragIcon() const; QIcon dragIcon() const;
QString qml() const; QString qmlPath() const;
QString qmlSource() const; QString qmlSource() const;
QString requiredImport() const; QString requiredImport() const;
bool forceImport() const; bool forceImport() const;
...@@ -89,7 +89,7 @@ public: ...@@ -89,7 +89,7 @@ public:
void setDragIcon(const QIcon &icon); void setDragIcon(const QIcon &icon);
void setIcon(const QIcon &icon); void setIcon(const QIcon &icon);
void setCategory(const QString &category); void setCategory(const QString &category);
void setQml(const QString &qml); void setQmlPath(const QString &qml);
void setRequiredImport(const QString &requiredImport); void setRequiredImport(const QString &requiredImport);
void setForceImport(bool b); void setForceImport(bool b);
private: private:
......
...@@ -121,7 +121,7 @@ TypeName ItemLibraryEntry::typeName() const ...@@ -121,7 +121,7 @@ TypeName ItemLibraryEntry::typeName() const
return m_data->typeName; return m_data->typeName;
} }
QString ItemLibraryEntry::qml() const QString ItemLibraryEntry::qmlPath() const
{ {
return m_data->qml; return m_data->qml;
} }
...@@ -199,7 +199,7 @@ static QString getSourceForUrl(const QString &fileURl) ...@@ -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; m_data->qml = qml;
......
...@@ -252,7 +252,7 @@ void MetaInfoReader::readPropertyProperty(const QString &name, const QVariant &v ...@@ -252,7 +252,7 @@ void MetaInfoReader::readPropertyProperty(const QString &name, const QVariant &v
void MetaInfoReader::readQmlSourceProperty(const QString &name, const QVariant &value) void MetaInfoReader::readQmlSourceProperty(const QString &name, const QVariant &value)
{ {
if (name == QLatin1String("source")) { if (name == QLatin1String("source")) {
m_currentEntry.setQml(absoluteFilePathForDocument(value.toString())); m_currentEntry.setQmlPath(absoluteFilePathForDocument(value.toString()));
} else { } else {
addError(tr("Unknown property for QmlSource %1").arg(name), currentSourceLocation()); addError(tr("Unknown property for QmlSource %1").arg(name), currentSourceLocation());
setParserState(Error); setParserState(Error);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment