aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhjk <qtc-committer@nokia.com>2009-08-27 16:07:35 +0200
committercon <qtc-committer@nokia.com>2009-08-27 16:23:39 +0200
commit2e0cd8cfd6388edeed98677778b71aad738a4253 (patch)
treec72ae3fd55bccb8bf1282cf04494063d0e6a9467
parent9b132ea0a4f045d35de4ea7466338cca5955d577 (diff)
debugger: fix display of slot lists
(cherry picked from commit 56b3561828868799993b447a823723f7b931db17)
-rw-r--r--src/plugins/debugger/watchhandler.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp
index 1587af28e7..7c5b221a63 100644
--- a/src/plugins/debugger/watchhandler.cpp
+++ b/src/plugins/debugger/watchhandler.cpp
@@ -780,8 +780,12 @@ bool operator<(const IName &iname1, const IName &iname2)
QString name1 = iname1.section('.', -1);
QString name2 = iname2.section('.', -1);
if (!name1.isEmpty() && !name2.isEmpty()) {
- if (name1.at(0).isDigit() && name2.at(0).isDigit())
- return name1.toInt() < name2.toInt();
+ if (name1.at(0).isDigit() && name2.at(0).isDigit()) {
+ bool ok1 = false, ok2 = false;
+ int i1 = name1.toInt(&ok1), i2 = name2.toInt(&ok2);
+ if (ok1 && ok2)
+ return i1 < i2;
+ }
}
return name1 < name2;
}