From d3118771422c71821908ac2ab88d1dcfba1a4d98 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sun, 24 Nov 2013 23:21:33 -0800 Subject: [PATCH] Support QStringArgBuilder With QStringArgBuilder, QString::arg() doesn't return exactly QString, which means we need to help the ?: operator to choose which return value it should have. Change-Id: I578383ac45d0bf9c6700d2f09bdfc126a81e54d7 Reviewed-by: Orgad Shaneh Reviewed-by: hjk --- src/plugins/debugger/watchwindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/debugger/watchwindow.cpp b/src/plugins/debugger/watchwindow.cpp index cd76bbe78c8..39e1ecfaddf 100644 --- a/src/plugins/debugger/watchwindow.cpp +++ b/src/plugins/debugger/watchwindow.cpp @@ -594,7 +594,7 @@ void WatchTreeView::fillFormatMenu(QMenu *formatMenu, const QModelIndex &mi) QString msg = (individualFormat == AutomaticFormat && typeFormat != AutomaticFormat) ? tr("Use Format for Type (Currently %1)") .arg(WatchHandler::nameForFormat(typeFormat)) - : tr("Use Display Format Based on Type") + QLatin1Char(' '); + : QString(tr("Use Display Format Based on Type") + QLatin1Char(' ')); QAction *clearIndividualFormatAction = formatMenu->addAction(spacer + msg); clearIndividualFormatAction->setCheckable(true);