Designer: Compile with QT_NO_CAST_FROM_ASCII.

Change-Id: If9c8c58f1b86fe8b32f24240bd256b5bb8790c6c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

3 files changed, 6 insertions, 6 deletions

diff --git a/src/plugins/designer/designer.pro b/src/plugins/designer/designer.pro
index aafd3c8fc2..4c879c1341 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 aecf163e41..49e388ef04 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<FormWindowEditor *>(iface)) {
-        Core::InfoBarEntry info(Constants::INFO_READ_ONLY,
+        Core::InfoBarEntry info(QLatin1String(Constants::INFO_READ_ONLY),
                                 tr("This file can only be edited in <b>Design</b> 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 f11fef7551..901c0a3683 100644
--- a/src/plugins/designer/formeditorw.cpp
+++ b/src/plugins/designer/formeditorw.cpp
@@ -103,7 +103,7 @@
 #include <QtCore/QPluginLoader>
 #include <QtCore/QTime>
 
-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();
 }