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

Conflicts:
	src/corelib/global/qglobal.cpp
	src/corelib/global/qglobal.h
	src/corelib/global/qsysinfo.h
	src/corelib/global/qsystemdetection.h
	src/corelib/kernel/qobjectdefs.h
	src/plugins/plugins.pro
	tests/auto/widgets/itemviews/qlistview/qlistview.pro

Change-Id: Ib55aa79d707c4c1453fb9d697f6cf92211ed665c

4 files changed, 8 insertions, 2 deletions

diff --git a/tests/manual/diaglib/qwidgetdump.cpp b/tests/manual/diaglib/qwidgetdump.cpp
index 432e651678..f057a58ff0 100644
--- a/tests/manual/diaglib/qwidgetdump.cpp
+++ b/tests/manual/diaglib/qwidgetdump.cpp
@@ -58,6 +58,8 @@ static void dumpWidgetRecursion(QTextStream &str, const QWidget *w,
     str << (w->testAttribute(Qt::WA_Mapped) ? "[mapped] " : "[not mapped] ");
     if (w->testAttribute(Qt::WA_DontCreateNativeAncestors))
         str << "[NoNativeAncestors] ";
+    if (const int states = w->windowState())
+        str << "windowState=" << hex << showbase << states << dec << noshowbase << ' ';
     formatRect(str, w->geometry());
     if (!(options & DontPrintWindowFlags)) {
         str << ' ';
diff --git a/tests/manual/diaglib/qwindowdump.cpp b/tests/manual/diaglib/qwindowdump.cpp
index ca76d7b80d..a77bae22e9 100644
--- a/tests/manual/diaglib/qwindowdump.cpp
+++ b/tests/manual/diaglib/qwindowdump.cpp
@@ -131,6 +131,8 @@ void formatWindow(QTextStream &str, const QWindow *w, FormatWindowOptions option
         str << "[top] ";
     if (w->isExposed())
         str << "[exposed] ";
+    if (const Qt::WindowState state = w->windowState())
+        str << "windowState=" << state << ' ';
     formatRect(str, w->geometry());
     if (!(options & DontPrintWindowFlags)) {
         str << ' ';
diff --git a/tests/manual/manual.pro b/tests/manual/manual.pro
index 0a1987d647..cffe76b2b4 100644
--- a/tests/manual/manual.pro
+++ b/tests/manual/manual.pro
@@ -58,7 +58,7 @@ contains(QT_CONFIG, opengl) {
 win32 {
     SUBDIRS -= network_remote_stresstest network_stresstest
     # disable some tests on wince because of missing dependencies
-    wince*:SUBDIRS -= lance windowmodality
+    wince: SUBDIRS -= lance windowmodality
 }
 
 lessThan(QT_MAJOR_VERSION, 5): SUBDIRS -= bearerex lance qnetworkaccessmanager/qget qmimedatabase qnetworkreply \
diff --git a/tests/manual/widgets/itemviews/qheaderview/qheaderviewtest1.cpp b/tests/manual/widgets/itemviews/qheaderview/qheaderviewtest1.cpp
index 1e26af8f57..af11e2a098 100644
--- a/tests/manual/widgets/itemviews/qheaderview/qheaderviewtest1.cpp
+++ b/tests/manual/widgets/itemviews/qheaderview/qheaderviewtest1.cpp
@@ -140,10 +140,12 @@ private:
     QTableView *setupTableView()
     {
         tableView = new QTableView;
-        m.setRowCount(500);
+        const int rowCount = 200;
+        m.setRowCount(rowCount);
         m.setColumnCount(250);
         tableView->setSelectionMode(QAbstractItemView::SingleSelection);
         tableView->setModel(&m);
+        tableView->verticalHeader()->swapSections(rowCount - 1, 5);
         return tableView;
     }