diff options
| author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-08-31 07:38:52 (GMT) |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-08-31 07:39:36 (GMT) |
| commit | 0e10b8dbb7d84694cbdeb57bf42df52b12d79f47 (patch) | |
| tree | e0968185c3afce109537977c9eb0df4cfd8f6cb7 /src/gui/kernel/qkeysequence.cpp | |
| parent | ac51ebee5bcc975829cf59012dfe9bb198016ed1 (diff) | |
| parent | 5a9000c3aca05e28c4fc537f82d85d6ec4395dc5 (diff) | |
| download | Qt-0e10b8dbb7d84694cbdeb57bf42df52b12d79f47.zip Qt-0e10b8dbb7d84694cbdeb57bf42df52b12d79f47.tar.gz Qt-0e10b8dbb7d84694cbdeb57bf42df52b12d79f47.tar.bz2 | |
Merge branch 4.7 into qt-4.8-from-4.7
Conflicts:
doc/src/index.qdoc
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 117b72f..5fc72d4 100644 --- a/src/gui/kernel/qkeysequence.cpp +++ b/src/gui/kernel/qkeysequence.cpp @@ -933,7 +933,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) @@ -1130,7 +1130,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 |