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

Conflicts:
	.qmake.conf
	mkspecs/common/msvc-desktop.conf
	mkspecs/common/msvc-version.conf
	mkspecs/common/winrt_winphone/qmake.conf
	mkspecs/features/mac/default_post.prf
	mkspecs/features/mac/sdk.prf
	mkspecs/features/qt.prf
	mkspecs/features/uikit/default_post.prf
	mkspecs/features/winrt/default_pre.prf
	mkspecs/winphone-arm-msvc2013/qmake.conf
	mkspecs/winphone-x86-msvc2013/qmake.conf
	mkspecs/winrt-arm-msvc2013/qmake.conf
	mkspecs/winrt-x64-msvc2013/qmake.conf
	mkspecs/winrt-x86-msvc2013/qmake.conf
	qmake/generators/win32/msvc_vcproj.cpp
	src/gui/kernel/qwindowsysteminterface.cpp
	src/network/kernel/qhostaddress.cpp
	src/plugins/platforms/mirclient/qmirclientplugin.cpp
	src/plugins/platforms/mirclient/qmirclientplugin.h
	src/widgets/util/qsystemtrayicon.cpp
	tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
	tools/configure/Makefile.mingw
	tools/configure/Makefile.win32

Done-with: Jake Petroules <jake.petroules@qt.io>
Done-with: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Change-Id: I4be3262d3994e11929d3b1ded2c3379783797dbe

1 files changed, 17 insertions, 8 deletions

diff --git a/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp b/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp
index 434876eb3c..f8dc5d91a2 100644
--- a/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp
+++ b/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp
@@ -93,6 +93,7 @@ private slots:
 #if !defined(Q_OS_DARWIN)
     void accel();
     void activatedCount();
+    void activatedCount_data();
 
     void check_accelKeys();
     void check_cursorKeys1();
@@ -145,8 +146,8 @@ protected slots:
     void slotForTaskQTBUG53205();
 
 private:
-    TestMenu initSimpleMenuBar(QMenuBar *mb);
-    TestMenu initWindowWithSimpleMenuBar(QMainWindow &w);
+    TestMenu initSimpleMenuBar(QMenuBar *mb, bool forceNonNative = true);
+    TestMenu initWindowWithSimpleMenuBar(QMainWindow &w, bool forceNonNative = true);
     QAction *createCharacterAction(QMenu *menu, char lowerAscii);
     QMenu *addNumberedMenu(QMenuBar *mb, int n);
     TestMenu initComplexMenuBar(QMenuBar *mb);
@@ -214,10 +215,10 @@ void tst_QMenuBar::cleanup()
 
 // Create a simple menu bar and connect its actions to onSimpleActivated().
 
-TestMenu tst_QMenuBar::initSimpleMenuBar(QMenuBar *mb)
-{
+TestMenu tst_QMenuBar::initSimpleMenuBar(QMenuBar *mb, bool forceNonNative) {
     TestMenu result;
-    mb->setNativeMenuBar(false);
+    if (forceNonNative)
+        mb->setNativeMenuBar(false);
     connect(mb, SIGNAL(triggered(QAction*)), this, SLOT(onSimpleActivated(QAction*)));
     QMenu *menu = mb->addMenu(QStringLiteral("&accel"));
     QAction *action = menu->addAction(QStringLiteral("menu1") );
@@ -245,11 +246,11 @@ TestMenu tst_QMenuBar::initSimpleMenuBar(QMenuBar *mb)
     return result;
 }
 
-inline TestMenu tst_QMenuBar::initWindowWithSimpleMenuBar(QMainWindow &w)
+inline TestMenu tst_QMenuBar::initWindowWithSimpleMenuBar(QMainWindow &w, bool forceNonNative)
 {
     w.resize(200, 200);
     centerOnScreen(&w);
-    return initSimpleMenuBar(w.menuBar());
+    return initSimpleMenuBar(w.menuBar(), forceNonNative);
 }
 
 // add a menu with number n, set number as data.
@@ -347,7 +348,8 @@ void tst_QMenuBar::activatedCount()
 {
     // create a popup menu with menu items set the accelerators later...
     QMainWindow w;
-    initWindowWithSimpleMenuBar(w);
+    QFETCH( bool, forceNonNative );
+    initWindowWithSimpleMenuBar(w, forceNonNative);
     w.show();
     QApplication::setActiveWindow(&w);
     QVERIFY(QTest::qWaitForWindowActive(&w));
@@ -356,6 +358,13 @@ void tst_QMenuBar::activatedCount()
 //wait(5000);
     QCOMPARE( m_simpleActivatedCount, 2 ); //1 from the popupmenu and 1 from the menubar
 }
+
+void tst_QMenuBar::activatedCount_data()
+{
+    QTest::addColumn<bool>("forceNonNative");
+    QTest::newRow( "forcing non-native menubar" ) << true;
+    QTest::newRow( "not forcing non-native menubar" ) << false;
+}
 #endif
 
 void tst_QMenuBar::clear()