diff options
author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2012-11-26 21:24:16 +0200 |
---|---|---|
committer | Kai Koehne <kai.koehne@digia.com> | 2012-12-20 14:16:56 +0100 |
commit | a24c1407a38a6e33385bd1b415e459fc834010e9 (patch) | |
tree | 082d668e4e8be9f9c691a639aa251033657eb66e /src/plugins/qmlprojectmanager/qmlprojectplugin.cpp | |
parent | b562f8175a4f5d69f980ce9e23e52b9d9d68fc69 (diff) | |
download | qt-creator-a24c1407a38a6e33385bd1b415e459fc834010e9.tar.gz |
QmlProjectManager: Compile with QT_NO_CAST_FROM_ASCII
Change-Id: Icac2d84abc001c963d78aa9e95911110463b4b04
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Diffstat (limited to 'src/plugins/qmlprojectmanager/qmlprojectplugin.cpp')
-rw-r--r-- | src/plugins/qmlprojectmanager/qmlprojectplugin.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp index 5f2698acb8..4d63eeb2eb 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp @@ -89,7 +89,8 @@ bool QmlProjectPlugin::initialize(const QStringList &, QString *errorMessage) QmlProjectFileFormat::registerDeclarativeTypes(); Core::FileIconProvider *iconProvider = Core::FileIconProvider::instance(); - iconProvider->registerIconOverlayForSuffix(QIcon(QLatin1String(":/qmlproject/images/qmlproject.png")), "qmlproject"); + iconProvider->registerIconOverlayForSuffix(QIcon(QLatin1String(":/qmlproject/images/qmlproject.png")), + QLatin1String("qmlproject")); return true; } @@ -115,8 +116,8 @@ void QmlProjectPlugin::showQmlObserverToolWarning() dialog.exec(); if (dialog.clickedButton() == qtPref) { Core::ICore::showOptionsDialog( - ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY, - QtSupport::Constants::QTVERSION_SETTINGS_PAGE_ID); + QLatin1String(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY), + QLatin1String(QtSupport::Constants::QTVERSION_SETTINGS_PAGE_ID)); } } |