summaryrefslogtreecommitdiffstats
path: root/classes/qtquickcompiler.bbclass
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2018-02-05 15:50:21 +0200
committerSamuli Piippo <samuli.piippo@qt.io>2018-02-12 10:11:38 +0000
commitcabaf4ef690ab5dcde901822edfd4fe5067497ac (patch)
treece006f10ef4ee9e36142c9f0a322b72ac3315f8f /classes/qtquickcompiler.bbclass
parente91280bbcb99d7f4e3f79c2efe9c1fbc40b144fc (diff)
downloadmeta-boot2qt-cabaf4ef690ab5dcde901822edfd4fe5067497ac.tar.gz
qt5: Upgrade to Qt 5.11.0
QtQuickCompiler is now part of qtdeclarative, separate recipe is no longer needed. Keeping qtquickcompiler.bbclass still for backwards compatibility. Change-Id: I8e6a66b176fc17c4bb161ae4638125238518e22a Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Diffstat (limited to 'classes/qtquickcompiler.bbclass')
-rw-r--r--classes/qtquickcompiler.bbclass27
1 files changed, 2 insertions, 25 deletions
diff --git a/classes/qtquickcompiler.bbclass b/classes/qtquickcompiler.bbclass
index 3a1bcbe..f54887c 100644
--- a/classes/qtquickcompiler.bbclass
+++ b/classes/qtquickcompiler.bbclass
@@ -1,6 +1,6 @@
1############################################################################ 1############################################################################
2## 2##
3## Copyright (C) 2016 The Qt Company Ltd. 3## Copyright (C) 2018 The Qt Company Ltd.
4## Contact: https://www.qt.io/licensing/ 4## Contact: https://www.qt.io/licensing/
5## 5##
6## This file is part of the Boot to Qt meta layer. 6## This file is part of the Boot to Qt meta layer.
@@ -27,27 +27,4 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30python __anonymous() { 30EXTRA_QMAKEVARS_PRE += "CONFIG+=qtquickcompiler"
31 if d.getVar('DISABLE_QTQUICKCOMPILER', True) == "1":
32 return
33
34 provider = ""
35 sdk_path = d.getVar('B2QTBASE', True) + "/recipes-qt/qt5-addons/qtquickcompiler-sdk"
36 pn = d.getVar("PN", True)
37
38 if d.getVar('ENABLE_QTQUICKCOMPILER', True) == "1":
39 provider = "qtquickcompiler"
40 elif os.path.isdir(sdk_path):
41 provider = "qtquickcompiler-sdk"
42 else:
43 bb.note("qtquickcompiler not enabled for %s" % pn)
44 return
45
46 if "toolchain-host" in pn:
47 d.appendVar('RDEPENDS_' + pn, " nativesdk-%s-tools" % provider)
48 if "toolchain-target" in pn:
49 d.appendVar('RDEPENDS_' + pn, " %s-dev" % provider)
50 else:
51 d.appendVar('DEPENDS', " %s %s-native" % (provider, provider))
52 d.appendVar('EXTRA_QMAKEVARS_PRE', " CONFIG+=qtquickcompiler")
53}