diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-19 13:49:33 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-19 13:49:33 (GMT) |
| commit | 42567d2e4d85e001f77767cabea8acb06daeb94d (patch) | |
| tree | 96c6e3241f322535834633b883808e3e44196495 /src/gui/kernel | |
| parent | b91d336573c9bfb2e7c93286a8e0b36e742bd775 (diff) | |
| parent | 0f01ad8c73e352a8368296820f4dd77f9da06114 (diff) | |
| download | Qt-42567d2e4d85e001f77767cabea8acb06daeb94d.zip Qt-42567d2e4d85e001f77767cabea8acb06daeb94d.tar.gz Qt-42567d2e4d85e001f77767cabea8acb06daeb94d.tar.bz2 | |
Merge remote branch 'origin/4.6' into qt-master-from-4.6
Conflicts:
tools/assistant/lib/qhelpsearchindexreader_clucene_p.h
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; |