diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-18 17:47:05 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-18 17:47:05 (GMT) |
| commit | 84408e18ac5a5ccc69cf34832f31ef63b3ff9f11 (patch) | |
| tree | 16a5eb509930c5696e01b62c4f71146fd262296a /src/gui/kernel | |
| parent | 5d5cfa71fbb7ed7b4e7f43f015acbeb7b8b00807 (diff) | |
| parent | 89c6b83ee22ceb009c26c826cc4158d179312434 (diff) | |
| download | Qt-84408e18ac5a5ccc69cf34832f31ef63b3ff9f11.zip Qt-84408e18ac5a5ccc69cf34832f31ef63b3ff9f11.tar.gz Qt-84408e18ac5a5ccc69cf34832f31ef63b3ff9f11.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
Doc: Clarified the range of return values from QLineF::angle().
Doc: Fixed \since declarations.
Doc: Standardized on QtQuick for \since declarations.
Doc: Removed whitespace.
Modified \since command behavior slightly to handle project and version.
Doc: Added a simple introduction to Qt and fixed links.
Doc: Added more appropriate links to help reduce confusion.
Doc: Removed non-ASCII characters from the documentation.
qdoc: Fixed QTBUG-19338
Diffstat (limited to 'src/gui/kernel')
| -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 f8e4e57..8635bf2 100644 --- a/src/gui/kernel/qkeysequence.cpp +++ b/src/gui/kernel/qkeysequence.cpp @@ -934,7 +934,7 @@ QKeySequence::QKeySequence(const QString &key) } /*! - \since 4.x + \since 4.7 Creates a key sequence from the \a key string based on \a format. */ QKeySequence::QKeySequence(const QString &key, QKeySequence::SequenceFormat format) @@ -1131,7 +1131,7 @@ int QKeySequence::assign(const QString &ks) /*! \fn int QKeySequence::assign(const QString &keys, QKeySequence::SequenceFormat format) - \since 4.x + \since 4.7 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 |