From 0cf281fdd678ea57b34bd9c7e5c48dc421d290ae Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 16 Jun 2015 15:57:53 +0300 Subject: qtquickcompiler: disable for BYOS QtQuickCompiler sources are not distributed, so for BYOS builds we need to disable. For now, only print note that it's not supported. Next step is to try to use the precompiled version from SDK. Change-Id: I8185e66fd2bc6471218ee3ea8520fa40c2c08592 Reviewed-by: Eirik Aavitsland --- classes/qtquickcompiler.bbclass | 45 ++++++++++++++++++++++++++++++----------- 1 file changed, 33 insertions(+), 12 deletions(-) (limited to 'classes/qtquickcompiler.bbclass') diff --git a/classes/qtquickcompiler.bbclass b/classes/qtquickcompiler.bbclass index 202d592..1478741 100644 --- a/classes/qtquickcompiler.bbclass +++ b/classes/qtquickcompiler.bbclass @@ -1,13 +1,34 @@ -EXTRA_QMAKEVARS_PRE += "CONFIG+=qtquickcompiler CONFIG+=no_qtquickcompiler_depend" +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# -DEPENDS_prepend = "qtquickcompiler qtquickcompiler-native " - -#python __anonymous() { -# do the magic: -# if QT_SDK path is set, -# add dependency to qtquickcompiler-sdk-native package that -# copies the needed files (binary and mkspec files) from the SDK -# else -# add dependency to qtquickcompiler-native package that -# builds it from internal repos -#} +python __anonymous() { + sdk_path = d.getVar('QT_SDK_PATH', True) or "" + if len(sdk_path) != 0: + bb.note("TODO: QtQuickCompiler not yet available for external builds") + else: + pn = d.getVar("PN", True) + if pn.startswith("nativesdk-"): + d.appendVar('RDEPENDS_' + pn, " nativesdk-qtquickcompiler-tools") + else: + d.appendVar('DEPENDS', " qtquickcompiler qtquickcompiler-native") + d.appendVar('EXTRA_QMAKEVARS_PRE', " CONFIG+=qtquickcompiler CONFIG+=no_qtquickcompiler_depend") +} -- cgit v1.2.3-54-g00ecf