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

Conflicts:
	src/gui/painting/painting.pri
	src/plugins/platforms/xcb/qxcbconnection.cpp
	tests/auto/corelib/thread/qthreadstorage/qthreadstorage.pro
	tests/auto/corelib/tools/qlocale/test/test.pro
	tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
	tools/configure/environment.cpp

Change-Id: I9c40f458b89b2c206de2d2c24e90b5f679c93495

2 files changed, 5 insertions, 4 deletions

diff --git a/doc/global/html-header-online.qdocconf b/doc/global/html-header-online.qdocconf
index 450eb1120b..02b7375d32 100644
--- a/doc/global/html-header-online.qdocconf
+++ b/doc/global/html-header-online.qdocconf
@@ -36,6 +36,7 @@ HTML.headerscripts = \
     "  <script type=\"text/javascript\" src=\"scripts/extras.js\"></script>\n" \
     "  <script type=\"text/javascript\">\n" \
     "  \$(function(){\n" \
+    "     \$(\"#footer\").load(\"/style/qt-footer.html\");\n" \
     "     \$(\"#sidebar-content\").load(\"style/qt5-sidebar.html\");\n" \
     "  });\n" \
     "  </script>\n" \
diff --git a/doc/global/template/style/online.css b/doc/global/template/style/online.css
index c7758d0ca8..be278a27da 100644
--- a/doc/global/template/style/online.css
+++ b/doc/global/template/style/online.css
@@ -1260,13 +1260,13 @@ li a.active {
 }
 .mainContent table p {
   margin:0px;
-  padding:0px
-}
-.mainContent table p {
-  margin:0px;
   padding:0px;
+  max-width:initial;
   min-height:2em
 }
+.mainContent table p.centerAlign {
+  text-align:center
+}
 .context h2 {
   font-size:2.1875em
 }