diff options
| author | con <qtc-committer@nokia.com> | 2011-04-01 09:53:09 +0200 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2011-04-01 09:53:09 +0200 |
| commit | 1c2da511b908713210346df13c643ee9e05a58de (patch) | |
| tree | fbd537bc06e1d72d6671ee599a460e7cd38dc433 /src/libs/qtcreatorcdbext/qtcreatorcdbextension.cpp | |
| parent | 12fd1dbb703b141f70860d47db5cb34e7f79c9e7 (diff) | |
| parent | eb03bd1a9303307038a9edb34a829f2db5701e62 (diff) | |
| download | qt-creator-1c2da511b908713210346df13c643ee9e05a58de.tar.gz | |
Merge remote branch 'origin/2.2'
Conflicts:
src/plugins/debugger/gdb/gdbengine.cpp
src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
src/plugins/qt4projectmanager/qt-maemo/maemoglobal.h
src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.h
Diffstat (limited to 'src/libs/qtcreatorcdbext/qtcreatorcdbextension.cpp')
| -rw-r--r-- | src/libs/qtcreatorcdbext/qtcreatorcdbextension.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/libs/qtcreatorcdbext/qtcreatorcdbextension.cpp b/src/libs/qtcreatorcdbext/qtcreatorcdbextension.cpp index 2e06e7a44f..8a77aa235d 100644 --- a/src/libs/qtcreatorcdbext/qtcreatorcdbextension.cpp +++ b/src/libs/qtcreatorcdbext/qtcreatorcdbextension.cpp @@ -1095,9 +1095,11 @@ extern "C" HRESULT CALLBACK test(CIDebugClient *client, PCSTR argsIn) break; case TestType: { const KnownType kt = knownType(testType, 0); - str << testType << ' ' << kt << " ["; + const std::string fixed = SymbolGroupValue::stripConst(testType); + const unsigned size = SymbolGroupValue::sizeOf(fixed.c_str()); + str << '"' << testType << "\" (" << fixed << ") " << kt << " ["; formatKnownTypeFlags(str, kt); - str << ']'; + str << "] size=" << size; } break; case TestFixWatchExpression: |