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

Core: Build with QT_NO_CAST_FROM_ASCII

Browse Source 
Change-Id: If8e5d9ce875f8467a7699b791e5ec962baf8ff38
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Orgad Shaneh
2012-11-18 22:33:50 +02:00
committed by hjk
parent 74387106d3
commit 1cba4a5af3
6 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/coreplugin/coreplugin.pro
View File

@@ -1,6 +1,7 @@
TEMPLATE = lib TEMPLATE = lib
TARGET = Core TARGET = Core
DEFINES += CORE_LIBRARY DEFINES += CORE_LIBRARY \
QT_NO_CAST_FROM_ASCII
QT += network \ QT += network \
script \ script \
sql sql

1
src/plugins/coreplugin/coreplugin.qbs
View File

@@ -32,6 +32,7 @@ QtcPlugin {
] ]
} }
cpp.defines: base.concat([ "QT_NO_CAST_FROM_ASCII" ])
files: [ files: [
"basefilewizard.cpp", "basefilewizard.cpp",
"basefilewizard.h", "basefilewizard.h",

8
src/plugins/coreplugin/editormanager/editorview.cpp
View File

@@ -766,14 +766,14 @@ void SplitterOrView::unsplit()
if (parentSplitter) { // not the toplevel splitterOrView if (parentSplitter) { // not the toplevel splitterOrView
if (parentSplitter->orientation() == Qt::Horizontal) { if (parentSplitter->orientation() == Qt::Horizontal) {
if (parentSplitter->widget(0) == this) if (parentSplitter->widget(0) == this)
m_view->setCloseSplitIcon(QIcon(Constants::ICON_CLOSE_SPLIT_LEFT)); m_view->setCloseSplitIcon(QIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_LEFT)));
else else
m_view->setCloseSplitIcon(QIcon(Constants::ICON_CLOSE_SPLIT_RIGHT)); m_view->setCloseSplitIcon(QIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_RIGHT)));
} else { } else {
if (parentSplitter->widget(0) == this) if (parentSplitter->widget(0) == this)
m_view->setCloseSplitIcon(QIcon(Constants::ICON_CLOSE_SPLIT_TOP)); m_view->setCloseSplitIcon(QIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_TOP)));
else else
m_view->setCloseSplitIcon(QIcon(Constants::ICON_CLOSE_SPLIT_BOTTOM)); m_view->setCloseSplitIcon(QIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_BOTTOM)));
} }
} }
} }

2
src/plugins/coreplugin/mainwindow.cpp
View File

@@ -189,7 +189,7 @@ MainWindow::MainWindow() :
if (Utils::HostOsInfo::isAnyUnixHost() && !Utils::HostOsInfo::isMacHost()) { if (Utils::HostOsInfo::isAnyUnixHost() && !Utils::HostOsInfo::isMacHost()) {
if (baseName == QLatin1String("windows")) { if (baseName == QLatin1String("windows")) {
// Sometimes we get the standard windows 95 style as a fallback // Sometimes we get the standard windows 95 style as a fallback
if (QStyleFactory::keys().contains("Fusion")) if (QStyleFactory::keys().contains(QLatin1String("Fusion")))
baseName = QLatin1String("fusion"); // Qt5 baseName = QLatin1String("fusion"); // Qt5
else { // Qt4 else { // Qt4
// e.g. if we are running on a KDE4 desktop // e.g. if we are running on a KDE4 desktop

8
src/plugins/coreplugin/outputpanemanager.cpp
View File

@@ -633,7 +633,7 @@ OutputPaneToggleButton::OutputPaneToggleButton(int number, const QString &text,
fnt.setPixelSize(11); fnt.setPixelSize(11);
m_label->setFont(fnt); m_label->setFont(fnt);
m_label->setAlignment(Qt::AlignCenter); m_label->setAlignment(Qt::AlignCenter);
m_label->setStyleSheet("background-color: #818181; color: white; border-radius: 6; padding-left: 4; padding-right: 4;"); m_label->setStyleSheet(QLatin1String("background-color: #818181; color: white; border-radius: 6; padding-left: 4; padding-right: 4;"));
m_label->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); m_label->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
m_label->hide(); m_label->hide();
} }
@@ -700,9 +700,11 @@ void OutputPaneToggleButton::checkStateSet()
m_flashTimer->stop(); m_flashTimer->stop();
if (isChecked()) if (isChecked())
m_label->setStyleSheet("background-color: #e1e1e1; color: #606060; border-radius: 6; padding-left: 4; padding-right: 4;"); m_label->setStyleSheet(QLatin1String("background-color: #e1e1e1; color: #606060; "
"border-radius: 6; padding-left: 4; padding-right: 4;"));
else else
m_label->setStyleSheet("background-color: #818181; color: white; border-radius: 6; padding-left: 4; padding-right: 4;"); m_label->setStyleSheet(QLatin1String("background-color: #818181; color: white; border-radius: 6; "
"padding-left: 4; padding-right: 4;"));
} }
void OutputPaneToggleButton::flash(int count) void OutputPaneToggleButton::flash(int count)

2
src/plugins/coreplugin/variablechooser.cpp
View File

@@ -60,7 +60,7 @@ VariableChooser::VariableChooser(QWidget *parent) :
VariableManager *vm = VariableManager::instance(); VariableManager *vm = VariableManager::instance();
foreach (const QByteArray &variable, vm->variables()) foreach (const QByteArray &variable, vm->variables())
ui->variableList->addItem(variable); ui->variableList->addItem(QString::fromLatin1(variable));
connect(ui->variableList, SIGNAL(currentTextChanged(QString)), connect(ui->variableList, SIGNAL(currentTextChanged(QString)),
this, SLOT(updateDescription(QString))); this, SLOT(updateDescription(QString)));