4 files changed, 40 insertions, 32 deletions
diff --git a/doc/src/platforms/android/android-building.qdoc b/doc/src/platforms/android/android-building.qdoc
index 8b88efa4..be51b8e5 100644
--- a/doc/src/platforms/android/android-building.qdoc
+++ b/doc/src/platforms/android/android-building.qdoc
@@ -120,7 +120,7 @@
     mkdir <path_to_build_dir>/build-qt
     cd <path_to_build_dir>/build-qt
 
-    <path_to_qt_source>/configure -xplatform android-clang -prefix </path/to/install> -disable-rpath -nomake tests -nomake examples -android-ndk <path/to/sdk>/ndk/<ndk_version> -android-sdk <path/to/sdk> -no-warnings-are-errors
+    <path_to_qt_source>/configure -xplatform android-clang -prefix </path/to/install> -android-ndk <path/to/sdk>/ndk/<ndk_version> -android-sdk <path/to/sdk>
     \endcode
 
     \l{Qt Configure Options} contains more information about the configure options.
@@ -219,7 +219,7 @@
     mkdir C:\Qt\Build\build-qt
     cd C:\Qt\Build\build-qt
 
-    ..\Src_%VERSION%\configure.bat -platform win32-g++ -xplatform android-clang -prefix <\path\to\install> -nomake tests -nomake examples -android-sdk <ANDROID_SDK_PATH> -android-ndk <ANDROID_SDK_PATH>\ndk\<ndk_version> -android-ndk-host windows-x86_64 -no-warnings-are-errors
+    ..\Src_%VERSION%\configure.bat -platform win32-g++ -xplatform android-clang -prefix <\path\to\install> -android-sdk <ANDROID_SDK_PATH> -android-ndk <ANDROID_SDK_PATH>\ndk\<ndk_version> -android-ndk-host windows-x86_64
     \endcode
 
     \l{Qt Configure Options} contains more information about the configure options.
diff --git a/doc/src/platforms/android/android.qdoc b/doc/src/platforms/android/android.qdoc
index 576056f1..d164e1c5 100644
--- a/doc/src/platforms/android/android.qdoc
+++ b/doc/src/platforms/android/android.qdoc
@@ -146,16 +146,16 @@ Different Qt versions depend on different NDK versions, as listed below:
             Qt 5.13.2 or later
             Qt 5.12.6 or later
         \li NDK r20b or r21
-        \li \e android-clang
+        \li android-clang
     \row
         \li Qt 5.12.0 to 5.12.5
             Qt 5.13.0 to 5.13.1
         \li NDK r19c
-        \li \e android-clang
+        \li android-clang
     \row
         \li Qt 5.11 and earlier
         \li NDK r10e
-        \li \e GCC toolchain
+        \li GCC toolchain
 \endtable
 
 \note Qt 5.14.0 and 5.14.1 with NDK r21 have a bug fixed at \l {QTBUG-81461}.
@@ -203,21 +203,20 @@ After the package installation is complete, install the driver from
 \l{Android: adb}{adb} commands now and check whether your Android device
 responds to them.
 
-\section2 Linux 64-bit
+\section2 Linux
 
-If you're developing on a 64-bit Linux machine, you must install the
-following dependencies in order to run 32-bit executables like \c adb, which
-allows Qt Creator to find devices to deploy to:
+The following dependencies are needed for using tools such as \c adb or \c gdb which
+can be used by Qt Creator:
 
 \badcode
-sudo apt-get install libstdc++6:i386 libgcc1:i386 zlib1g:i386 libncurses5:i386
+sudo apt-get install libstdc++6 libncurses5
 \endcode
 
 \target emulator dependencies
 To run the Android emulator, the following dependencies are also necessary:
 
 \badcode
-sudo apt-get install libsdl1.2debian:i386
+sudo apt-get install libsdl1.2debian
 \endcode
 
 \section2 Qt Creator IDE
diff --git a/doc/src/platforms/linux.qdoc b/doc/src/platforms/linux.qdoc
index d15abf51..88d4b040 100644
--- a/doc/src/platforms/linux.qdoc
+++ b/doc/src/platforms/linux.qdoc
@@ -149,43 +149,49 @@
     \li libxcb-render
     \li X C Bindings for Render extension
     \li auto-detected
-    \li 1.9
+    \li 1.11
     \row {id="OptionalColor"}
     \li xcb-render-util
     \li libxcb-render-util
     \li Utility library for XCB for Render extension
     \li auto-detected
-    \li 0.3.8
+    \li 0.3.9
     \row {id="OptionalColor"}
     \li xcb-shape
     \li libxcb-shape
     \li X C Bindings for Shape extension
     \li auto-detected
-    \li 1.9
+    \li 1.11
     \row {id="DefaultColor"}
     \li xcb-randr
     \li libxcb-randr
     \li X C Bindings for Resize and Rotate Extension
     \li auto-detected
-    \li 1.9
+    \li 1.11
     \row {id="DefaultColor"}
     \li xcb-xfixes
     \li libxcb-xfixes
     \li X C Bindings for Fixes Extension
     \li auto-detected
-    \li 1.9
+    \li 1.11
+    \row {id="DefaultColor"}
+    \li xcb-xkb
+    \li libxcb-xkb
+    \li X C Bindings for XKeyboard Extension
+    \li auto-detected
+    \li 1.11
     \row {id="DefaultColor"}
     \li xcb-sync
     \li libxcb-sync
     \li X C Bindings for Sync Extension
     \li auto-detected
-    \li 1.9
+    \li 1.11
     \row {id="DefaultColor"}
     \li xcb-shm
     \li libxcb-shm
     \li X C Bindings for Shared Memory Extension
     \li auto-detected
-    \li 1.9
+    \li 1.11
     \row {id="DefaultColor"}
     \li xcb-icccm
     \li libxcb-icccm
@@ -204,6 +210,12 @@
     \li Utility library for XCB for XImage and XShmImage, used for QBackingStore and cursor support
     \li auto-detected
     \li 0.3.9
+    \row {id="DefaultColor"}
+    \li xcb-util
+    \li libxcb-util
+    \li Utility library for XCB for atom, aux and event
+    \li auto-detected
+    \li 0.3.9
 
     \row {id="OptionalColor"}
     \li xkbcommon
@@ -247,7 +259,7 @@
     \li libxcb
     \li X C Binding library
     \li
-    \li 1.9
+    \li 1.11
     \row {id="DefaultColor"}
     \li X11-xcb
     \li libX11-xcb
@@ -302,12 +314,14 @@
     \li libxcb-image0-dev
     \li libxcb-shm0-dev
     \li libxcb-icccm4-dev
-    \li libxcb-sync0-dev
+    \li libxcb-sync-dev
     \li libxcb-xfixes0-dev
     \li libxcb-shape0-dev
     \li libxcb-randr0-dev
     \li libxcb-render-util0-dev
-    \li libxcd-xinerama-dev
+    \li libxcb-util-dev
+    \li libxcb-xinerama0-dev
+    \li libxcb-xkb-dev
     \li libxkbcommon-dev
     \li libxkbcommon-x11-dev
     \endlist
diff --git a/doc/src/platforms/supported-platforms.qdoc b/doc/src/platforms/supported-platforms.qdoc
index 1090f0e8..dda1fda1 100644
--- a/doc/src/platforms/supported-platforms.qdoc
+++ b/doc/src/platforms/supported-platforms.qdoc
@@ -65,13 +65,12 @@
 
     \section1 Reference Configurations
 
-    The reference configurations are run on the continuous integration (CI)
-    system within Qt Project. In addition, they are subjected to unit test suite
-    and other internal testing tools on a frequent basis (prior to new version
-    releases, source tree branching, and at other significant period points in
-    the development process). Errors or bugs discovered in these platforms are
-    prioritized for correction. Significant errors discovered in tested
-    configurations can impact release dates.
+    Reference configurations are the primary focus of development. They are subjected
+    to unit test suite and other internal testing tools on a frequent basis (prior to
+    new version releases, source tree branching, and at other significant period points
+    in the development process). Errors or bugs discovered in these platforms are
+    prioritized for correction. Significant errors discovered in tested configurations
+    can impact release dates.
 
     Any configurations not listed above are not actively tested by the Qt
     Project. However, Qt may run on configurations other than those actively
@@ -80,10 +79,6 @@
     state for that particular configuration. The reference configurations are
     subject to change during the lifetime of a Qt release.
 
-    Details of the reference configurations are stored as \e {provisioning scripts}
-    in the \l {https://code.qt.io/cgit/qt/qt5.git/tree/coin?h=\qtver}
-    {qt5 Git repository}.
-
     The Qt Company provides support for the officially supported platforms and
     configurations. The Qt Company, Qt partners, open source projects and community
     users are also able to provide assistance with various different platforms and