1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle -1 (Invalid Key) and Qt::Key_unknown gracefully in encodeString.

Browse Source 
Previously they would fall into the unicode handling and return very
strange values.

Change-Id: I62a53894c0983bf53fd79f924b40a6fd3ba02993
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
This commit is contained in:
David Faure 2011-12-22 19:02:34 +01:00 committed by Qt by Nokia
parent 628d3f85d2
commit 05ca21411e
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/kernel/qkeysequence.cpp
View File

@ -1342,6 +1342,11 @@ QString QKeySequencePrivate::encodeString(int key, QKeySequence::SequenceFormat
{ {
bool nativeText = (format == QKeySequence::NativeText); bool nativeText = (format == QKeySequence::NativeText);
QString s; QString s;
// Handle -1 (Invalid Key) and Qt::Key_unknown gracefully
if (key == -1 || key == Qt::Key_unknown)
return s;
#if defined(Q_OS_MAC) #if defined(Q_OS_MAC)
if (nativeText) { if (nativeText) {
// On Mac OS X the order (by default) is Meta, Alt, Shift, Control. // On Mac OS X the order (by default) is Meta, Alt, Shift, Control.

20
tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp
View File

@ -122,6 +122,8 @@ private slots:
void mnemonic(); void mnemonic();
void toString_data(); void toString_data();
void toString(); void toString();
void toStringFromKeycode_data();
void toStringFromKeycode();
void streamOperators_data(); void streamOperators_data();
void streamOperators(); void streamOperators();
void parseString_data(); void parseString_data();
@ -476,6 +478,24 @@ void tst_QKeySequence::toString()
} }
void tst_QKeySequence::toStringFromKeycode_data()
{
QTest::addColumn<QKeySequence>("keycode");
QTest::addColumn<QString>("expectedString");
QTest::newRow("A") << QKeySequence(Qt::Key_A) << "A";
QTest::newRow("-1") << QKeySequence(-1) << "";
QTest::newRow("Unknown") << QKeySequence(Qt::Key_unknown) << "";
}
void tst_QKeySequence::toStringFromKeycode()
{
QFETCH(QKeySequence, keycode);
QFETCH(QString, expectedString);
QCOMPARE(QKeySequence(keycode).toString(), expectedString);
}
void tst_QKeySequence::streamOperators_data() void tst_QKeySequence::streamOperators_data()
{ {
operatorQString_data(); operatorQString_data();