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

This change partially reverts 1bfc7f68 about QT_HAS_BUILTIN define
and undef in src/corelib/tools/qsimd_p.h.

This change is also squashed with "Fall back to c++11 standard
compiler flag for host builds" which is done by Peter Seiderer.

Conflicts:
	mkspecs/features/default_post.prf
	src/3rdparty/sqlite/0001-Fixing-the-SQLite3-build-for-WEC2013-again.patch
	src/3rdparty/sqlite/sqlite3.c
	src/corelib/tools/qsimd_p.h
	src/gui/kernel/qevent.cpp
	src/gui/kernel/qwindowsysteminterface.cpp
	src/gui/kernel/qwindowsysteminterface_p.h
	src/plugins/bearer/blackberry/blackberry.pro
	src/plugins/platforms/cocoa/qcocoasystemsettings.mm
	src/plugins/platformthemes/gtk2/gtk2.pro
	src/plugins/styles/bb10style/bb10style.pro
	src/sql/drivers/sqlite2/qsql_sqlite2.cpp
	tools/configure/configureapp.cpp

Task-number: QTBUG-51644
Done-with: Peter Seiderer <ps.report@gmx.net>
Change-Id: I6100d6ace31b2e8d41a95f0b5d5ebf8f1fd88b44

1 files changed, 15 insertions, 18 deletions

diff --git a/src/gui/painting/qpagelayout.cpp b/src/gui/painting/qpagelayout.cpp
index 317e6d241a..f3f7f5f956 100644
--- a/src/gui/painting/qpagelayout.cpp
+++ b/src/gui/painting/qpagelayout.cpp
@@ -949,40 +949,37 @@ QRect QPageLayout::paintRectPixels(int resolution) const
 QDebug operator<<(QDebug dbg, const QPageLayout &layout)
 {
     QDebugStateSaver saver(dbg);
+    dbg.nospace();
+    dbg.noquote();
+    dbg << "QPageLayout(";
     if (layout.isValid()) {
-        QString output = QStringLiteral("QPageLayout(%1, %2, l:%3 r:%4 t:%5 b:%6 %7)");
-        QString units;
+        const QMarginsF margins = layout.margins();
+        dbg << '"' << layout.pageSize().name() << "\", "
+            << (layout.orientation() == QPageLayout::Portrait ? "Portrait" : "Landscape")
+            << ", l:" << margins.left() << " r:" << margins.right() << " t:"
+            << margins.top() << " b:" << margins.bottom() << ' ';
         switch (layout.units()) {
         case QPageLayout::Millimeter:
-            units = QStringLiteral("mm");
+            dbg << "mm";
             break;
         case QPageLayout::Point:
-            units = QStringLiteral("pt");
+            dbg << "pt";
             break;
         case QPageLayout::Inch:
-            units = QStringLiteral("in");
+            dbg << "in";
             break;
         case QPageLayout::Pica:
-            units = QStringLiteral("pc");
+            dbg << "pc";
             break;
         case QPageLayout::Didot:
-            units = QStringLiteral("DD");
+            dbg << "DD";
             break;
         case QPageLayout::Cicero:
-            units = QStringLiteral("CC");
+            dbg << "CC";
             break;
         }
-        output = output.arg(layout.pageSize().name())
-                       .arg(layout.orientation() == QPageLayout::Portrait ? QStringLiteral("Portrait") : QStringLiteral("Landscape"))
-                       .arg(layout.margins().left())
-                       .arg(layout.margins().right())
-                       .arg(layout.margins().top())
-                       .arg(layout.margins().bottom())
-                       .arg(units);
-        dbg.nospace() << output;
-    } else {
-        dbg.nospace() << "QPageLayout()";
     }
+    dbg << ')';
     return dbg;
 }
 #endif