diff options
| author | Eike Ziller <[email protected]> | 2019-08-12 17:04:12 +0200 |
|---|---|---|
| committer | Eike Ziller <[email protected]> | 2019-08-12 17:04:12 +0200 |
| commit | 21c2bf7e72b6c48ac2ce013001f5bbdc118b1375 (patch) | |
| tree | 01c9a4ffb658c2cf3fac721508ddc809cfb8aae6 /src/plugins/debugger/watchhandler.cpp | |
| parent | a90b1c26b1d9f7b76dad51e5ec5f2c15f8816ad6 (diff) | |
| parent | 821f799ff3d017e9cdc8bfe3c96fed1982de8753 (diff) | |
Merge remote-tracking branch 'origin/4.10'
Conflicts:
src/plugins/python/CMakeLists.txt
Change-Id: I18808710dd99b97d4e1e7c3d223b7f814083de31
Diffstat (limited to 'src/plugins/debugger/watchhandler.cpp')
| -rw-r--r-- | src/plugins/debugger/watchhandler.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp index d3cfeebec83..66dc416f1ba 100644 --- a/src/plugins/debugger/watchhandler.cpp +++ b/src/plugins/debugger/watchhandler.cpp @@ -56,6 +56,7 @@ #include <utils/fancylineedit.h> #include <utils/qtcassert.h> #include <utils/savedaction.h> +#include <utils/stringutils.h> #include <utils/theme/theme.h> #include <QApplication> @@ -1583,8 +1584,7 @@ static QString removeWatchActionText(QString exp) exp.truncate(30); exp.append("..."); } - return WatchModel::tr("Remove Expression Evaluator for \"%1\"") - .arg(exp.replace('&', "&&")); + return WatchModel::tr("Remove Expression Evaluator for \"%1\"").arg(Utils::quoteAmpersands(exp)); } static void copyToClipboard(const QString &clipboardText) |