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

QmlProjectManager: Compile with QT_NO_CAST_FROM_ASCII

Browse Source 
Change-Id: Icac2d84abc001c963d78aa9e95911110463b4b04
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
This commit is contained in:
Orgad Shaneh
2012-11-26 21:24:16 +02:00
committed by Kai Koehne
parent b562f8175a
commit a24c1407a3
10 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
View File

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