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

Conflicts:
	src/plugins/platforms/minimalegl/qminimaleglintegration.cpp

Change-Id: Ia6ab42a6daadbf8abc085c971545904d49ea4b56

1 files changed, 5 insertions, 1 deletions

diff --git a/doc/global/template/style/online.css b/doc/global/template/style/online.css
index 080b45749d..3c305f3ddb 100644
--- a/doc/global/template/style/online.css
+++ b/doc/global/template/style/online.css
@@ -1370,7 +1370,7 @@ div.qt_commercial {
   border-top:5px solid #5caa15;
   margin-bottom:50px
 }
-pre {
+pre, .LegaleseLeft {
   background-color:#404244;
   color:#fff;
   display:block;
@@ -1381,6 +1381,10 @@ pre {
   padding:25px;
   margin-top:0.75em
 }
+.mainContent .LegaleseLeft p {
+  color:#fff;
+  white-space: pre-wrap
+}
 .copy_text {
   background-color:#46a2da;
   color:#fff;