diff options
author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2012-11-21 22:43:22 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2012-11-22 08:53:45 +0100 |
commit | 75a3728254bc4016451038d519e7d078304e585a (patch) | |
tree | 73f430a4ca9f209ad859f480064b5d33e0d5b784 /src/plugins/qmljstools/qmljstoolssettings.cpp | |
parent | cdf5a10d4e1d6b08cea3abe1f010d54eef28d3dd (diff) | |
download | qt-creator-75a3728254bc4016451038d519e7d078304e585a.tar.gz |
QmlJSTools: Compile with QT_NO_CAST_FROM_ASCII
Change-Id: I370075ce75682ea11790a8f91339a01fb3c247f9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src/plugins/qmljstools/qmljstoolssettings.cpp')
-rw-r--r-- | src/plugins/qmljstools/qmljstoolssettings.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/qmljstools/qmljstoolssettings.cpp b/src/plugins/qmljstools/qmljstoolssettings.cpp index 24be181d7c..be35adb071 100644 --- a/src/plugins/qmljstools/qmljstoolssettings.cpp +++ b/src/plugins/qmljstools/qmljstoolssettings.cpp @@ -69,7 +69,7 @@ QmlJSToolsSettings::QmlJSToolsSettings(QObject *parent) m_globalCodeStyle = new SimpleCodeStylePreferences(this); m_globalCodeStyle->setDelegatingPool(pool); m_globalCodeStyle->setDisplayName(tr("Global", "Settings")); - m_globalCodeStyle->setId(idKey); + m_globalCodeStyle->setId(QLatin1String(idKey)); pool->addCodeStyle(m_globalCodeStyle); textEditorSettings->registerCodeStyle(QmlJSTools::Constants::QML_JS_SETTINGS_ID, m_globalCodeStyle); @@ -94,7 +94,7 @@ QmlJSToolsSettings::QmlJSToolsSettings(QObject *parent) // load global settings (after built-in settings are added to the pool) QSettings *s = Core::ICore::settings(); - m_globalCodeStyle->fromSettings(QmlJSTools::Constants::QML_JS_SETTINGS_ID, s); + m_globalCodeStyle->fromSettings(QLatin1String(QmlJSTools::Constants::QML_JS_SETTINGS_ID), s); // legacy handling start (Qt Creator Version < 2.4) const bool legacyTransformed = @@ -129,7 +129,7 @@ QmlJSToolsSettings::QmlJSToolsSettings(QObject *parent) // change the current delegate and save m_globalCodeStyle->setCurrentDelegate(oldCreator); - m_globalCodeStyle->toSettings(QmlJSTools::Constants::QML_JS_SETTINGS_ID, s); + m_globalCodeStyle->toSettings(QLatin1String(QmlJSTools::Constants::QML_JS_SETTINGS_ID), s); } // mark old settings as transformed s->setValue(QLatin1String("QmlJSTabPreferences/LegacyTransformed"), true); |