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

Conflicts:
	src/network/socket/qnativesocketengine_winrt.cpp
	tools/configure/configureapp.cpp
	tools/configure/environment.cpp

Change-Id: Ieae6f2ee004a87f041751852b687484f91ee4480

1 files changed, 24 insertions, 18 deletions

diff --git a/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp b/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp
index 01e3d7bac0..d8239b5a28 100644
--- a/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp
+++ b/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp
@@ -43,6 +43,10 @@
 
 #include <qformlayout.h>
 
+// ItemRole has enumerators for numerical values 0..2, thus the only
+// valid numerical values for storing into an ItemRole variable are 0..3:
+Q_CONSTEXPR QFormLayout::ItemRole invalidRole = QFormLayout::ItemRole(3);
+
 static inline void setFrameless(QWidget *w)
 {
     Qt::WindowFlags flags = w->windowFlags();
@@ -567,7 +571,7 @@ void tst_QFormLayout::insertRow_QWidget_QWidget()
 
     {
         int row = -1;
-        QFormLayout::ItemRole role = QFormLayout::ItemRole(-123);
+        QFormLayout::ItemRole role = invalidRole;
         layout->getWidgetPosition(lbl1, &row, &role);
         QCOMPARE(row, 0);
         QCOMPARE(int(role), int(QFormLayout::LabelRole));
@@ -575,7 +579,7 @@ void tst_QFormLayout::insertRow_QWidget_QWidget()
 
     {
         int row = -1;
-        QFormLayout::ItemRole role = QFormLayout::ItemRole(-123);
+        QFormLayout::ItemRole role = invalidRole;
         layout->getWidgetPosition(fld1, &row, &role);
         QCOMPARE(row, 0);
         QCOMPARE(int(role), int(QFormLayout::FieldRole));
@@ -636,7 +640,7 @@ void tst_QFormLayout::insertRow_QWidget_QLayout()
 
     {
         int row = -1;
-        QFormLayout::ItemRole role = QFormLayout::ItemRole(-123);
+        QFormLayout::ItemRole role = invalidRole;
         layout->getWidgetPosition(lbl1, &row, &role);
         QCOMPARE(row, 0);
         QCOMPARE(int(role), int(QFormLayout::LabelRole));
@@ -644,7 +648,7 @@ void tst_QFormLayout::insertRow_QWidget_QLayout()
 
     {
         int row = -1;
-        QFormLayout::ItemRole role = QFormLayout::ItemRole(-123);
+        QFormLayout::ItemRole role = invalidRole;
         layout->getLayoutPosition(fld1, &row, &role);
         QCOMPARE(row, 0);
         QCOMPARE(int(role), int(QFormLayout::FieldRole));
@@ -992,7 +996,7 @@ void tst_QFormLayout::setWidget()
 
     {
         int row = -1;
-        QFormLayout::ItemRole role = QFormLayout::ItemRole(-123);
+        QFormLayout::ItemRole role = invalidRole;
         layout.getWidgetPosition(&w1, &row, &role);
         QCOMPARE(row, 5);
         QCOMPARE(int(role), int(QFormLayout::LabelRole));
@@ -1000,7 +1004,7 @@ void tst_QFormLayout::setWidget()
 
     {
         int row = -1;
-        QFormLayout::ItemRole role = QFormLayout::ItemRole(-123);
+        QFormLayout::ItemRole role = invalidRole;
         layout.getWidgetPosition(&w2, &row, &role);
         QCOMPARE(row, 3);
         QCOMPARE(int(role), int(QFormLayout::FieldRole));
@@ -1008,7 +1012,7 @@ void tst_QFormLayout::setWidget()
 
     {
         int row = -1;
-        QFormLayout::ItemRole role = QFormLayout::ItemRole(-123);
+        QFormLayout::ItemRole role = invalidRole;
         layout.getWidgetPosition(&w3, &row, &role);
         QCOMPARE(row, 3);
         QCOMPARE(int(role), int(QFormLayout::LabelRole));
@@ -1016,18 +1020,20 @@ void tst_QFormLayout::setWidget()
 
     {
         int row = -1;
-        QFormLayout::ItemRole role = QFormLayout::ItemRole(-123);
+        QFormLayout::ItemRole role = invalidRole;
         layout.getWidgetPosition(&w4, &row, &role);
+        // not found
         QCOMPARE(row, -1);
-        QCOMPARE(int(role), -123);
+        QCOMPARE(int(role), int(invalidRole));
     }
 
     {
         int row = -1;
-        QFormLayout::ItemRole role = QFormLayout::ItemRole(-123);
+        QFormLayout::ItemRole role = invalidRole;
         layout.getWidgetPosition(0, &row, &role);
+        // not found
         QCOMPARE(row, -1);
-        QCOMPARE(int(role), -123);
+        QCOMPARE(int(role), int(invalidRole));
     }
 }
 
@@ -1060,7 +1066,7 @@ void tst_QFormLayout::setLayout()
 
     {
         int row = -1;
-        QFormLayout::ItemRole role = QFormLayout::ItemRole(-123);
+        QFormLayout::ItemRole role = invalidRole;
         layout.getLayoutPosition(&l1, &row, &role);
         QCOMPARE(row, 5);
         QCOMPARE(int(role), int(QFormLayout::LabelRole));
@@ -1068,7 +1074,7 @@ void tst_QFormLayout::setLayout()
 
     {
         int row = -1;
-        QFormLayout::ItemRole role = QFormLayout::ItemRole(-123);
+        QFormLayout::ItemRole role = invalidRole;
         layout.getLayoutPosition(&l2, &row, &role);
         QCOMPARE(row, 3);
         QCOMPARE(int(role), int(QFormLayout::FieldRole));
@@ -1076,7 +1082,7 @@ void tst_QFormLayout::setLayout()
 
     {
         int row = -1;
-        QFormLayout::ItemRole role = QFormLayout::ItemRole(-123);
+        QFormLayout::ItemRole role = invalidRole;
         layout.getLayoutPosition(&l3, &row, &role);
         QCOMPARE(row, 3);
         QCOMPARE(int(role), int(QFormLayout::LabelRole));
@@ -1084,18 +1090,18 @@ void tst_QFormLayout::setLayout()
 
     {
         int row = -1;
-        QFormLayout::ItemRole role = QFormLayout::ItemRole(-123);
+        QFormLayout::ItemRole role = invalidRole;
         layout.getLayoutPosition(&l4, &row, &role);
         QCOMPARE(row, -1);
-        QCOMPARE(int(role), -123);
+        QCOMPARE(int(role), int(invalidRole));
     }
 
     {
         int row = -1;
-        QFormLayout::ItemRole role = QFormLayout::ItemRole(-123);
+        QFormLayout::ItemRole role = invalidRole;
         layout.getLayoutPosition(0, &row, &role);
         QCOMPARE(row, -1);
-        QCOMPARE(int(role), -123);
+        QCOMPARE(int(role), int(invalidRole));
     }
 }