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

Support QStringArgBuilder

Browse Source 
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 <orgads@gmail.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
This commit is contained in:
Thiago Macieira
2013-11-24 23:21:33 -08:00
committed by hjk
parent 0c6bc58e8d
commit d311877142
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/debugger/watchwindow.cpp
View File

@@ -594,7 +594,7 @@ void WatchTreeView::fillFormatMenu(QMenu *formatMenu, const QModelIndex &mi)
QString msg = (individualFormat == AutomaticFormat && typeFormat != AutomaticFormat) QString msg = (individualFormat == AutomaticFormat && typeFormat != AutomaticFormat)
? tr("Use Format for Type (Currently %1)") ? tr("Use Format for Type (Currently %1)")
.arg(WatchHandler::nameForFormat(typeFormat)) .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); QAction *clearIndividualFormatAction = formatMenu->addAction(spacer + msg);
clearIndividualFormatAction->setCheckable(true); clearIndividualFormatAction->setCheckable(true);