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

ModelEditor: Fix MSVC compilation

Browse Source 
QStringLiteral does not work with split string literal and MSVC.
Only the first part gets a 'L' prepended, and an
"error C2308: concatenating mismatched strings"
is generated.

Change-Id: I3edf1259103ea5168aef06c0a81aab4a381d0f83
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2015-09-17 08:54:38 +03:00
committed by Orgad Shaneh
parent 0b5b7ef67a
commit cfa69dbbcc
2 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/modeleditor/abstracteditor.cpp
View File

@@ -164,18 +164,18 @@ void AbstractEditor::init(QWidget *parent)
d->leftToolBox->setStyle(windowsStyle); d->leftToolBox->setStyle(windowsStyle);
// TODO improve this (and the diagram colors) for use with dark theme // TODO improve this (and the diagram colors) for use with dark theme
d->leftToolBox->setStyleSheet( d->leftToolBox->setStyleSheet(
QStringLiteral("QToolBox::tab {" QLatin1String("QToolBox::tab {"
" margin-left: 2px;" " margin-left: 2px;"
" background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1," " background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,"
" stop: 0 #E1E1E1, stop: 0.4 #DDDDDD," " stop: 0 #E1E1E1, stop: 0.4 #DDDDDD,"
" stop: 0.5 #D8D8D8, stop: 1.0 #D3D3D3);" " stop: 0.5 #D8D8D8, stop: 1.0 #D3D3D3);"
" color: #606060;" " color: #606060;"
"}" "}"
"" ""
"QToolBox::tab:selected {" "QToolBox::tab:selected {"
" font: italic;" " font: italic;"
" color: black;" " color: black;"
"}")); "}"));
QFont font; QFont font;
font.setPointSizeF(font.pointSizeF() * 0.8); font.setPointSizeF(font.pointSizeF() * 0.8);
d->leftToolBox->setFont(font); d->leftToolBox->setFont(font);

9
src/plugins/modeleditor/actionhandler.cpp
View File

@@ -130,10 +130,11 @@ void ActionHandler::createActions()
medit->addAction(deleteCommand, Core::Constants::G_EDIT_COPYPASTE); medit->addAction(deleteCommand, Core::Constants::G_EDIT_COPYPASTE);
d->deleteAction = deleteCommand->action(); d->deleteAction = deleteCommand->action();
d->selectAllAction = registerCommand(Core::Constants::SELECTALL, [this]() { selectAll(); })->action(); d->selectAllAction = registerCommand(Core::Constants::SELECTALL, [this]() { selectAll(); })->action();
registerCommand(Constants::ACTION_ADD_PACKAGE, 0); const std::function<void()> emptySlot;
registerCommand(Constants::ACTION_ADD_COMPONENT, 0); registerCommand(Constants::ACTION_ADD_PACKAGE, emptySlot);
registerCommand(Constants::ACTION_ADD_CLASS, 0); registerCommand(Constants::ACTION_ADD_COMPONENT, emptySlot);
registerCommand(Constants::ACTION_ADD_CANVAS_DIAGRAM, 0); registerCommand(Constants::ACTION_ADD_CLASS, emptySlot);
registerCommand(Constants::ACTION_ADD_CANVAS_DIAGRAM, emptySlot);
} }
void ActionHandler::createEditPropertiesShortcut(const Core::Id &shortcutId) void ActionHandler::createEditPropertiesShortcut(const Core::Id &shortcutId)