feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

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

Browse Source 
qml() is too ambiguous.

Change-Id: I7b56f53f64ce349657e3a462769c11880a1afe04
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
This commit is contained in:
Thomas Hartmann
2013-07-31 17:53:56 +02:00
committed by Marco Bubke
parent 13e2e71181
commit 35473d9fd2
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmldesigner/designercore/include/itemlibraryinfo.h
View File

@@ -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:
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:

4
src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp
View File

@@ -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)
} }
} }
void ItemLibraryEntry::setQml(const QString &qml) void ItemLibraryEntry::setQmlPath(const QString &qml)
{ {
m_data->qml = qml; m_data->qml = qml;

2
src/plugins/qmldesigner/designercore/metainfo/metainforeader.cpp
View File

@@ -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);