Merge remote-tracking branch 'qtyocto/upstream/master' into 5.13

* upstream/master:
  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)

Conflicts:
  recipes-qt/qt5/qtserialbus_git.bb

Change-Id: I8f5248fb6f320555a231f59cddeb4c18ff810259

1 files changed, 36 insertions, 0 deletions

diff --git a/recipes-qt/qt5/qt5-creator/0001-clangformat-AllowShortIfStatementsOnASingleLine-is-n.patch b/recipes-qt/qt5/qt5-creator/0001-clangformat-AllowShortIfStatementsOnASingleLine-is-n.patch
new file mode 100644
index 00000000..1bc3632d
--- /dev/null
+++ b/recipes-qt/qt5/qt5-creator/0001-clangformat-AllowShortIfStatementsOnASingleLine-is-n.patch
@@ -0,0 +1,36 @@
+From 453c075b67b9d9254bf7331e1e3be287f240a9e0 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 3 Sep 2019 13:31:12 -0700
+Subject: [PATCH] clangformat: AllowShortIfStatementsOnASingleLine is not
+ boolean anymore
+
+https://reviews.llvm.org/D59087 has implemented multiple states for AllowShortIfStatementsOnASingleLine
+
+Fixes
+../../../../git/src/plugins/clangformat/clangformatutils.cpp:63:49: error: assigning to 'clang::format::FormatStyle::ShortIfStyle' from incompatible type 'bool'
+    style.AllowShortIfStatementsOnASingleLine = false;
+                                                ^~~~~
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/plugins/clangformat/clangformatutils.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/plugins/clangformat/clangformatutils.cpp b/src/plugins/clangformat/clangformatutils.cpp
+index 09a3150c89..7d8a95ae18 100644
+--- a/src/plugins/clangformat/clangformatutils.cpp
++++ b/src/plugins/clangformat/clangformatutils.cpp
+@@ -60,7 +60,7 @@ static clang::format::FormatStyle qtcStyle()
+     style.AllowShortBlocksOnASingleLine = false;
+     style.AllowShortCaseLabelsOnASingleLine = false;
+     style.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_Inline;
+-    style.AllowShortIfStatementsOnASingleLine = false;
++    style.AllowShortIfStatementsOnASingleLine = FormatStyle::SIS_Never;
+     style.AllowShortLoopsOnASingleLine = false;
+     style.AlwaysBreakAfterReturnType = FormatStyle::RTBS_None;
+     style.AlwaysBreakBeforeMultilineStrings = false;
+-- 
+2.23.0
+