From cabaf4ef690ab5dcde901822edfd4fe5067497ac Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 5 Feb 2018 15:50:21 +0200 Subject: 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 --- classes/qtquickcompiler.bbclass | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) (limited to 'classes/qtquickcompiler.bbclass') 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 @@ ############################################################################ ## -## Copyright (C) 2016 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -27,27 +27,4 @@ ## ############################################################################ -python __anonymous() { - if d.getVar('DISABLE_QTQUICKCOMPILER', True) == "1": - return - - provider = "" - sdk_path = d.getVar('B2QTBASE', True) + "/recipes-qt/qt5-addons/qtquickcompiler-sdk" - pn = d.getVar("PN", True) - - if d.getVar('ENABLE_QTQUICKCOMPILER', True) == "1": - provider = "qtquickcompiler" - elif os.path.isdir(sdk_path): - provider = "qtquickcompiler-sdk" - else: - bb.note("qtquickcompiler not enabled for %s" % pn) - return - - if "toolchain-host" in pn: - d.appendVar('RDEPENDS_' + pn, " nativesdk-%s-tools" % provider) - if "toolchain-target" in pn: - d.appendVar('RDEPENDS_' + pn, " %s-dev" % provider) - else: - d.appendVar('DEPENDS', " %s %s-native" % (provider, provider)) - d.appendVar('EXTRA_QMAKEVARS_PRE', " CONFIG+=qtquickcompiler") -} +EXTRA_QMAKEVARS_PRE += "CONFIG+=qtquickcompiler" -- cgit v1.2.3-54-g00ecf