Commit f2d32be0c13472b2ad915e875095d8f3691d965e

Handle -1 (Invalid Key) and Qt::Key_unknown gracefully in encodeString
src/gui/kernel/qkeysequence.cpp
(5 / 0)
  
11551155{
11561156 bool nativeText = (format == QKeySequence::NativeText);
11571157 QString s;
1158
1159 // Handle -1 (Invalid Key) and Qt::Key_unknown gracefully
1160 if (key==-1 || key == Qt::Key_unknown)
1161 return s;
1162
11581163#if defined(Q_WS_MAC)
11591164 if (nativeText) {
11601165 // On Mac OS X the order (by default) is Meta, Alt, Shift, Control.
tests/auto/qkeysequence/tst_qkeysequence.cpp
(6 / 0)
  
122122 void mnemonic();
123123 void toString_data();
124124 void toString();
125 void toStringSpecial();
125126 void streamOperators_data();
126127 void streamOperators();
127128 void parseString_data();
……
422422 QCOMPARE(ks1.toString(QKeySequence::NativeText), platformString);
423423 QCOMPARE(ks1.toString(QKeySequence::PortableText), neutralString);
424424
425}
426
427void tst_QKeySequence::toStringSpecial()
428{
429 QCOMPARE(QKeySequence(Qt::Key_unknown).toString(), QString(""));
425430}
426431
427432void tst_QKeySequence::streamOperators_data()

Comments

Add a new comment:

Login or create an account to post a comment

Add your comment