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

Fix that menus didn't show ampersands in files names

Browse Source 
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>
This commit is contained in:
Eike Ziller
2018-03-26 10:44:10 +02:00
parent 3fa8db13e9
commit f1e02c0826
7 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/git/gitplugin.cpp
View File

@@ -59,9 +59,10 @@
#include <coreplugin/messagebox.h>
#include <utils/asconst.h>
#include <utils/qtcassert.h>
#include <utils/parameteraction.h>
#include <utils/pathchooser.h>
#include <utils/qtcassert.h>
#include <utils/stringutils.h>
#include <utils/utilsicons.h>
#include <texteditor/texteditor.h>
@@ -1358,7 +1359,7 @@ void GitPlugin::updateActions(VcsBasePlugin::ActionState as)
updateVersionWarning();
// Note: This menu is visible if there is no repository. Only
// 'Create Repository'/'Show' actions should be available.
const QString fileName = state.currentFileName();
const QString fileName = Utils::quoteAmpersands(state.currentFileName());
for (ParameterAction *fileAction : Utils::asConst(m_fileActions))
fileAction->setParameter(fileName);
// If the current file looks like a patch, offer to apply