2 files changed, 32 insertions, 5 deletions

diff --git a/recipes-qt/qt5/qtbase/0001-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0001-Bootstrap-without-linkat-feature.patch
new file mode 100644
index 00000000..32d8a4c7
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/0001-Bootstrap-without-linkat-feature.patch
@@ -0,0 +1,27 @@
+From b15a9aa4f3229d01d3b12e0c4498bdcd55480a24 Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <samuli.piippo@qt.io>
+Date: Fri, 24 Nov 2017 15:16:31 +0200
+Subject: [PATCH] Bootstrap without linkat feature
+
+qmake does not work together with pseudo when unnamed temporary files
+are used with linkat.
+
+Upstream-Status: Inappropriate [OE specific]
+[YOCTO #11996]
+---
+ src/corelib/global/qconfig-bootstrapped.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h
+index dabb715..5b4ff86 100644
+--- a/src/corelib/global/qconfig-bootstrapped.h
++++ b/src/corelib/global/qconfig-bootstrapped.h
+@@ -88,7 +88,7 @@
+ #define QT_FEATURE_futimes -1
+ #define QT_FEATURE_library -1
+ #ifdef __linux__
+-# define QT_FEATURE_linkat 1
++# define QT_FEATURE_linkat -1
+ #else
+ # define QT_FEATURE_linkat -1
+ #endif
diff --git a/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch b/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch
index 2a1d534b..8ca2c8c4 100644
--- a/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch
+++ b/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch
@@ -1,7 +1,7 @@
-From bf173918731c626b6c8b84eb826c921e5c6d44f5 Mon Sep 17 00:00:00 2001
+From b63b2819b88ef252a078e7ef595f7f370ec0c050 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa@gmail.com>
 Date: Sat, 16 Nov 2013 00:32:30 +0100
-Subject: [PATCH] Always build uic
+Subject: [PATCH] Always build uic and qvkgen
 
 Even if we are not building gui or widgets. This tool is needed later
 as a native tool when compiling the target.
@@ -14,15 +14,15 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/src.pro b/src/src.pro
-index 43fc06f2e5..1e9d4dcc0d 100644
+index a2064b1..9fae335 100644
 --- a/src/src.pro
 +++ b/src/src.pro
-@@ -203,7 +203,7 @@ qtConfig(gui) {
+@@ -211,7 +211,7 @@ qtConfig(gui) {
          }
      }
  }
 -SUBDIRS += src_plugins
-+SUBDIRS += src_plugins src_tools_uic
++SUBDIRS += src_plugins src_tools_uic src_tools_qvkgen
  
  nacl: SUBDIRS -= src_network src_testlib