diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-18 14:49:44 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-18 14:49:44 (GMT) |
| commit | 2e949cb66ad81fa052f832d5a9c7317106a65e51 (patch) | |
| tree | 21bc663d19083e0d21d14cb1be13f53be5d24ce7 /src/gui | |
| parent | 7cfae48c7ff8b0f8fa6e0a530ff86b30c1665508 (diff) | |
| parent | a4332ce058cf3fe567b386d300ba740442a69f44 (diff) | |
| download | Qt-2e949cb66ad81fa052f832d5a9c7317106a65e51.zip Qt-2e949cb66ad81fa052f832d5a9c7317106a65e51.tar.gz Qt-2e949cb66ad81fa052f832d5a9c7317106a65e51.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:
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')
| -rw-r--r-- | src/gui/kernel/qsoftkeymanager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qsoftkeymanager.cpp b/src/gui/kernel/qsoftkeymanager.cpp index 7412b06..d3cef86 100644 --- a/src/gui/kernel/qsoftkeymanager.cpp +++ b/src/gui/kernel/qsoftkeymanager.cpp @@ -214,7 +214,7 @@ bool QSoftKeyManager::handleUpdateSoftKeys() if (source) { bool added = appendSoftkeys(*source, level); source = softkeySource(source, recursiveMerging); - level = added ? ++level : level; + level = added ? level + 1 : level; } } while (source); |