diff options
| author | Tim Jenssen <tim.jenssen@digia.com> | 2016-03-23 12:34:03 +0100 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@theqtcompany.com> | 2016-03-23 11:57:42 +0000 |
| commit | 61411f9415ef6f5bfa408ef5547af33cf76c1be0 (patch) | |
| tree | 9de537b692e42f66cfa9538898109c4248983207 /src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp | |
| parent | d27d51050c57f1b03a2e43e220b37d49c99f2f0e (diff) | |
Keep QT_RESTRICTED_CAST_FROM_ASCII in the designer
There is no reason to undefine QT_RESTRICTED_CAST_FROM_ASCII (anymore).
Change-Id: Iabeacc8a89d662e78986e2dc275c2096a9c9e519
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
Diffstat (limited to 'src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp')
| -rw-r--r-- | src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp index ea7cdbb061..786a5b8cc8 100644 --- a/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp +++ b/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp @@ -170,7 +170,7 @@ void ItemLibraryEntry::setLibraryEntryIconPath(const QString &iconPath) m_data->libraryEntryIconPath = iconPath; } -static QString getSourceForUrl(const QString &fileURl) +static QByteArray getSourceForUrl(const QString &fileURl) { Utils::FileReader fileReader; @@ -184,7 +184,7 @@ void ItemLibraryEntry::setQmlPath(const QString &qml) { m_data->qml = qml; - m_data->qmlSource = getSourceForUrl(qml); + m_data->qmlSource = QString::fromUtf8(getSourceForUrl(qml)); } void ItemLibraryEntry::setRequiredImport(const QString &requiredImport) @@ -264,7 +264,7 @@ ItemLibraryInfo::ItemLibraryInfo(QObject *parent) -QList<ItemLibraryEntry> ItemLibraryInfo::entriesForType(const QString &typeName, int majorVersion, int minorVersion) const +QList<ItemLibraryEntry> ItemLibraryInfo::entriesForType(const QByteArray &typeName, int majorVersion, int minorVersion) const { QList<ItemLibraryEntry> entries; |