Merge remote-tracking branch 'qtyocto/5.13' into 5.14

* qtyocto/5.13:
  0be6a24 qt5: update submodules
  bf92306 Merge remote-tracking branch 'qtyocto/upstream/master' into 5.13
  6442c54 qt3d-runtime: update to ogl-runtime v2.4
  7bb213b qtvirtualkeyboard: update supported layouts
  eb63611 qt5-creator: Fix clangformat with clang 9.x
  12ea469 qttools: Add CONFIG+=config_clang_done when not building with clang
  dc502d5 qtwebengine: Fix compile failure with 5.2+ kernel headers
  8799d3b qtserialbus: Fix build with 5.2+ kernel headers
  e8aa2dd qtwebengine: Add pulseaudio support
  4d8f350 qtwebengine: Rename jasoncpp to jsoncpp
  725c87d qtwayland: do not reference private modules in cmake Qt5WaylandClient
  a41cd9e qtwayland: remove workaround for missing private headers (QTBUG-71340)

Change-Id: Iac0ec8c35f65aa27a1bf0c6b5928d26f13bc0733

1 files changed, 5 insertions, 3 deletions

diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index d170cb18..ad9ab426 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -30,13 +30,15 @@ PACKAGECONFIG_append_toolchain-clang = " clang"
 PACKAGECONFIG[qtwebkit] = ",,qtwebkit"
 PACKAGECONFIG[clang] = ",,clang"
 
+export YOCTO_ALTERNATE_EXE_PATH = "${STAGING_BINDIR}/llvm-config"
+
 EXTRA_QMAKEVARS_PRE += " \
     ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \
 "
-EXTRA_QMAKEVARS_PRE_append_class-native = " CONFIG-=config_clang"
-EXTRA_QMAKEVARS_PRE_append_class-nativesdk = " CONFIG-=config_clang"
+EXTRA_QMAKEVARS_PRE_append_class-native = " CONFIG+=config_clang_done CONFIG-=config_clang"
+EXTRA_QMAKEVARS_PRE_append_class-nativesdk = " CONFIG+=config_clang_done CONFIG-=config_clang"
 EXTRA_QMAKEVARS_PRE_append_class-target = "\
-    ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=config_clang', 'CONFIG-=config_clang', d)} \
+    ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=config_clang', 'CONFIG+=config_clang_done CONFIG-=config_clang', d)} \
 "
 
 SRCREV = "bb57fe7440e59008851a95ee63ee4d16fde080ed"