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

Merge remote-tracking branch 'origin/2.4'

Browse Source 
Conflicts:
	qtcreator.pri
	src/libs/qmljs/qmljstypedescriptionreader.cpp
	src/plugins/analyzerbase/startremotedialog.ui
	src/plugins/qmldesigner/designercore/include/rewriterview.h
	src/plugins/qt4projectmanager/makestep.cpp

Change-Id: If9d15a8c8f73106585fd8ce6ac47c253a40af6b1
This commit is contained in:
Eike Ziller
2011-11-25 09:48:25 +01:00
parent 84aa93c2bb 7ff81c435a
commit e2b0835b58
61 changed files with 5528 additions and 965 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -457,16 +457,16 @@ QString WatchModel::formattedValue(const WatchData &data) const
QString result = value;
if (result.startsWith(QLatin1Char('<'))) {
if (result == QLatin1String("<Edit>"))
result = WatchHandler::tr("<Edit>");
else if (result == QLatin1String("<empty>"))
result = WatchHandler::tr("<empty>");
else if (result == QLatin1String("<uninitialized>"))
result = WatchHandler::tr("<uninitialized>");
else if (result == QLatin1String("<invalid>"))
result = WatchHandler::tr("<invalid>");
else if (result == QLatin1String("<not accessible>"))
result = WatchHandler::tr("<not accessible>");
else if (result.endsWith(" items>")) {
return WatchHandler::tr("<Edit>");
if (result == QLatin1String("<empty>"))
return WatchHandler::tr("<empty>");
if (result == QLatin1String("<uninitialized>"))
return WatchHandler::tr("<uninitialized>");
if (result == QLatin1String("<invalid>"))
return WatchHandler::tr("<invalid>");
if (result == QLatin1String("<not accessible>"))
return WatchHandler::tr("<not accessible>");
if (result.endsWith(" items>")) {
// '<10 items>' or '<>10 items>' (more than)
bool ok;
const bool moreThan = result.at(1) == QLatin1Char('>');
@@ -475,7 +475,7 @@ QString WatchModel::formattedValue(const WatchData &data) const
const int size = result.mid(numberPos, len).toInt(&ok);
QTC_ASSERT(ok, qWarning("WatchHandler: Invalid item count '%s'",
qPrintable(result)))
result = moreThan ?
return moreThan ?
WatchHandler::tr("<more than %n items>", 0, size) :
WatchHandler::tr("<%n items>", 0, size);
}