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

Change-Id: I3b59ac5c5f6f19b7a4b95188af4c6f0a52d38f38

src/activeqt/doc/src/activeqt-index.qdoc

@@ -97,7 +97,7 @@
     commercial licenses from \l{The Qt Company}. In addition, they
     are available under the \l{BSD 3-clause "New" or "Revised" License}:
 
-    \legalese
+    \badcode
     Copyright (C) 2017 The Qt Company Ltd.
 
     Redistribution and use in source and binary forms, with or without
@@ -124,7 +124,7 @@
     THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
     (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
     OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-    \endlegalese
+    \endcode
 
     See \l{Qt Licensing} for further details.