summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtremoteobjects/0001-Allow-a-tools-only-build.patch
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2017-06-09 09:34:09 +0300
committerMartin Jansa <Martin.Jansa@gmail.com>2017-08-20 19:30:05 +0200
commit969f1f80bf255498abbec6886d443670c20a79c8 (patch)
tree45a65f19da61868c2fe71669fb4b7d29b374edac /recipes-qt/qt5/qtremoteobjects/0001-Allow-a-tools-only-build.patch
parent648f7b0a2eb202d4378ce50ae566b6ca450dd010 (diff)
downloadmeta-qt5-969f1f80bf255498abbec6886d443670c20a79c8.tar.gz
Upgrade to Qt 5.9.0
* adapt QtWebEngine recipe to use GN instead of GYP * add QtRemoteObjects and QtWebView as a new Qt modules * update available QtBase configure arguments * remove obsolete patches * patch all .pc files to remove build paths * include generated QML cache files in packages * the patch "configure paths for target qmake properly" could not be applied anymore and support must be done differently * QtWebEngine now requires gcc-multilib to be installed on the host system, because the host tools are built to the same bitness as the target (arm -> x86, aarch64 -> x86-64) * refresh the patches to match with b5.9* branches on: https://github.com/meta-qt5/qtbase https://github.com/meta-qt5/qtwebengine and 56-based branch on https://github.com/meta-qt5/qtwebengine-chromium Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtremoteobjects/0001-Allow-a-tools-only-build.patch')
-rw-r--r--recipes-qt/qt5/qtremoteobjects/0001-Allow-a-tools-only-build.patch37
1 files changed, 37 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtremoteobjects/0001-Allow-a-tools-only-build.patch b/recipes-qt/qt5/qtremoteobjects/0001-Allow-a-tools-only-build.patch
new file mode 100644
index 00000000..dfebc184
--- /dev/null
+++ b/recipes-qt/qt5/qtremoteobjects/0001-Allow-a-tools-only-build.patch
@@ -0,0 +1,37 @@
1From dd9d1e5ecdcd8267215523ad08ea893656a7f42d Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Wed, 7 Jun 2017 15:17:12 +0300
4Subject: [PATCH] Allow a tools-only build
5
6Change-Id: I3b33fc1c8877fc82568bd386b063e7a0aa57b706
7---
8 mkspecs/features/repccommon.pri | 2 +-
9 qtremoteobjects.pro | 5 +++++
10 2 files changed, 6 insertions(+), 1 deletion(-)
11
12diff --git a/mkspecs/features/repccommon.pri b/mkspecs/features/repccommon.pri
13index 5e88bf8..6efd19e 100644
14--- a/mkspecs/features/repccommon.pri
15+++ b/mkspecs/features/repccommon.pri
16@@ -3,7 +3,7 @@ cmd = $${QT.remoteobjects.bins}/repc
17 contains(QMAKE_HOST.os, Windows) {
18 cmd = $$system_path($${cmd}.exe)
19 }
20-exists($$cmd): QT_TOOL.repc.binary = $$cmd
21+false:exists($$cmd): QT_TOOL.repc.binary = $$cmd
22
23 # qtPrepareTool honors QT_TOOL.repc.binary if set
24 qtPrepareTool(QMAKE_REPC, repc)
25diff --git a/qtremoteobjects.pro b/qtremoteobjects.pro
26index c2e2b6b..93c2bb5 100644
27--- a/qtremoteobjects.pro
28+++ b/qtremoteobjects.pro
29@@ -2,3 +2,8 @@ CONFIG += examples_need_tools tests_need_tools
30 load(qt_parts)
31
32 SUBDIRS += mkspecs
33+
34+tools-only {
35+ sub_tools.depends -= sub_src
36+ SUBDIRS = sub_tools
37+}