diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2015-09-17 08:54:38 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2015-09-17 06:37:19 +0000 |
| commit | cfa69dbbcc6d6f9b85a71961c3d60d9e9e690e2b (patch) | |
| tree | bac8202c310215f5f0183799fddcfe52a40e510b /src/plugins/modeleditor/actionhandler.cpp | |
| parent | 0b5b7ef67a15b3c0ef5d92c1f4020998a7261549 (diff) | |
ModelEditor: Fix MSVC compilation
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>
Diffstat (limited to 'src/plugins/modeleditor/actionhandler.cpp')
| -rw-r--r-- | src/plugins/modeleditor/actionhandler.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/plugins/modeleditor/actionhandler.cpp b/src/plugins/modeleditor/actionhandler.cpp index 5554a8b3c1..13be8d4326 100644 --- a/src/plugins/modeleditor/actionhandler.cpp +++ b/src/plugins/modeleditor/actionhandler.cpp @@ -130,10 +130,11 @@ void ActionHandler::createActions() medit->addAction(deleteCommand, Core::Constants::G_EDIT_COPYPASTE); d->deleteAction = deleteCommand->action(); d->selectAllAction = registerCommand(Core::Constants::SELECTALL, [this]() { selectAll(); })->action(); - registerCommand(Constants::ACTION_ADD_PACKAGE, 0); - registerCommand(Constants::ACTION_ADD_COMPONENT, 0); - registerCommand(Constants::ACTION_ADD_CLASS, 0); - registerCommand(Constants::ACTION_ADD_CANVAS_DIAGRAM, 0); + const std::function<void()> emptySlot; + registerCommand(Constants::ACTION_ADD_PACKAGE, emptySlot); + registerCommand(Constants::ACTION_ADD_COMPONENT, emptySlot); + registerCommand(Constants::ACTION_ADD_CLASS, emptySlot); + registerCommand(Constants::ACTION_ADD_CANVAS_DIAGRAM, emptySlot); } void ActionHandler::createEditPropertiesShortcut(const Core::Id &shortcutId) |