Merge remote branch 'gerrit/master' into HEAD

Conflicts:
	configure.exe
	src/corelib/global/qglobal.h
	src/gui/kernel/qplatformnativeinterface_qpa.h
	src/gui/widgets/qlinecontrol.cpp
	src/gui/widgets/qmenu_mac.mm
	src/gui/widgets/qmenu_p.h
	src/gui/widgets/qmenubar.cpp
	src/gui/widgets/qmenubar_p.h
	src/gui/widgets/widgets.pri
	src/plugins/platforms/wayland/qwaylandnativeinterface.cpp
	src/plugins/platforms/wayland/qwaylandnativeinterface.h
	src/src.pro
	tests/auto/qdir/tst_qdir.cpp
	tests/auto/qfileinfo/tst_qfileinfo.cpp
	tests/auto/qsslsocket/tst_qsslsocket.cpp
	tests/auto/qstring/tst_qstring.cpp

Change-Id: I64cf2cefa532ba87a92f632e3595ce6914183e9b

1 files changed, 24 insertions, 52 deletions

diff --git a/src/testlib/qtestlog.cpp b/src/testlib/qtestlog.cpp
index 0a87a4ce14..d53b00ca7f 100644
--- a/src/testlib/qtestlog.cpp
+++ b/src/testlib/qtestlog.cpp
@@ -45,7 +45,7 @@
 #include "QtTest/private/qtestresult_p.h"
 #include "QtTest/private/qabstracttestlogger_p.h"
 #include "QtTest/private/qplaintestlogger_p.h"
-#include "QtTest/private/qtestlogger_p.h"
+#include "QtTest/private/qxunittestlogger_p.h"
 #include "QtTest/private/qxmltestlogger_p.h"
 #include <QtCore/qatomic.h>
 #include <QtCore/qbytearray.h>
@@ -83,12 +83,10 @@ namespace QTest {
     static IgnoreResultList *ignoreResultList = 0;
 
     static QTestLog::LogMode logMode = QTestLog::Plain;
-    static QTestLog::FlushMode flushMode = QTestLog::NoFlush;
     static int verbosity = 0;
     static int maxWarnings = 2002;
 
     static QAbstractTestLogger *testLogger = 0;
-    static const char *outFile = 0;
 
     static QtMsgHandler oldMessageHandler;
 
@@ -165,30 +163,6 @@ namespace QTest {
             break;
         }
     }
-
-    void initLogger()
-    {
-        switch (QTest::logMode) {
-        case QTestLog::Plain:
-            QTest::testLogger = new QPlainTestLogger;
-            break;
-        case QTestLog::XML:
-            if (QTest::flushMode == QTestLog::FlushOn)
-                QTest::testLogger = new QXmlTestLogger(QXmlTestLogger::Complete);
-            else
-                QTest::testLogger = new QTestLogger(QTestLogger::TLF_XML);
-            break;
-        case QTestLog::LightXML:
-            if (QTest::flushMode == QTestLog::FlushOn)
-                QTest::testLogger = new QXmlTestLogger(QXmlTestLogger::Light);
-            else
-                QTest::testLogger = new QTestLogger(QTestLogger::TLF_LightXml);
-            break;
-        case QTestLog::XunitXML:
-            QTest::testLogger = new QTestLogger(QTestLogger::TLF_XunitXml);
-        }
-    }
-
 }
 
 void QTestLog::enterTestFunction(const char* function)
@@ -283,9 +257,8 @@ void QTestLog::addBenchmarkResult(const QBenchmarkResult &result)
 
 void QTestLog::startLogging()
 {
-    QTEST_ASSERT(!QTest::testLogger);
-    QTest::initLogger();
-    QTest::testLogger->startLogging(QTest::outFile);
+    QTEST_ASSERT(QTest::testLogger);
+    QTest::testLogger->startLogging();
     QTest::oldMessageHandler = qInstallMsgHandler(QTest::messageHandler);
 }
 
@@ -299,6 +272,27 @@ void QTestLog::stopLogging()
     QTest::testLogger = 0;
 }
 
+void QTestLog::initLogger(LogMode mode, const char *filename)
+{
+    QTest::logMode = mode;
+
+    switch (mode) {
+    case QTestLog::Plain:
+        QTest::testLogger = new QPlainTestLogger(filename);
+        break;
+    case QTestLog::XML:
+        QTest::testLogger = new QXmlTestLogger(QXmlTestLogger::Complete, filename);
+        break;
+    case QTestLog::LightXML:
+        QTest::testLogger = new QXmlTestLogger(QXmlTestLogger::Light, filename);
+        break;
+    case QTestLog::XunitXML:
+        QTest::testLogger = new QXunitTestLogger(filename);
+        break;
+    }
+    QTEST_ASSERT(QTest::testLogger);
+}
+
 void QTestLog::warn(const char *msg)
 {
     QTEST_ASSERT(QTest::testLogger);
@@ -315,11 +309,6 @@ void QTestLog::info(const char *msg, const char *file, int line)
         QTest::testLogger->addMessage(QAbstractTestLogger::Info, msg, file, line);
 }
 
-void QTestLog::setLogMode(LogMode mode)
-{
-    QTest::logMode = mode;
-}
-
 QTestLog::LogMode QTestLog::logMode()
 {
     return QTest::logMode;
@@ -351,26 +340,9 @@ void QTestLog::addIgnoreMessage(QtMsgType type, const char *msg)
     list->next = item;
 }
 
-void QTestLog::redirectOutput(const char *fileName)
-{
-    QTEST_ASSERT(fileName);
-
-    QTest::outFile = fileName;
-}
-
-const char *QTestLog::outputFileName()
-{
-    return QTest::outFile;
-}
-
 void QTestLog::setMaxWarnings(int m)
 {
     QTest::maxWarnings = m <= 0 ? INT_MAX : m + 2;
 }
 
-void QTestLog::setFlushMode(FlushMode mode)
-{
-    QTest::flushMode = mode;
-}
-
 QT_END_NAMESPACE