diff --git a/src/plugins/designer/designer.pro b/src/plugins/designer/designer.pro index aafd3c8fc20..4c879c13412 100644 --- a/src/plugins/designer/designer.pro +++ b/src/plugins/designer/designer.pro @@ -1,6 +1,6 @@ TEMPLATE = lib TARGET = Designer -DEFINES += DESIGNER_LIBRARY +DEFINES += DESIGNER_LIBRARY QT_NO_CAST_FROM_ASCII include(../../qtcreatorplugin.pri) include(../../shared/designerintegrationv2/designerintegration.pri) diff --git a/src/plugins/designer/formeditorfactory.cpp b/src/plugins/designer/formeditorfactory.cpp index aecf163e41c..49e388ef046 100644 --- a/src/plugins/designer/formeditorfactory.cpp +++ b/src/plugins/designer/formeditorfactory.cpp @@ -77,7 +77,7 @@ Core::IFile *FormEditorFactory::open(const QString &fileName) if (!iface) return 0; if (qobject_cast(iface)) { - Core::InfoBarEntry info(Constants::INFO_READ_ONLY, + Core::InfoBarEntry info(QLatin1String(Constants::INFO_READ_ONLY), tr("This file can only be edited in Design mode.")); info.setCustomButtonInfo(tr("Switch mode"), this, SLOT(designerModeClicked())); iface->file()->infoBar()->addInfo(info); diff --git a/src/plugins/designer/formeditorw.cpp b/src/plugins/designer/formeditorw.cpp index f11fef75510..901c0a36830 100644 --- a/src/plugins/designer/formeditorw.cpp +++ b/src/plugins/designer/formeditorw.cpp @@ -103,7 +103,7 @@ #include #include -static const char settingsGroup[] = "Designer"; +static const char settingsGroupC[] = "Designer"; #ifdef Q_OS_MAC enum { osMac = 1 }; @@ -216,7 +216,7 @@ FormEditorW::~FormEditorW() m_core->removeContextObject(m_context); if (m_initStage == FullyInitialized) { if (QSettings *s = m_core->settings()) { - m_core->settings()->beginGroup(settingsGroup); + m_core->settings()->beginGroup(QLatin1String(settingsGroupC)); m_editorWidget->saveSettings(s); s->endGroup(); } @@ -332,7 +332,7 @@ void FormEditorW::fullInit() // Nest toolbar and editor widget m_editorWidget = new EditorWidget(this); QSettings *settings = m_core->settings(); - settings->beginGroup(settingsGroup); + settings->beginGroup(QLatin1String(settingsGroupC)); m_editorWidget->restoreSettings(settings); settings->endGroup(); @@ -674,7 +674,7 @@ void FormEditorW::setPreviewMenuEnabled(bool e) void FormEditorW::saveSettings(QSettings *s) { - s->beginGroup(settingsGroup); + s->beginGroup(QLatin1String(settingsGroupC)); m_editorWidget->saveSettings(s); s->endGroup(); }