Merge an overloaded QKeySequence constructor.
Change-Id: I14dc9234b9a4822f65338b75482cab05a017dc69 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
This commit is contained in:
parent
eb24dfcccb
commit
f5433b9666
@ -934,16 +934,6 @@ QKeySequence::QKeySequence()
|
|||||||
Note the "File|Open" translator comment. It is by no means
|
Note the "File|Open" translator comment. It is by no means
|
||||||
necessary, but it provides some context for the human translator.
|
necessary, but it provides some context for the human translator.
|
||||||
*/
|
*/
|
||||||
QKeySequence::QKeySequence(const QString &key)
|
|
||||||
{
|
|
||||||
d = new QKeySequencePrivate();
|
|
||||||
assign(key);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*!
|
|
||||||
\since 4.7
|
|
||||||
Creates a key sequence from the \a key string based on \a format.
|
|
||||||
*/
|
|
||||||
QKeySequence::QKeySequence(const QString &key, QKeySequence::SequenceFormat format)
|
QKeySequence::QKeySequence(const QString &key, QKeySequence::SequenceFormat format)
|
||||||
{
|
{
|
||||||
d = new QKeySequencePrivate();
|
d = new QKeySequencePrivate();
|
||||||
|
@ -146,8 +146,7 @@ public:
|
|||||||
};
|
};
|
||||||
|
|
||||||
QKeySequence();
|
QKeySequence();
|
||||||
QKeySequence(const QString &key);
|
QKeySequence(const QString &key, SequenceFormat format = NativeText);
|
||||||
QKeySequence(const QString &key, SequenceFormat format);
|
|
||||||
QKeySequence(int k1, int k2 = 0, int k3 = 0, int k4 = 0);
|
QKeySequence(int k1, int k2 = 0, int k3 = 0, int k4 = 0);
|
||||||
QKeySequence(const QKeySequence &ks);
|
QKeySequence(const QKeySequence &ks);
|
||||||
QKeySequence(StandardKey key);
|
QKeySequence(StandardKey key);
|
||||||
|
Loading…
Reference in New Issue
Block a user