diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-11-19 09:48:28 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-11-19 10:00:18 +0100 |
| commit | 3d1d9aae2e977ef599582074e0f4faaef454a595 (patch) | |
| tree | 8cd2aaba4d0ba10c46abd6ce5c10a349d2889e75 /src/plugins/macros | |
| parent | 40ad7ec995332b043ead31ee0739f04dd7ac0e90 (diff) | |
| parent | e164717108176ee1423f3f629a8182520c2909d1 (diff) | |
| download | qt-creator-3d1d9aae2e977ef599582074e0f4faaef454a595.tar.gz | |
Merge remote-tracking branch 'origin/4.8'
Conflicts:
src/plugins/winrt/winrtdevicefactory.cpp
Change-Id: I33b8697e2ebf2bea051d7f1144449e0743ee16a5
Diffstat (limited to 'src/plugins/macros')
| -rw-r--r-- | src/plugins/macros/macrosplugin.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/macros/macrosplugin.cpp b/src/plugins/macros/macrosplugin.cpp index 04c73425f2..c56520d9cf 100644 --- a/src/plugins/macros/macrosplugin.cpp +++ b/src/plugins/macros/macrosplugin.cpp @@ -74,14 +74,14 @@ bool MacrosPlugin::initialize(const QStringList &arguments, QString *errorMessag QAction *startMacro = new QAction(tr("Record Macro"), this); Core::Command *command = Core::ActionManager::registerAction(startMacro, Constants::START_MACRO, textContext); - command->setDefaultKeySequence(QKeySequence(Core::useMacShortcuts ? tr("Ctrl+(") : tr("Alt+("))); + command->setDefaultKeySequence(QKeySequence(Core::useMacShortcuts ? tr("Ctrl+[") : tr("Alt+["))); mmacrotools->addAction(command); connect(startMacro, &QAction::triggered, m_macroManager, &MacroManager::startMacro); QAction *endMacro = new QAction(tr("Stop Recording Macro"), this); endMacro->setEnabled(false); command = Core::ActionManager::registerAction(endMacro, Constants::END_MACRO); - command->setDefaultKeySequence(QKeySequence(Core::useMacShortcuts ? tr("Ctrl+)") : tr("Alt+)"))); + command->setDefaultKeySequence(QKeySequence(Core::useMacShortcuts ? tr("Ctrl+]") : tr("Alt+]"))); mmacrotools->addAction(command); connect(endMacro, &QAction::triggered, m_macroManager, &MacroManager::endMacro); |