Merge remote-tracking branch 'origin/5.12.2' into 5.12

Change-Id: I23480fa2e34e33736d27cd692474f660e81ce9da

3 files changed, 39 insertions, 5 deletions

diff --git a/dist/changes-5.12.2 b/dist/changes-5.12.2
new file mode 100644
index 000000000..e83f60081
--- /dev/null
+++ b/dist/changes-5.12.2
@@ -0,0 +1,24 @@
+Qt 5.12.2 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.12.0 through 5.12.1.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+https://doc.qt.io/qt-5/index.html
+
+The Qt version 5.12 series is binary compatible with the 5.11.x series.
+Applications compiled for 5.11 will continue to run with 5.12.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+*                                 lupdate                                  *
+****************************************************************************
+
+ - [QTBUG-42736] Added support for parsing C++11 raw string literals
diff --git a/src/qdoc/configure.json b/src/qdoc/configure.json
index 6b757737c..f7190fcb3 100644
--- a/src/qdoc/configure.json
+++ b/src/qdoc/configure.json
@@ -28,8 +28,9 @@
             "message": "QDoc will not be compiled, probably because libclang could not be located. This means that you cannot build the Qt documentation.
 
 Either ensure that llvm-config is in your PATH environment variable, or set LLVM_INSTALL_DIR to the location of your llvm installation.
-On Linux systems you may be able to install libclang from a package. On macOS you could use Homebrew's llvm package.
-On Windows you need to set LLVM_INSTALL_DIR to the installation path."
+On Linux systems, you may be able to install libclang by installing the libclang-dev or libclang-devel package, depending on your distribution.
+On macOS, you can use Homebrew's llvm package.
+On Windows, you must set LLVM_INSTALL_DIR to the installation path."
         }
     ],
     "summary": [
diff --git a/src/qdoc/configure.pri b/src/qdoc/configure.pri
index 8fd43401a..c69ed4edb 100644
--- a/src/qdoc/configure.pri
+++ b/src/qdoc/configure.pri
@@ -57,6 +57,7 @@ defineTest(qtConfTest_libclang) {
     # Assume libclang is installed on the target system
     isEmpty(LLVM_INSTALL_DIR) {
         llvmConfigCandidates = \
+            llvm-config-8 \
             llvm-config-7 \
             llvm-config-6.0 \
             llvm-config-5.0 \
@@ -67,9 +68,17 @@ defineTest(qtConfTest_libclang) {
         for (candidate, llvmConfigCandidates) {
             LLVM_INSTALL_DIR = $$system("$$candidate --prefix 2>$$QMAKE_SYSTEM_NULL_DEVICE")
             !isEmpty(LLVM_INSTALL_DIR) {
-                qtLog("Using Clang installation found in $${LLVM_INSTALL_DIR}." \
-                      "Set the LLVM_INSTALL_DIR environment variable to override.")
-                break()
+                CLANG_INCLUDEPATH = $$system("$$candidate --includedir 2>/dev/null")
+                LIBCLANG_MAIN_HEADER = $$CLANG_INCLUDEPATH/clang-c/Index.h
+                !exists($$LIBCLANG_MAIN_HEADER) {
+                    !isEmpty(LLVM_INSTALL_DIR): \
+                        qtLog("Cannot find libclang's main header file, candidate: $${LIBCLANG_MAIN_HEADER}.")
+                        continue
+                } else {
+                    qtLog("Using Clang installation found in $${LLVM_INSTALL_DIR}." \
+                          "Set the LLVM_INSTALL_DIR environment variable to override.")
+                    break()
+                }
             }
         }
     }