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

Conflicts:
	.qmake.conf
	config.tests/unix/nis/nis.cpp
	mkspecs/unsupported/freebsd-g++/qplatformdefs.h
	src/corelib/tools/qdatetime.cpp
	src/corelib/tools/qsimd.cpp
	src/corelib/tools/qsimd_p.h
	src/network/access/access.pri
	src/network/access/qnetworkreplynsurlconnectionimpl.mm
	src/network/access/qnetworkreplynsurlconnectionimpl_p.h
	src/plugins/platforms/cocoa/qnsview.mm
	src/plugins/printsupport/windows/qwindowsprintdevice.cpp
	tests/auto/corelib/kernel/qobject/tst_qobject.cpp
	tests/auto/network/access/qnetworkreply/BLACKLIST
	tests/auto/widgets/widgets/qopenglwidget/BLACKLIST

Change-Id: I4b32055bbf922392ef0264fd403405416fffee57

1 files changed, 44 insertions, 2 deletions

diff --git a/tests/manual/diaglib/qwidgetdump.cpp b/tests/manual/diaglib/qwidgetdump.cpp
index 0ccf109ebb..10cfde510d 100644
--- a/tests/manual/diaglib/qwidgetdump.cpp
+++ b/tests/manual/diaglib/qwidgetdump.cpp
@@ -40,11 +40,50 @@
 
 namespace QtDiag {
 
+static const char *qtWidgetClasses[] = {
+    "QAbstractItemView", "QAbstractScrollArea", "QAbstractSlider", "QAbstractSpinBox",
+    "QCalendarWidget", "QCheckBox", "QColorDialog", "QColumnView", "QComboBox",
+    "QCommandLinkButton", "QDateEdit", "QDateTimeEdit", "QDesktopWidget", "QDial",
+    "QDialog", "QDialogButtonBox", "QDockWidget", "QDoubleSpinBox", "QErrorMessage",
+    "QFileDialog", "QFontComboBox", "QFontDialog", "QFrame", "QGraphicsView",
+    "QGroupBox", "QHeaderView", "QInputDialog", "QLCDNumber", "QLabel", "QLineEdit",
+    "QListView", "QListWidget", "QMainWindow", "QMdiArea", "QMdiSubWindow", "QMenu",
+    "QMenuBar", "QMessageBox", "QOpenGLWidget", "QPlainTextEdit", "QProgressBar",
+    "QProgressDialog", "QPushButton", "QRadioButton", "QRubberBand", "QScrollArea",
+    "QScrollBar", "QSlider", "QSpinBox", "QSplashScreen", "QSplitter",
+    "QStackedWidget", "QStatusBar", "QTabBar", "QTabWidget", "QTableView",
+    "QTableWidget", "QTextBrowser", "QTextEdit", "QTimeEdit", "QToolBar",
+    "QToolBox", "QToolButton", "QTreeView", "QTreeWidget", "QWidget",
+    "QWizard", "QWizardPage"
+};
+
+static bool isQtWidget(const char *className)
+{
+    for (size_t i = 0, count = sizeof(qtWidgetClasses) / sizeof(qtWidgetClasses[0]); i < count; ++i) {
+        if (!qstrcmp(className, qtWidgetClasses[i]))
+            return true;
+    }
+    return false;
+}
+
+static void formatWidgetClass(QTextStream &str, const QWidget *w)
+{
+    const QMetaObject *mo = w->metaObject();
+    str << mo->className();
+    while (!isQtWidget(mo->className())) {
+        mo = mo->superClass();
+        str << ':' << mo->className();
+    }
+    const QString on = w->objectName();
+    if (!on.isEmpty())
+        str << "/\"" << on << '"';
+}
+
 static void dumpWidgetRecursion(QTextStream &str, const QWidget *w,
                                 FormatWindowOptions options, int depth = 0)
 {
     indentStream(str, 2 * depth);
-    formatObject(str, w);
+    formatWidgetClass(str, w);
     str << ' ' << (w->isVisible() ? "[visible] " : "[hidden] ");
     if (const WId nativeWinId = w->internalWinId())
         str << "[native: " << hex << showbase << nativeWinId << dec << noshowbase << "] ";
@@ -109,7 +148,10 @@ void dumpAllWidgets(FormatWindowOptions options, const QWidget *root)
     foreach (QWidget *tw, topLevels)
         dumpWidgetRecursion(str, tw, options);
 #if QT_VERSION >= 0x050400
-    qDebug().noquote() << d;
+    {
+        foreach (const QString &line, d.split(QLatin1Char('\n')))
+            qDebug().noquote() << line;
+    }
 #else
     qDebug("%s", qPrintable(d));
 #endif