5 files changed, 155 insertions, 12 deletions
diff --git a/tests/auto/gui/kernel/kernel.pro b/tests/auto/gui/kernel/kernel.pro
index 559395a9ae..46786262c0 100644
--- a/tests/auto/gui/kernel/kernel.pro
+++ b/tests/auto/gui/kernel/kernel.pro
@@ -2,6 +2,7 @@ TEMPLATE=subdirs
 SUBDIRS=\
    qbackingstore \
    qclipboard \
+   qcursor \
    qdrag \
    qevent \
    qfileopenevent \
diff --git a/tests/auto/gui/kernel/qcursor/qcursor.pro b/tests/auto/gui/kernel/qcursor/qcursor.pro
new file mode 100644
index 0000000000..16e7d7c41c
--- /dev/null
+++ b/tests/auto/gui/kernel/qcursor/qcursor.pro
@@ -0,0 +1,6 @@
+QT       += testlib
+TARGET = tst_qcursor
+CONFIG   += testcase
+CONFIG   -= app_bundle
+
+SOURCES += tst_qcursor.cpp
diff --git a/tests/auto/gui/kernel/qcursor/tst_qcursor.cpp b/tests/auto/gui/kernel/qcursor/tst_qcursor.cpp
new file mode 100644
index 0000000000..d505f5a655
--- /dev/null
+++ b/tests/auto/gui/kernel/qcursor/tst_qcursor.cpp
@@ -0,0 +1,123 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtTest/QTest>
+#include <qcursor.h>
+#include <qpixmap.h>
+#include <qbitmap.h>
+
+class tst_QCursor : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void equality();
+};
+
+#define VERIFY_EQUAL(lhs, rhs) \
+    QVERIFY(lhs == rhs); \
+    QVERIFY(rhs == lhs); \
+    QVERIFY(!(rhs != lhs)); \
+    QVERIFY(!(lhs != rhs))
+
+#define VERIFY_DIFFERENT(lhs, rhs) \
+    QVERIFY(lhs != rhs); \
+    QVERIFY(rhs != lhs); \
+    QVERIFY(!(rhs == lhs)); \
+    QVERIFY(!(lhs == rhs))
+
+void tst_QCursor::equality()
+{
+    VERIFY_EQUAL(QCursor(), QCursor());
+    VERIFY_EQUAL(QCursor(Qt::CrossCursor), QCursor(Qt::CrossCursor));
+    VERIFY_DIFFERENT(QCursor(Qt::CrossCursor), QCursor());
+
+    // Shape
+    QCursor shapeCursor(Qt::WaitCursor);
+    VERIFY_EQUAL(shapeCursor, shapeCursor);
+    QCursor shapeCursorCopy(shapeCursor);
+    VERIFY_EQUAL(shapeCursor, shapeCursorCopy);
+    shapeCursorCopy.setShape(Qt::DragMoveCursor);
+    VERIFY_DIFFERENT(shapeCursor, shapeCursorCopy);
+    shapeCursorCopy.setShape(shapeCursor.shape());
+    VERIFY_EQUAL(shapeCursor, shapeCursorCopy);
+
+    // Pixmap
+    QPixmap pixmap(16, 16);
+    QCursor pixmapCursor(pixmap);
+    VERIFY_EQUAL(pixmapCursor, pixmapCursor);
+    VERIFY_EQUAL(pixmapCursor, QCursor(pixmapCursor));
+    VERIFY_EQUAL(pixmapCursor, QCursor(pixmap));
+    VERIFY_DIFFERENT(pixmapCursor, QCursor());
+    VERIFY_DIFFERENT(pixmapCursor, QCursor(pixmap, 5, 5));
+    VERIFY_DIFFERENT(pixmapCursor, QCursor(QPixmap(16, 16)));
+    VERIFY_DIFFERENT(pixmapCursor, shapeCursor);
+
+    // Bitmap & mask
+    QBitmap bitmap(16, 16);
+    QBitmap mask(16, 16);
+    QCursor bitmapCursor(bitmap, mask);
+    VERIFY_EQUAL(bitmapCursor, bitmapCursor);
+    VERIFY_EQUAL(bitmapCursor, QCursor(bitmapCursor));
+    VERIFY_EQUAL(bitmapCursor, QCursor(bitmap, mask));
+    VERIFY_DIFFERENT(bitmapCursor, QCursor());
+    VERIFY_DIFFERENT(bitmapCursor, QCursor(bitmap, mask, 5, 5));
+    VERIFY_DIFFERENT(bitmapCursor, QCursor(bitmap, QBitmap(16, 16)));
+    VERIFY_DIFFERENT(bitmapCursor, QCursor(QBitmap(16, 16), mask));
+    VERIFY_DIFFERENT(bitmapCursor, shapeCursor);
+    VERIFY_DIFFERENT(bitmapCursor, pixmapCursor);
+
+    // Empty pixmap
+    QPixmap emptyPixmap;
+    QCursor emptyPixmapCursor(emptyPixmap);
+    QCOMPARE(emptyPixmapCursor.shape(), Qt::ArrowCursor);
+    VERIFY_EQUAL(emptyPixmapCursor, QCursor());
+    VERIFY_EQUAL(emptyPixmapCursor, QCursor(emptyPixmap, 5, 5));
+    VERIFY_DIFFERENT(emptyPixmapCursor, shapeCursor);
+    VERIFY_DIFFERENT(emptyPixmapCursor, pixmapCursor);
+    VERIFY_DIFFERENT(emptyPixmapCursor, bitmapCursor);
+
+    // Empty bitmap & mask
+    QBitmap emptyBitmap;
+    QCursor emptyBitmapCursor(emptyBitmap, emptyBitmap);
+    QCOMPARE(emptyBitmapCursor.shape(), Qt::ArrowCursor);
+    VERIFY_EQUAL(emptyBitmapCursor, QCursor());
+    VERIFY_EQUAL(emptyBitmapCursor, QCursor(emptyBitmap, emptyBitmap, 5, 5));
+    VERIFY_EQUAL(emptyBitmapCursor, QCursor(emptyBitmap, mask));
+    VERIFY_EQUAL(emptyBitmapCursor, QCursor(bitmap, emptyBitmap));
+    VERIFY_EQUAL(emptyBitmapCursor, emptyPixmapCursor);
+    VERIFY_DIFFERENT(emptyBitmapCursor, shapeCursor);
+    VERIFY_DIFFERENT(emptyBitmapCursor, pixmapCursor);
+    VERIFY_DIFFERENT(emptyBitmapCursor, bitmapCursor);
+}
+
+#undef VERIFY_EQUAL
+#undef VERIFY_DIFFERENT
+
+QTEST_MAIN(tst_QCursor)
+#include "tst_qcursor.moc"
diff --git a/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp b/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp
index 6394a956bd..f8b6bf064a 100644
--- a/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp
+++ b/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp
@@ -36,14 +36,18 @@
 #include <QLibraryInfo>
 
 #ifdef Q_OS_MAC
-#ifdef Q_OS_OSX
-#include <Carbon/Carbon.h>
-#endif
 struct MacSpecialKey {
     int key;
     ushort macSymbol;
 };
 
+// Unicode code points for the glyphs associated with these keys
+// Defined by Carbon headers but not anywhere in Cocoa
+static const int kShiftUnicode = 0x21E7;
+static const int kControlUnicode = 0x2303;
+static const int kOptionUnicode = 0x2325;
+static const int kCommandUnicode = 0x2318;
+
 static const int NumEntries = 21;
 static const MacSpecialKey entries[NumEntries] = {
     { Qt::Key_Escape, 0x238B },
@@ -61,12 +65,10 @@ static const MacSpecialKey entries[NumEntries] = {
     { Qt::Key_Down, 0x2193 },
     { Qt::Key_PageUp, 0x21DE },
     { Qt::Key_PageDown, 0x21DF },
-#ifdef Q_OS_OSX
     { Qt::Key_Shift, kShiftUnicode },
     { Qt::Key_Control, kCommandUnicode },
     { Qt::Key_Meta, kControlUnicode },
     { Qt::Key_Alt, kOptionUnicode },
-#endif
     { Qt::Key_CapsLock, 0x21EA },
 };
 
diff --git a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
index 92f7182249..9ef8699164 100644
--- a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
+++ b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
@@ -1786,16 +1786,27 @@ void tst_QWindow::mask()
 {
     QRegion mask = QRect(10, 10, 800 - 20, 600 - 20);
 
-    QWindow window;
-    window.resize(800, 600);
-    window.setMask(mask);
+    {
+        QWindow window;
+        window.resize(800, 600);
+        QCOMPARE(window.mask(), QRegion());
 
-    QCOMPARE(window.mask(), QRegion());
+        window.create();
+        window.setMask(mask);
+        QCOMPARE(window.mask(), mask);
+    }
 
-    window.create();
-    window.setMask(mask);
+    {
+        QWindow window;
+        window.resize(800, 600);
+        QCOMPARE(window.mask(), QRegion());
+
+        window.setMask(mask);
+        QCOMPARE(window.mask(), mask);
+        window.create();
+        QCOMPARE(window.mask(), mask);
+    }
 
-    QCOMPARE(window.mask(), mask);
 }
 
 void tst_QWindow::initialSize()