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

Designer: Compile with QT_NO_CAST_FROM_ASCII.

Browse Source 
Change-Id: If9c8c58f1b86fe8b32f24240bd256b5bb8790c6c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
This commit is contained in:
Friedemann Kleint
2012-01-20 15:18:58 +01:00
parent 26796f6024
commit d96c1a746e
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/designer/designer.pro
View File

@@ -1,6 +1,6 @@
TEMPLATE = lib TEMPLATE = lib
TARGET = Designer TARGET = Designer
DEFINES += DESIGNER_LIBRARY DEFINES += DESIGNER_LIBRARY QT_NO_CAST_FROM_ASCII
include(../../qtcreatorplugin.pri) include(../../qtcreatorplugin.pri)
include(../../shared/designerintegrationv2/designerintegration.pri) include(../../shared/designerintegrationv2/designerintegration.pri)

2
src/plugins/designer/formeditorfactory.cpp
View File

@@ -77,7 +77,7 @@ Core::IFile *FormEditorFactory::open(const QString &fileName)
if (!iface) if (!iface)
return 0; return 0;
if (qobject_cast<FormWindowEditor *>(iface)) { 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.")); tr("This file can only be edited in <b>Design</b> mode."));
info.setCustomButtonInfo(tr("Switch mode"), this, SLOT(designerModeClicked())); info.setCustomButtonInfo(tr("Switch mode"), this, SLOT(designerModeClicked()));
iface->file()->infoBar()->addInfo(info); iface->file()->infoBar()->addInfo(info);

8
src/plugins/designer/formeditorw.cpp
View File

@@ -103,7 +103,7 @@
#include <QtCore/QPluginLoader> #include <QtCore/QPluginLoader>
#include <QtCore/QTime> #include <QtCore/QTime>
static const char settingsGroup[] = "Designer"; static const char settingsGroupC[] = "Designer";
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
enum { osMac = 1 }; enum { osMac = 1 };
@@ -216,7 +216,7 @@ FormEditorW::~FormEditorW()
m_core->removeContextObject(m_context); m_core->removeContextObject(m_context);
if (m_initStage == FullyInitialized) { if (m_initStage == FullyInitialized) {
if (QSettings *s = m_core->settings()) { if (QSettings *s = m_core->settings()) {
m_core->settings()->beginGroup(settingsGroup); m_core->settings()->beginGroup(QLatin1String(settingsGroupC));
m_editorWidget->saveSettings(s); m_editorWidget->saveSettings(s);
s->endGroup(); s->endGroup();
} }
@@ -332,7 +332,7 @@ void FormEditorW::fullInit()
// Nest toolbar and editor widget // Nest toolbar and editor widget
m_editorWidget = new EditorWidget(this); m_editorWidget = new EditorWidget(this);
QSettings *settings = m_core->settings(); QSettings *settings = m_core->settings();
settings->beginGroup(settingsGroup); settings->beginGroup(QLatin1String(settingsGroupC));
m_editorWidget->restoreSettings(settings); m_editorWidget->restoreSettings(settings);
settings->endGroup(); settings->endGroup();
@@ -674,7 +674,7 @@ void FormEditorW::setPreviewMenuEnabled(bool e)
void FormEditorW::saveSettings(QSettings *s) void FormEditorW::saveSettings(QSettings *s)
{ {
s->beginGroup(settingsGroup); s->beginGroup(QLatin1String(settingsGroupC));
m_editorWidget->saveSettings(s); m_editorWidget->saveSettings(s);
s->endGroup(); s->endGroup();
} }