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

Merge remote-tracking branch 'origin/4.10'

Browse Source 
Conflicts:
	src/plugins/python/CMakeLists.txt

Change-Id: I18808710dd99b97d4e1e7c3d223b7f814083de31
This commit is contained in:
Eike Ziller
2019-08-12 17:04:12 +02:00
parent a90b1c26b1 821f799ff3
commit 21c2bf7e72
29 changed files with 99 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/debugger/watchhandler.cpp
View File

@@ -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)