Long live Qt 4.5!

5 files changed, 599 insertions, 0 deletions

diff --git a/tests/auto/qkeysequence/.gitignore b/tests/auto/qkeysequence/.gitignore
new file mode 100644
index 0000000..e06a7b0
--- /dev/null
+++ b/tests/auto/qkeysequence/.gitignore
@@ -0,0 +1 @@
+tst_qkeysequence
diff --git a/tests/auto/qkeysequence/keys_de.qm b/tests/auto/qkeysequence/keys_de.qm
new file mode 100644
index 0000000..5d7aedd
--- /dev/null
+++ b/tests/auto/qkeysequence/keys_de.qm
diff --git a/tests/auto/qkeysequence/keys_de.ts b/tests/auto/qkeysequence/keys_de.ts
new file mode 100644
index 0000000..1db18f1
--- /dev/null
+++ b/tests/auto/qkeysequence/keys_de.ts
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS><TS version="1.1" language="de">
+<context>
+    <name>tst_QKeySequence</name>
+    <message>
+        <location filename="tst_qkeysequence.cpp" line="369"/>
+        <source>Shift+K</source>
+        <translation type="obsolete">Umschalt+K</translation>
+    </message>
+    <message>
+        <location filename="tst_qkeysequence.cpp" line="370"/>
+        <source>Ctrl+K</source>
+        <translation type="obsolete">Strg+K</translation>
+    </message>
+    <message>
+        <location filename="tst_qkeysequence.cpp" line="371"/>
+        <source>Alt+K</source>
+        <translation type="obsolete">Alt+K</translation>
+    </message>
+    <message>
+        <location filename="tst_qkeysequence.cpp" line="391"/>
+        <source>Shift++</source>
+        <translation>Umschalt++</translation>
+    </message>
+    <message>
+        <location filename="tst_qkeysequence.cpp" line="392"/>
+        <source>Ctrl++</source>
+        <translation>Strg++</translation>
+    </message>
+    <message>
+        <location filename="tst_qkeysequence.cpp" line="393"/>
+        <source>Alt++</source>
+        <translation>Alt++</translation>
+    </message>
+    <message>
+        <location filename="tst_qkeysequence.cpp" line="394"/>
+        <source>Meta++</source>
+        <translation>Meta++</translation>
+    </message>
+    <message>
+        <location filename="tst_qkeysequence.cpp" line="401"/>
+        <source>Shift+,, Shift++</source>
+        <translation>Umschalt+,, Umschalt++</translation>
+    </message>
+    <message>
+        <location filename="tst_qkeysequence.cpp" line="402"/>
+        <source>Shift+,, Ctrl++</source>
+        <translation>Umschalt+,, Strg++</translation>
+    </message>
+    <message>
+        <location filename="tst_qkeysequence.cpp" line="403"/>
+        <source>Shift+,, Alt++</source>
+        <translation>Umschalt+,, Alt++</translation>
+    </message>
+    <message>
+        <location filename="tst_qkeysequence.cpp" line="404"/>
+        <source>Shift+,, Meta++</source>
+        <translation>Umschalt+,, Meta++</translation>
+    </message>
+</context>
+</TS>
diff --git a/tests/auto/qkeysequence/qkeysequence.pro b/tests/auto/qkeysequence/qkeysequence.pro
new file mode 100644
index 0000000..6566340
--- /dev/null
+++ b/tests/auto/qkeysequence/qkeysequence.pro
@@ -0,0 +1,6 @@
+load(qttest_p4)
+SOURCES  += tst_qkeysequence.cpp
+
+TRANSLATIONS += keys_de.ts
+
+
diff --git a/tests/auto/qkeysequence/tst_qkeysequence.cpp b/tests/auto/qkeysequence/tst_qkeysequence.cpp
new file mode 100644
index 0000000..33de82a
--- /dev/null
+++ b/tests/auto/qkeysequence/tst_qkeysequence.cpp
@@ -0,0 +1,531 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+#include <QtTest/QtTest>
+#include <private/qapplication_p.h>
+#include <qkeysequence.h>
+#include <private/qkeysequence_p.h>
+#include <QTranslator>
+#include <QLibraryInfo>
+
+//TESTED_CLASS=
+//TESTED_FILES=
+
+#ifdef Q_WS_MAC
+#include <Carbon/Carbon.h>
+struct MacSpecialKey {
+    int key;
+    ushort macSymbol;
+};
+
+static const int NumEntries = 21;
+static const MacSpecialKey entries[NumEntries] = {
+    { Qt::Key_Escape, 0x238B },
+    { Qt::Key_Tab, 0x21E5 },
+    { Qt::Key_Backtab, 0x21E4 },
+    { Qt::Key_Backspace, 0x232B },
+    { Qt::Key_Return, 0x21B5 },
+    { Qt::Key_Enter, 0x21B5 },
+    { Qt::Key_Delete, 0x2326 },
+    { Qt::Key_Home, 0x2196 },
+    { Qt::Key_End, 0x2198 },
+    { Qt::Key_Left, 0x2190 },
+    { Qt::Key_Up, 0x2191 },
+    { Qt::Key_Right, 0x2192 },
+    { Qt::Key_Down, 0x2193 },
+    { Qt::Key_PageUp, 0x21DE },
+    { Qt::Key_PageDown, 0x21DF },
+    { Qt::Key_Shift, kShiftUnicode },
+    { Qt::Key_Control, kCommandUnicode },
+    { Qt::Key_Meta, kControlUnicode },
+    { Qt::Key_Alt, kOptionUnicode },
+    { Qt::Key_CapsLock, 0x21EA },
+};
+
+static bool operator<(const MacSpecialKey &entry, int key)
+{
+    return entry.key < key;
+}
+
+static bool operator<(int key, const MacSpecialKey &entry)
+{
+    return key < entry.key;
+}
+
+static const MacSpecialKey * const MacSpecialKeyEntriesEnd = entries + NumEntries;
+
+static QChar macSymbolForQtKey(int key)
+{
+    const MacSpecialKey *i = qBinaryFind(entries, MacSpecialKeyEntriesEnd, key);
+    if (i == MacSpecialKeyEntriesEnd)
+        return QChar();
+    return QChar(i->macSymbol);
+}
+
+#endif
+
+class tst_QKeySequence : public QObject
+{
+    Q_OBJECT
+
+public:
+    tst_QKeySequence();
+    virtual ~tst_QKeySequence();
+
+private slots:
+    void operatorQString_data();
+    void operatorQString();
+    void compareConstructors_data();
+    void compareConstructors();
+    void symetricConstructors_data();
+    void symetricConstructors();
+    void checkMultipleNames();
+    void mnemonic();
+    void toString_data();
+    void toString();
+    void streamOperators_data();
+    void streamOperators();
+    void fromString_data();
+    void fromString();
+    void ensureSorted();
+    void standardKeys_data();
+    void standardKeys();
+    void keyBindings();
+    void translated_data();
+    void translated();
+
+    void initTestCase();
+private:
+    QTranslator *ourTranslator;
+    QTranslator *qtTranslator;
+#ifdef Q_WS_MAC
+    static const QString MacCtrl;
+    static const QString MacMeta;
+    static const QString MacAlt;
+    static const QString MacShift;
+#endif
+
+
+};
+
+#ifdef Q_WS_MAC
+const QString tst_QKeySequence::MacCtrl = QString(QChar(0x2318));
+const QString tst_QKeySequence::MacMeta = QString(QChar(0x2303));
+const QString tst_QKeySequence::MacAlt = QString(QChar(0x2325));
+const QString tst_QKeySequence::MacShift = QString(QChar(0x21E7));
+#endif
+
+tst_QKeySequence::tst_QKeySequence()
+{
+}
+
+tst_QKeySequence::~tst_QKeySequence()
+{
+
+}
+
+void tst_QKeySequence::initTestCase()
+{
+    ourTranslator = new QTranslator(this);
+    ourTranslator->load(QLatin1String("keys_de"), ".");
+    qtTranslator = new QTranslator(this);
+    qtTranslator->load(QLatin1String("qt_de"), QLibraryInfo::location(QLibraryInfo::TranslationsPath));
+}
+
+void tst_QKeySequence::operatorQString_data()
+{
+    QTest::addColumn<int>("modifiers");
+    QTest::addColumn<int>("keycode");
+    QTest::addColumn<QString>("keystring");
+
+    QTest::newRow( "No modifier" ) << 0 << int(Qt::Key_Aring | Qt::UNICODE_ACCEL) << QString( "\x0c5" );
+
+#ifndef Q_WS_MAC
+    QTest::newRow( "Ctrl+Left" ) << int(Qt::CTRL) << int(Qt::Key_Left) << QString( "Ctrl+Left" );
+#if QT_VERSION > 0x040100
+    QTest::newRow( "Ctrl+," ) << int(Qt::CTRL) << int(Qt::Key_Comma) << QString( "Ctrl+," );
+#endif
+    QTest::newRow( "Alt+Left" ) << int(Qt::ALT) << int(Qt::Key_Left) << QString( "Alt+Left" );
+    QTest::newRow( "Alt+Shift+Left" ) << int(Qt::ALT | Qt::SHIFT) << int(Qt::Key_Left) << QString( "Alt+Shift+Left" );
+    QTest::newRow( "Ctrl" ) << int(Qt::CTRL) << int(Qt::Key_Aring | Qt::UNICODE_ACCEL) << QString( "Ctrl+\x0c5" );
+    QTest::newRow( "Alt" ) << int(Qt::ALT) << int(Qt::Key_Aring | Qt::UNICODE_ACCEL) << QString( "Alt+\x0c5" );
+    QTest::newRow( "Shift" ) << int(Qt::SHIFT) << int(Qt::Key_Aring | Qt::UNICODE_ACCEL) << QString( "Shift+\x0c5" );
+    QTest::newRow( "Meta" ) << int(Qt::META) << int(Qt::Key_Aring | Qt::UNICODE_ACCEL) << QString( "Meta+\x0c5" );
+#else
+    QTest::newRow( "Ctrl+Left" ) << int(Qt::CTRL) << int(Qt::Key_Left) << MacCtrl + macSymbolForQtKey(Qt::Key_Left);
+#if QT_VERSION > 0x040100
+    QTest::newRow( "Ctrl+," ) << int(Qt::CTRL) << int(Qt::Key_Comma) << MacCtrl + ",";
+#endif
+    QTest::newRow( "Alt+Left" ) << int(Qt::ALT) << int(Qt::Key_Left) << MacAlt + macSymbolForQtKey(Qt::Key_Left);
+    QTest::newRow( "Alt+Shift+Left" ) << int(Qt::ALT | Qt::SHIFT) << int(Qt::Key_Left) << MacAlt + MacShift + macSymbolForQtKey(Qt::Key_Left);
+    QTest::newRow( "Ctrl" ) << int(Qt::CTRL) << int(Qt::Key_Aring | Qt::UNICODE_ACCEL) << MacCtrl + "\x0c5";
+    QTest::newRow( "Alt" ) << int(Qt::ALT) << int(Qt::Key_Aring | Qt::UNICODE_ACCEL) << MacAlt + "\x0c5";
+    QTest::newRow( "Shift" ) << int(Qt::SHIFT) << int(Qt::Key_Aring | Qt::UNICODE_ACCEL) << MacShift + "\x0c5";
+    QTest::newRow( "Meta" ) << int(Qt::META) << int(Qt::Key_Aring | Qt::UNICODE_ACCEL) << MacMeta + "\x0c5";
+#endif
+}
+
+void tst_QKeySequence::symetricConstructors_data()
+{
+    QTest::addColumn<int>("modifiers");
+    QTest::addColumn<int>("keycode");
+
+    QTest::newRow( "No modifier" ) << 0 << int(Qt::Key_Aring | Qt::UNICODE_ACCEL);
+    QTest::newRow( "Ctrl" ) << int(Qt::CTRL) << int(Qt::Key_Aring | Qt::UNICODE_ACCEL);
+    QTest::newRow( "Alt" ) << int(Qt::ALT) << int(Qt::Key_Aring | Qt::UNICODE_ACCEL);
+    QTest::newRow( "Shift" ) << int(Qt::SHIFT) << int(Qt::Key_Aring | Qt::UNICODE_ACCEL);
+    QTest::newRow( "Meta" ) << int(Qt::META) << int(Qt::Key_Aring | Qt::UNICODE_ACCEL);
+}
+
+void tst_QKeySequence::compareConstructors_data()
+{
+    operatorQString_data();
+}
+
+// operator QString()
+void tst_QKeySequence::operatorQString()
+{
+    QKeySequence seq;
+    QFETCH( int, modifiers );
+    QFETCH( int, keycode );
+    QFETCH( QString, keystring );
+
+    seq = QKeySequence( modifiers | keycode );
+
+    QCOMPARE( (QString)seq, keystring );
+}
+
+// this verifies that the constructors can handle the same strings in and out
+void tst_QKeySequence::symetricConstructors()
+{
+    QFETCH( int, modifiers );
+    QFETCH( int, keycode );
+
+    QKeySequence seq1( modifiers | keycode );
+    QKeySequence seq2( (QString)seq1 );
+
+    QVERIFY( seq1 == seq2 );
+}
+
+/* Compares QKeySequence constructurs with int or QString arguments
+   We don't do this for 3.0 since it doesn't support unicode accelerators */
+void tst_QKeySequence::compareConstructors()
+{
+    QFETCH( int, modifiers );
+    QFETCH( int, keycode );
+    QFETCH( QString, keystring );
+
+    QKeySequence qstringSeq( keystring );
+    QKeySequence intSeq( modifiers | keycode );
+
+    QVERIFY( qstringSeq == intSeq );
+}
+
+void tst_QKeySequence::checkMultipleNames()
+{
+    QKeySequence oldK( "Ctrl+Page Up" );
+    QKeySequence newK( "Ctrl+PgUp" );
+    QVERIFY( oldK == newK );
+}
+
+/*
+* We must ensure that the keyBindings data is allways sorted
+* so that we can safely perform binary searches.
+*/
+void tst_QKeySequence::ensureSorted()
+{
+//### accessing static members from private classes does not work on msvc at the moment
+#ifndef Q_WS_WIN
+    uint N = QKeySequencePrivate::numberOfKeyBindings;
+    uint val = QKeySequencePrivate::keyBindings[0].shortcut;
+    for ( uint i = 1 ; i < N ; ++i) {
+        uint nextval = QKeySequencePrivate::keyBindings[i].shortcut;
+        if (nextval < val)
+            qDebug() << "Data not sorted at index " << i;
+        QVERIFY(nextval >= val);
+        val = nextval;
+    }
+#endif
+}
+
+void tst_QKeySequence::standardKeys_data()
+{
+    QTest::addColumn<int>("standardKey");
+    QTest::addColumn<QString>("expected");
+    QTest::newRow("unknownkey") << (int)QKeySequence::UnknownKey<< QString("");
+    QTest::newRow("copy") << (int)QKeySequence::Copy << QString("CTRL+C");
+    QTest::newRow("cut") << (int)QKeySequence::Cut << QString("CTRL+X");
+    QTest::newRow("paste") << (int)QKeySequence::Paste << QString("CTRL+V");
+    QTest::newRow("delete") << (int)QKeySequence::Delete<< QString("DEL");
+    QTest::newRow("open") << (int)QKeySequence::Open << QString("CTRL+O");
+    QTest::newRow("find") << (int)QKeySequence::Find<< QString("CTRL+F");
+#ifdef Q_WS_WIN
+    QTest::newRow("addTab") << (int)QKeySequence::AddTab<< QString("CTRL+T");
+    QTest::newRow("findNext") << (int)QKeySequence::FindNext<< QString("F3");
+    QTest::newRow("findPrevious") << (int)QKeySequence::FindPrevious << QString("SHIFT+F3");
+    QTest::newRow("close") << (int)QKeySequence::Close<< QString("CTRL+F4");
+    QTest::newRow("replace") << (int)QKeySequence::Replace<< QString("CTRL+H");    
+#endif
+    QTest::newRow("bold") << (int)QKeySequence::Bold << QString("CTRL+B");
+    QTest::newRow("italic") << (int)QKeySequence::Italic << QString("CTRL+I");
+    QTest::newRow("underline") << (int)QKeySequence::Underline << QString("CTRL+U");
+    QTest::newRow("selectall") << (int)QKeySequence::SelectAll << QString("CTRL+A");
+    QTest::newRow("print") << (int)QKeySequence::Print << QString("CTRL+P");
+    QTest::newRow("movenextchar") << (int)QKeySequence::MoveToNextChar<< QString("RIGHT");
+    QTest::newRow("zoomIn") << (int)QKeySequence::ZoomIn<< QString("CTRL++");
+    QTest::newRow("zoomOut") << (int)QKeySequence::ZoomOut<< QString("CTRL+-");
+    QTest::newRow("whatsthis") << (int)QKeySequence::WhatsThis<< QString("SHIFT+F1");
+
+#ifndef Q_WS_MAC
+    QTest::newRow("help") << (int)QKeySequence::HelpContents<< QString("F1");
+    QTest::newRow("nextChild") << (int)QKeySequence::NextChild<< QString("CTRL+Tab");
+    QTest::newRow("previousChild") << (int)QKeySequence::PreviousChild<< QString("CTRL+SHIFT+BACKTAB");
+    QTest::newRow("forward") << (int)QKeySequence::Forward << QString("ALT+RIGHT");
+    QTest::newRow("backward") << (int)QKeySequence::Back << QString("ALT+LEFT");
+    QTest::newRow("MoveToEndOfBlock") << (int)QKeySequence::MoveToEndOfBlock<< QString(""); //mac only
+    QTest::newRow("SelectEndOfDocument") << (int)QKeySequence::SelectEndOfDocument<< QString("CTRL+SHIFT+END"); //mac only
+#else
+    QTest::newRow("help") << (int)QKeySequence::HelpContents<< QString("Ctrl+?");
+    QTest::newRow("nextChild") << (int)QKeySequence::NextChild << QString("CTRL+}");
+    QTest::newRow("previousChild") << (int)QKeySequence::PreviousChild << QString("CTRL+{");
+    QTest::newRow("MoveToEndOfBlock") << (int)QKeySequence::MoveToEndOfBlock << QString("ALT+DOWN");
+    QTest::newRow("forward") << (int)QKeySequence::Forward << QString("CTRL+]");
+    QTest::newRow("backward") << (int)QKeySequence::Back << QString("CTRL+[");
+    QTest::newRow("SelectEndOfDocument") << (int)QKeySequence::SelectEndOfDocument<< QString("CTRL+SHIFT+DOWN"); //mac only
+#endif
+}
+
+void tst_QKeySequence::standardKeys()
+{
+    QFETCH(int, standardKey);
+    QFETCH(QString, expected);
+    QKeySequence ks((QKeySequence::StandardKey)standardKey);
+    QKeySequence ks2(expected);
+    QVERIFY(ks == ks2);
+}
+
+void tst_QKeySequence::keyBindings()
+{
+    QList<QKeySequence> bindings = QKeySequence::keyBindings(QKeySequence::Copy);
+    QList<QKeySequence> expected;
+#ifdef Q_WS_MAC
+    expected  << QKeySequence("CTRL+C");
+#elif defined Q_WS_X11
+    expected  << QKeySequence("CTRL+C") << QKeySequence("F16") << QKeySequence("CTRL+INSERT");
+#else
+    expected  << QKeySequence("CTRL+C") << QKeySequence("CTRL+INSERT");
+#endif
+	QVERIFY(bindings == expected);
+}
+
+
+void tst_QKeySequence::mnemonic()
+{
+#ifdef Q_WS_MAC
+    QSKIP("mnemonics are not used on Mac OS X", SkipAll);
+#endif
+    QKeySequence k = QKeySequence::mnemonic("&Foo");
+    QVERIFY(k == QKeySequence("ALT+F"));
+    k = QKeySequence::mnemonic("&& &x");
+    QVERIFY(k == QKeySequence("ALT+X"));
+}
+
+void tst_QKeySequence::toString_data()
+{
+    QTest::addColumn<QString>("strSequence");
+    QTest::addColumn<QString>("neutralString");
+    QTest::addColumn<QString>("platformString");
+
+
+#ifndef Q_WS_MAC
+    QTest::newRow("Ctrl+Left") << QString("Ctrl+Left") << QString("Ctrl+Left") << QString("Ctrl+Left");
+    QTest::newRow("Alt+Left") << QString("Alt+Left") << QString("Alt+Left") << QString("Alt+Left");
+    QTest::newRow("Alt+Shift+Left") << QString("Alt+Shift+Left") << QString("Alt+Shift+Left") << QString("Alt+Shift+Left");
+    QTest::newRow("Ctrl") << QString("Ctrl+\x0c5") << QString("Ctrl+\x0c5") << QString("Ctrl+\x0c5");
+    QTest::newRow("Alt") << QString("Alt+\x0c5") << QString("Alt+\x0c5") << QString("Alt+\x0c5");
+    QTest::newRow("Shift") << QString("Shift+\x0c5") << QString("Shift+\x0c5") << QString("Shift+\x0c5");
+    QTest::newRow("Meta") << QString("Meta+\x0c5") << QString("Meta+\x0c5") << QString("Meta+\x0c5");
+    QTest::newRow("Ctrl+Plus") << QString("Ctrl++") << QString("Ctrl++") << QString("Ctrl++");
+#if QT_VERSION > 0x040100
+    QTest::newRow("Ctrl+,") << QString("Ctrl+,") << QString("Ctrl+,") << QString("Ctrl+,");
+    QTest::newRow("Ctrl+,,Ctrl+,") << QString("Ctrl+,,Ctrl+,") << QString("Ctrl+,, Ctrl+,") << QString("Ctrl+,, Ctrl+,");
+#endif
+    QTest::newRow("MultiKey") << QString("Alt+X, Ctrl+Y, Z") << QString("Alt+X, Ctrl+Y, Z")
+                           << QString("Alt+X, Ctrl+Y, Z");
+
+    QTest::newRow("Invalid") << QString("Ctrly") << QString("") << QString("");
+#else
+    /*
+    QTest::newRow("Ctrl+Left") << MacCtrl + "Left" << QString("Ctrl+Left") << MacCtrl + macSymbolForQtKey(Qt::Key_Left);
+    QTest::newRow("Alt+Left") << MacAlt + "Left" << QString("Alt+Left") << MacAlt + macSymbolForQtKey(Qt::Key_Left);
+    QTest::newRow("Alt+Shift+Left") << MacAlt + MacShift + "Left" << QString("Alt+Shift+Left")
+                                 << MacAlt + MacShift + macSymbolForQtKey(Qt::Key_Left);
+                                 */
+    QTest::newRow("Ctrl+Right,Left") << MacCtrl + "Right, Left" << QString("Ctrl+Right, Left") << MacCtrl + macSymbolForQtKey(Qt::Key_Right) + QString(", ") + macSymbolForQtKey(Qt::Key_Left);
+    QTest::newRow("Ctrl") << MacCtrl + "\x0c5" << QString("Ctrl+\x0c5") << MacCtrl + "\x0c5";
+    QTest::newRow("Alt") << MacAlt + "\x0c5" << QString("Alt+\x0c5") << MacAlt + "\x0c5";
+    QTest::newRow("Shift") << MacShift + "\x0c5" << QString("Shift+\x0c5") << MacShift + "\x0c5";
+    QTest::newRow("Meta") << MacMeta + "\x0c5" << QString("Meta+\x0c5") << MacMeta + "\x0c5";
+    QTest::newRow("Ctrl+Plus") << MacCtrl + "+" << QString("Ctrl++") << MacCtrl + "+";
+#if QT_VERSION > 0x040100
+    QTest::newRow("Ctrl+,") << MacCtrl + "," << QString("Ctrl+,") << MacCtrl + ",";
+    QTest::newRow("Ctrl+,,Ctrl+,") << MacCtrl + ",, " + MacCtrl + "," << QString("Ctrl+,, Ctrl+,") << MacCtrl + ",, " + MacCtrl + ",";
+#endif
+    QTest::newRow("MultiKey") << MacAlt + "X, " + MacCtrl + "Y, Z" << QString("Alt+X, Ctrl+Y, Z")
+                           << MacAlt + "X, " + MacCtrl + "Y, Z";
+    QTest::newRow("Invalid") << QString("Ctrly") << QString("") << QString("");
+#endif
+}
+
+void tst_QKeySequence::toString()
+{
+    QFETCH(QString, strSequence);
+    QFETCH(QString, neutralString);
+    QFETCH(QString, platformString);
+
+    QKeySequence ks1(strSequence);
+
+    QCOMPARE(ks1.toString(QKeySequence::NativeText), platformString);
+    QCOMPARE(ks1.toString(QKeySequence::PortableText), neutralString);
+
+}
+
+void tst_QKeySequence::streamOperators_data()
+{
+	operatorQString_data();
+}
+
+void tst_QKeySequence::streamOperators()
+{
+    QFETCH( int, modifiers );
+    QFETCH( int, keycode );
+
+	QByteArray data;
+	QKeySequence refK( modifiers | keycode );
+	QKeySequence orgK( "Ctrl+A" );
+	QKeySequence copyOrgK = orgK;
+	QVERIFY( copyOrgK == orgK );
+
+	QDataStream in(&data, QIODevice::WriteOnly);
+	in << refK;
+        QDataStream out(&data, QIODevice::ReadOnly);
+        out >> orgK;
+
+	QVERIFY( orgK == refK );
+
+	// check if detached
+	QVERIFY( orgK != copyOrgK );
+}
+
+void tst_QKeySequence::fromString_data()
+{
+    toString_data();
+}
+
+void tst_QKeySequence::fromString()
+{
+    QFETCH(QString, strSequence);
+    QFETCH(QString, neutralString);
+    QFETCH(QString, platformString);
+
+    QKeySequence ks1(strSequence);
+    QKeySequence ks2 = QKeySequence::fromString(ks1.toString());
+    QKeySequence ks3 = QKeySequence::fromString(neutralString, QKeySequence::PortableText);
+    QKeySequence ks4 = QKeySequence::fromString(platformString, QKeySequence::NativeText);
+
+
+    // assume the transitive property exists here.
+    QCOMPARE(ks2, ks1);
+    QCOMPARE(ks3, ks1);
+    QCOMPARE(ks4, ks1);
+}
+
+void tst_QKeySequence::translated_data()
+{
+    qApp->installTranslator(ourTranslator);
+    qApp->installTranslator(qtTranslator);
+
+    QTest::addColumn<QString>("transKey");
+    QTest::addColumn<QString>("compKey");
+
+    QTest::newRow("Shift++") << QString(tr("Shift++")) << QString("Umschalt++");
+    QTest::newRow("Ctrl++")  << QString(tr("Ctrl++")) << QString("Strg++");
+    QTest::newRow("Alt++")   << QString(tr("Alt++")) << QString("Alt++");
+    QTest::newRow("Meta++")  << QString(tr("Meta++")) << QString("Meta++");
+
+     QTest::newRow("Shift+,, Shift++") << QString(tr("Shift+,, Shift++")) << QString("Umschalt+,, Umschalt++");
+     QTest::newRow("Shift+,, Ctrl++")  << QString(tr("Shift+,, Ctrl++")) << QString("Umschalt+,, Strg++");
+     QTest::newRow("Shift+,, Alt++")   << QString(tr("Shift+,, Alt++")) << QString("Umschalt+,, Alt++");
+     QTest::newRow("Shift+,, Meta++")  << QString(tr("Shift+,, Meta++")) << QString("Umschalt+,, Meta++");
+
+     QTest::newRow("Ctrl+,, Shift++") << QString(tr("Ctrl+,, Shift++")) << QString("Strg+,, Umschalt++");
+     QTest::newRow("Ctrl+,, Ctrl++") << QString(tr("Ctrl+,, Ctrl++")) << QString("Strg+,, Strg++");
+     QTest::newRow("Ctrl+,, Alt++") << QString(tr("Ctrl+,, Alt++")) << QString("Strg+,, Alt++");
+     QTest::newRow("Ctrl+,, Meta++") << QString(tr("Ctrl+,, Meta++")) << QString("Strg+,, Meta++");
+
+    qApp->removeTranslator(ourTranslator);
+    qApp->removeTranslator(qtTranslator);
+}
+
+void tst_QKeySequence::translated()
+{
+    QFETCH(QString, transKey);
+    QFETCH(QString, compKey);
+#ifdef Q_WS_MAC
+    QSKIP("No need to translate modifiers on Mac OS X", SkipAll);
+#elif defined(Q_OS_WINCE)
+    QSKIP("No need to translate modifiers on WinCE", SkipAll);
+#endif
+
+    qApp->installTranslator(ourTranslator);
+    qApp->installTranslator(qtTranslator);
+
+    QKeySequence ks1(transKey);
+    QCOMPARE(ks1.toString(QKeySequence::NativeText), compKey);
+
+    qApp->removeTranslator(ourTranslator);
+    qApp->removeTranslator(qtTranslator);
+}
+
+
+QTEST_MAIN(tst_QKeySequence)
+#include "tst_qkeysequence.moc"