diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-19 02:50:38 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-19 02:50:38 (GMT) |
commit | 0f01ad8c73e352a8368296820f4dd77f9da06114 (patch) | |
tree | bdee720f7f004a7dae4c7a52d07317c0f8926056 /src/gui/kernel | |
parent | 14866f7fd79f39c2f20f5e0149fe6e11d7121d70 (diff) | |
parent | 85b82c845c32d383cdb9ec9f6ac21a0e86e4308a (diff) | |
download | Qt-0f01ad8c73e352a8368296820f4dd77f9da06114.zip Qt-0f01ad8c73e352a8368296820f4dd77f9da06114.tar.gz Qt-0f01ad8c73e352a8368296820f4dd77f9da06114.tar.bz2 |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Moving QDir benchmarks; making way for new test cases
Fixing QDir benchmarks...
QTreeView: Fix premature pessimization
Simplify code, fix a compiler warning... profit!
tst_qnetworkreply: Add another testcase
QNAM HTTP: Clean code a bit
QNAM HTTP: Always set channel.reply to 0 when done
Revert "Added note to make QList destructor virtual in version 5"
Fix s390(x) atomic ops related crashes
Fix undefined sequence point compiler warning
Diffstat (limited to 'src/gui/kernel')
-rw-r--r-- | src/gui/kernel/qsoftkeymanager.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/gui/kernel/qsoftkeymanager.cpp b/src/gui/kernel/qsoftkeymanager.cpp index 7412b06..c9a94ee 100644 --- a/src/gui/kernel/qsoftkeymanager.cpp +++ b/src/gui/kernel/qsoftkeymanager.cpp @@ -210,13 +210,11 @@ bool QSoftKeyManager::handleUpdateSoftKeys() d->requestedSoftKeyActions.clear(); bool recursiveMerging = false; QWidget *source = softkeySource(NULL, recursiveMerging); - do { - if (source) { - bool added = appendSoftkeys(*source, level); - source = softkeySource(source, recursiveMerging); - level = added ? ++level : level; - } - } while (source); + while (source) { + if (appendSoftkeys(*source, level)) + ++level; + source = softkeySource(source, recursiveMerging); + } d->updateSoftKeys_sys(); return true; |