diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-27 01:43:46 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-27 01:43:46 (GMT) |
| commit | e2c2e7e7fb3bee99260dc5b7bfab42c9217c18c8 (patch) | |
| tree | c466ef854854b646f590efbd63563fd872177880 /src/gui/kernel/qkeysequence.cpp | |
| parent | 20b1263695169e88207c8a4c4aac968a6044931b (diff) | |
| parent | e028a54690f2fedfae6da19fb24b7401e4a71e56 (diff) | |
| download | Qt-e2c2e7e7fb3bee99260dc5b7bfab42c9217c18c8.zip Qt-e2c2e7e7fb3bee99260dc5b7bfab42c9217c18c8.tar.gz Qt-e2c2e7e7fb3bee99260dc5b7bfab42c9217c18c8.tar.bz2 | |
Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
Fixed use of deleted object in XmlPatterns EvaluationCache
Crash when creating scroll bar skin graphics on S60 (debug only)
QS60Style omits drawing theme background in some Symbian SDKs
Fix for qml1shaderplugin GPU resource handling on Symbian
Make it easier to select words at the start of a line.
Doc: Fixing typo
In landscape mode QComboboBox popup can not be showed completely
Fix left alignment of native RTL pre-edit text.
Diffstat (limited to 'src/gui/kernel/qkeysequence.cpp')
| -rw-r--r-- | src/gui/kernel/qkeysequence.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp index 5fc72d4..117b72f 100644 --- a/src/gui/kernel/qkeysequence.cpp +++ b/src/gui/kernel/qkeysequence.cpp @@ -933,7 +933,7 @@ QKeySequence::QKeySequence(const QString &key) } /*! - \since 4.7 + \since 4.x Creates a key sequence from the \a key string based on \a format. */ QKeySequence::QKeySequence(const QString &key, QKeySequence::SequenceFormat format) @@ -1130,7 +1130,7 @@ int QKeySequence::assign(const QString &ks) /*! \fn int QKeySequence::assign(const QString &keys, QKeySequence::SequenceFormat format) - \since 4.7 + \since 4.x Adds the given \a keys to the key sequence (based on \a format). \a keys may contain up to four key codes, provided they are |