diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2017-06-07 16:16:59 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2017-06-08 10:34:03 +0000 |
commit | 8116cc0e8acf90f8651fcb39eafcf006419e6e06 (patch) | |
tree | 24a602750dff09173c280e323eb1291e7e4df488 | |
parent | 15a2e1643239b40ee1bc2ee32dd3b91ec6960dbf (diff) | |
download | meta-qt5-8116cc0e8acf90f8651fcb39eafcf006419e6e06.tar.gz |
qtremoteobjects: build repc tool for native and nativesdk
Tools is required for actually using QtRemoteObjects
Change-Id: I455f5e693261da2290f742cd1f0131240cc4afe5
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
-rw-r--r-- | recipes-qt/qt5/qtremoteobjects/0001-Allow-a-tools-only-build.patch | 37 | ||||
-rw-r--r-- | recipes-qt/qt5/qtremoteobjects_git.bb | 15 |
2 files changed, 51 insertions, 1 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 @@ | |||
1 | From dd9d1e5ecdcd8267215523ad08ea893656a7f42d Mon Sep 17 00:00:00 2001 | ||
2 | From: Samuli Piippo <samuli.piippo@qt.io> | ||
3 | Date: Wed, 7 Jun 2017 15:17:12 +0300 | ||
4 | Subject: [PATCH] Allow a tools-only build | ||
5 | |||
6 | Change-Id: I3b33fc1c8877fc82568bd386b063e7a0aa57b706 | ||
7 | --- | ||
8 | mkspecs/features/repccommon.pri | 2 +- | ||
9 | qtremoteobjects.pro | 5 +++++ | ||
10 | 2 files changed, 6 insertions(+), 1 deletion(-) | ||
11 | |||
12 | diff --git a/mkspecs/features/repccommon.pri b/mkspecs/features/repccommon.pri | ||
13 | index 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) | ||
25 | diff --git a/qtremoteobjects.pro b/qtremoteobjects.pro | ||
26 | index 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 | +} | ||
diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index 550e0305..f563818d 100644 --- a/recipes-qt/qt5/qtremoteobjects_git.bb +++ b/recipes-qt/qt5/qtremoteobjects_git.bb | |||
@@ -9,6 +9,19 @@ LIC_FILES_CHKSUM = " \ | |||
9 | require qt5.inc | 9 | require qt5.inc |
10 | require qt5-git.inc | 10 | require qt5-git.inc |
11 | 11 | ||
12 | DEPENDS += "qtbase qtdeclarative" | 12 | DEPENDS += "qtbase qtdeclarative qtremoteobjects-native" |
13 | |||
14 | SRC_URI += " \ | ||
15 | file://0001-Allow-a-tools-only-build.patch \ | ||
16 | " | ||
17 | |||
18 | PACKAGECONFIG ??= "" | ||
19 | PACKAGECONFIG_class-native ??= "tools-only" | ||
20 | PACKAGECONFIG_class-nativesdk ??= "tools-only" | ||
21 | PACKAGECONFIG[tools-only] = "CONFIG+=tools-only" | ||
22 | |||
23 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" | ||
13 | 24 | ||
14 | SRCREV = "ae0b101884b05355e3a7bc06dbca722ad3d08d0f" | 25 | SRCREV = "ae0b101884b05355e3a7bc06dbca722ad3d08d0f" |
26 | |||
27 | BBCLASSEXTEND += "native nativesdk" | ||