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

* origin/5.12:
  qt5: update to Qt 5.12.5
  Add CI build instructions
  qt5-creator: fix build with musl
  ogl-runtime: fix build on musl libc

Change-Id: Ia5d0e73a06489bebf70897805bb0aa314ba5a663

2 files changed, 27 insertions, 0 deletions

diff --git a/recipes-qt/qt5/ogl-runtime/0003-Fix-build-on-musl-libc.patch b/recipes-qt/qt5/ogl-runtime/0003-Fix-build-on-musl-libc.patch
new file mode 100644
index 00000000..5fe840a0
--- /dev/null
+++ b/recipes-qt/qt5/ogl-runtime/0003-Fix-build-on-musl-libc.patch
@@ -0,0 +1,26 @@
+From f654a25f9df6583532798f30181d149d51b23808 Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <samuli.piippo@qt.io>
+Date: Thu, 8 Aug 2019 08:34:47 +0300
+Subject: [PATCH] Fix build on musl libc
+
+Use bits/local_lim.h only with glibc as it's not available
+on musl libc.
+
+Change-Id: Ibffa4ab5649b544664f99b16e94d6865148eeeb5
+---
+ src/foundation/linux/Qt3DSLinuxThread.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/foundation/linux/Qt3DSLinuxThread.cpp b/src/foundation/linux/Qt3DSLinuxThread.cpp
+index fa6e069..99c4c3a 100644
+--- a/src/foundation/linux/Qt3DSLinuxThread.cpp
++++ b/src/foundation/linux/Qt3DSLinuxThread.cpp
+@@ -35,7 +35,7 @@
+ #include "foundation/Qt3DSAssert.h"
+ #include "foundation/Qt3DSIntrinsics.h"
+ #include "foundation/Qt3DSBroadcastingAllocator.h"
+-#if !defined(QT3DS_APPLE) && !defined(ANDROID) && !defined(__CYGWIN__) && !defined(__QNX__) && !defined(__INTEGRITY)
++#if !defined(QT3DS_APPLE) && !defined(ANDROID) && !defined(__CYGWIN__) && !defined(__QNX__) && !defined(__INTEGRITY) && defined(__GLIBC__)
+ #include <bits/local_lim.h> // PTHREAD_STACK_MIN
+ #endif
+ #include <stdio.h>
diff --git a/recipes-qt/qt5/ogl-runtime_git.bb b/recipes-qt/qt5/ogl-runtime_git.bb
index ecc8ba2b..049f885a 100644
--- a/recipes-qt/qt5/ogl-runtime_git.bb
+++ b/recipes-qt/qt5/ogl-runtime_git.bb
@@ -18,6 +18,7 @@ SRC_URI += " \
     ${QT_GIT}/qt3dstudio-eastl.git;name=EASTL;branch=${QT_MODULE_BRANCH_EASTL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/EASTL \
     file://0001-Fix-examples-build-error.patch \
     file://0002-Fix-format-security-issues.patch \
+    file://0003-Fix-build-on-musl-libc.patch \
 "
 
 SRCREV_ogl-runtime = "a41270dced230d90e0e07f2ebb880e4f97317a7f"