Merge remote-tracking branch 'origin/5.8' into dev

Conflicts:
	configure
	configure.pri
	examples/widgets/painting/fontsampler/mainwindow.cpp
	examples/widgets/painting/fontsampler/mainwindow.h
	mkspecs/features/moc.prf
	src/corelib/global/qglobal.h
	src/gui/text/qtextdocument.cpp

Change-Id: Ica65512e00871695190a14ccea5c275b0165f787

1 files changed, 39 insertions, 0 deletions

diff --git a/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp b/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp
index a3de9ee5b5..ec143896ab 100644
--- a/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp
+++ b/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp
@@ -195,6 +195,7 @@ public:
 
 private slots:
     void cleanup();
+    void qPointerUniqueId();
     void touchDisabledByDefault();
     void touchEventAcceptedByDefault();
     void touchBeginPropagatesWhenIgnored();
@@ -226,6 +227,44 @@ void tst_QTouchEvent::cleanup()
     QVERIFY(QGuiApplication::topLevelWindows().isEmpty());
 }
 
+void tst_QTouchEvent::qPointerUniqueId()
+{
+    QPointingDeviceUniqueId id1, id2;
+
+    QCOMPARE(id1.numericId(), Q_INT64_C(-1));
+    QVERIFY(!id1.isValid());
+
+    QVERIFY(  id1 == id2);
+    QVERIFY(!(id1 != id2));
+
+    QSet<QPointingDeviceUniqueId> set; // compile test
+    set.insert(id1);
+    set.insert(id2);
+    QCOMPARE(set.size(), 1);
+
+
+    const auto id3 = QPointingDeviceUniqueId::fromNumericId(-1);
+    QCOMPARE(id3.numericId(), Q_INT64_C(-1));
+    QVERIFY(!id3.isValid());
+
+    QVERIFY(  id1 == id3);
+    QVERIFY(!(id1 != id3));
+
+    set.insert(id3);
+    QCOMPARE(set.size(), 1);
+
+
+    const auto id4 = QPointingDeviceUniqueId::fromNumericId(4);
+    QCOMPARE(id4.numericId(), Q_INT64_C(4));
+    QVERIFY(id4.isValid());
+
+    QVERIFY(  id1 != id4);
+    QVERIFY(!(id1 == id4));
+
+    set.insert(id4);
+    QCOMPARE(set.size(), 2);
+}
+
 void tst_QTouchEvent::touchDisabledByDefault()
 {
     // QWidget