diff options
| author | Erik Verbruggen <erik.verbruggen@nokia.com> | 2009-07-16 12:46:11 +0200 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@nokia.com> | 2009-07-16 12:46:11 +0200 |
| commit | be69b8256ae4baec1feaa9a33f69d5cb0fb3839a (patch) | |
| tree | aabe7281c2f7e90d471421b53f0b41cd29bd146a /src/plugins/debugger/watchutils.cpp | |
| parent | ef58d082ea6498f3c2bafeb68d8bd2359ec241c1 (diff) | |
| parent | 200b06581ab725c33c08e66062c7c56edb4c5ed3 (diff) | |
| download | qt-creator-be69b8256ae4baec1feaa9a33f69d5cb0fb3839a.tar.gz | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
Diffstat (limited to 'src/plugins/debugger/watchutils.cpp')
| -rw-r--r-- | src/plugins/debugger/watchutils.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/plugins/debugger/watchutils.cpp b/src/plugins/debugger/watchutils.cpp index d6daad1551..490fd2a64a 100644 --- a/src/plugins/debugger/watchutils.cpp +++ b/src/plugins/debugger/watchutils.cpp @@ -798,7 +798,6 @@ QtDumperHelper::ExpressionRequirement QtDumperHelper::expressionRequirements(Typ switch (t) { case QAbstractItemType: - case QVectorType: return NeedsComplexExpression; case QMapType: case QMultiMapType: @@ -1353,14 +1352,6 @@ void QtDumperHelper::evaluationParameters(const WatchData &data, case QAbstractItemType: inner = data.addr.mid(1); break; - case QVectorType: - if (m_qtVersion >= 0x040600) - extraArgs[1] = QString("(char*)&((%1).p->array)-(char*)((%2).p)") - .arg(data.exp).arg(data.exp); - else - extraArgs[1] = QString("(char*)&((%1).d->array)-(char*)((%2).d)") - .arg(data.exp).arg(data.exp); - break; case QObjectSlotType: case QObjectSignalType: { // we need the number out of something like @@ -1453,6 +1444,7 @@ void QtDumperHelper::evaluationParameters(const WatchData &data, qWarning("Unknown type encountered in %s.\n", Q_FUNC_INFO); break; case SupportedType: + case QVectorType: case QObjectType: case QWidgetType: break; |