diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-03-26 10:44:10 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-03-26 12:02:15 +0000 |
| commit | f1e02c0826f3baf0c77cefe63c996fee6002d4ae (patch) | |
| tree | 8c427778380132a47f5a8abee9309e9d17da9b73 /src/plugins/qmldesigner/shortcutmanager.cpp | |
| parent | 3fa8db13e922c18b71418afa586b6143c7618523 (diff) | |
Fix that menus didn't show ampersands in files names
And instead interpreted the ampersand + following character as an
accelerator key.
Task-number: QTCREATORBUG-17817
Change-Id: I327239499ce56e75fd12f2df5be60d4b04913acd
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/qmldesigner/shortcutmanager.cpp')
| -rw-r--r-- | src/plugins/qmldesigner/shortcutmanager.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/qmldesigner/shortcutmanager.cpp b/src/plugins/qmldesigner/shortcutmanager.cpp index 973f1ea758..066bb350e9 100644 --- a/src/plugins/qmldesigner/shortcutmanager.cpp +++ b/src/plugins/qmldesigner/shortcutmanager.cpp @@ -46,8 +46,9 @@ #include <utils/hostosinfo.h> #include <utils/proxyaction.h> -#include <utils/utilsicons.h> #include <utils/qtcassert.h> +#include <utils/stringutils.h> +#include <utils/utilsicons.h> #include <qmljs/qmljsreformatter.h> @@ -281,7 +282,7 @@ void ShortCutManager::updateActions(Core::IEditor* currentEditor) QString quotedName; if (currentEditor && document) - quotedName = '"' + document->displayName() + '"'; + quotedName = '"' + Utils::quoteAmpersands(document->displayName()) + '"'; m_saveAsAction.setText(tr("Save %1 As...").arg(quotedName)); m_saveAction.setText(tr("&Save %1").arg(quotedName)); |