From patchwork Tue Jan 31 07:59:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zoltan Gyarmati X-Patchwork-Id: 721833 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vCJb64Yftz9srY for ; Tue, 31 Jan 2017 19:00:18 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="aGzDt/5o"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id C390389C60; Tue, 31 Jan 2017 08:00:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id VGWqGnyRv4Ez; Tue, 31 Jan 2017 08:00:11 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id C15AA89591; Tue, 31 Jan 2017 07:59:48 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 640461BFBE5 for ; Tue, 31 Jan 2017 07:59:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 5F5E78A4E7 for ; Tue, 31 Jan 2017 07:59:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ZbBH8Qjf3RHO for ; Tue, 31 Jan 2017 07:59:42 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by hemlock.osuosl.org (Postfix) with ESMTPS id 3CAE88A273 for ; Tue, 31 Jan 2017 07:59:42 +0000 (UTC) Received: by mail-wm0-f65.google.com with SMTP id c85so82186917wmi.1 for ; Mon, 30 Jan 2017 23:59:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=3PLKERjg/2nzg3p4LMYgYsp6FVgwYgJXQpqUlwVdeEg=; b=aGzDt/5oUo2LNC92zh7yco6lQZiAc7A0ic44ru/uAmm7gFY22nyG9ms0K3rcunKa1H WGG95Nlu8zwzbwn6fokvHAUZg0lccw7L0HG/+uSO5QgPUkFtHHCV3iZN2HRczxp3zsXK CHsI+mBfEptAey/UuVvsxwGin4m0ewTn35HqQA7AdBpQufy3Xi8IEXaArnEhh9GspvRC ll1wafCAXhw0d8PXABeNhO66ZNTePbwTqUrLtPNknJKmV/HhMtt/XuKIebn9h23NpKM8 W6+eZuTcTIkqPVWMe+a/WhJNrdpBtp9In9Wml8g5hoTPfhQt5NRjmJXGpXPrw5nQBc1R tBpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=3PLKERjg/2nzg3p4LMYgYsp6FVgwYgJXQpqUlwVdeEg=; b=kus4scsyGHpPEK4/rqnoj/P6DYspx+Y5NWxtPwlukmcfEliN4OY7UPZNbfG82jGEQK nCpBxIWf9tRUop4AlIFrQBzxFHphdkW7LQd3xadPWJ+6c4J3zaIAvLQmRhH6Q0+207jJ VNTpHpq8Z5jWu6gzOf5OXTI+DKEuHUYvX86xWm8YnVLW39CtRJwLRGdgHx8i7J6wepRy 0MPrqDrBzt9pFFeU9B2Y/qUJXo8HCWNUf36s7b9bEJkl/XivMGmarn9wdxdnD1ZQILV0 W40UftTOrvm1wetIhRTdK1j9+PeL/ckyimcHo/eEQXzfHrncC4R6sWIIoJhLnO196XR1 7K3Q== X-Gm-Message-State: AIkVDXJbtbOkzuDIel1rpNDmBT6MTlzsLuAs3j3jec7+oJ8BGr6iCgKLofVHyE/4Xoqogw== X-Received: by 10.28.178.16 with SMTP id b16mr19040511wmf.83.1485849580480; Mon, 30 Jan 2017 23:59:40 -0800 (PST) Received: from zgyarmati-ThinkPad-T510.localdomain (x5ce0da15.dyn.telefonica.de. [92.224.218.21]) by smtp.gmail.com with ESMTPSA id c202sm22269210wmd.10.2017.01.30.23.59.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 30 Jan 2017 23:59:39 -0800 (PST) From: Zoltan Gyarmati To: buildroot@buildroot.org Date: Tue, 31 Jan 2017 08:59:09 +0100 Message-Id: <1485849551-20469-8-git-send-email-mr.zoltan.gyarmati@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1485849551-20469-1-git-send-email-mr.zoltan.gyarmati@gmail.com> References: <1485849551-20469-1-git-send-email-mr.zoltan.gyarmati@gmail.com> Cc: Andreas Naumann Subject: [Buildroot] [PATCH v6 7/9] qt5quickcontrols/qt5quickcontrols2: enable for software renderer for Qt 5.8.0 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Naumann Andreas Signed-off-by: Andreas Naumann Signed-off-by: Zoltan Gyarmati --- package/qt5/qt5quickcontrols/Config.in | 4 ++-- package/qt5/qt5quickcontrols2/Config.in | 4 ++-- package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk | 12 ++++++++++++ 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/package/qt5/qt5quickcontrols/Config.in b/package/qt5/qt5quickcontrols/Config.in index 0fe8465..d1a4fa5 100644 --- a/package/qt5/qt5quickcontrols/Config.in +++ b/package/qt5/qt5quickcontrols/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_QT5QUICKCONTROLS bool "qt5quickcontrols" select BR2_PACKAGE_QT5DECLARATIVE select BR2_PACKAGE_QT5DECLARATIVE_QUICK - depends on BR2_PACKAGE_QT5_GL_AVAILABLE + depends on BR2_PACKAGE_QT5_GL_AVAILABLE || BR2_QT5_VERSION_5_8 depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE help Qt is a cross-platform application and UI framework for @@ -13,5 +13,5 @@ config BR2_PACKAGE_QT5QUICKCONTROLS http://qt.io comment "qt5quickcontrols needs an OpenGL-capable backend" - depends on !BR2_PACKAGE_QT5_GL_AVAILABLE + depends on !BR2_PACKAGE_QT5_GL_AVAILABLE && BR2_QT5_VERSION_5_6 depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE diff --git a/package/qt5/qt5quickcontrols2/Config.in b/package/qt5/qt5quickcontrols2/Config.in index 1e57674..ea22a2b 100644 --- a/package/qt5/qt5quickcontrols2/Config.in +++ b/package/qt5/qt5quickcontrols2/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_QT5QUICKCONTROLS2 bool "qt5quickcontrols2" select BR2_PACKAGE_QT5DECLARATIVE select BR2_PACKAGE_QT5DECLARATIVE_QUICK - depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative/quick + depends on BR2_PACKAGE_QT5_GL_AVAILABLE || BR2_QT5_VERSION_5_8 # qt5declarative/quick depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative/quick help Qt is a cross-platform application and UI framework for @@ -13,5 +13,5 @@ config BR2_PACKAGE_QT5QUICKCONTROLS2 http://qt.io comment "qt5quickcontrols2 needs an OpenGL-capable backend" - depends on !BR2_PACKAGE_QT5_GL_AVAILABLE + depends on !BR2_PACKAGE_QT5_GL_AVAILABLE && BR2_QT5_VERSION_5_6 depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk index 8de7932..0ef25e2 100644 --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk @@ -36,6 +36,7 @@ define QT5QUICKCONTROLS2_INSTALL_TARGET_EXAMPLES endef endif +ifeq ($(BR2_QT5_VERSION_5_6),y) define QT5QUICKCONTROLS2_INSTALL_TARGET_CMDS cp -dpf $(STAGING_DIR)/usr/lib/libQt5LabsTemplates.so.* $(TARGET_DIR)/usr/lib cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/controls $(TARGET_DIR)/usr/qml/Qt/labs @@ -43,5 +44,16 @@ define QT5QUICKCONTROLS2_INSTALL_TARGET_CMDS cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/templates $(TARGET_DIR)/usr/qml/Qt/labs $(QT5QUICKCONTROLS2_INSTALL_TARGET_EXAMPLES) endef +else +define QT5QUICKCONTROLS2_INSTALL_TARGET_CMDS + cp -dpf $(STAGING_DIR)/usr/lib/libQt5QuickTemplates2.so.* $(TARGET_DIR)/usr/lib + cp -dpf $(STAGING_DIR)/usr/lib/libQt5QuickControls2.so.* $(TARGET_DIR)/usr/lib + cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/calendar $(TARGET_DIR)/usr/qml/Qt/labs + cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/platform $(TARGET_DIR)/usr/qml/Qt/labs + cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Controls.2 $(TARGET_DIR)/usr/qml/QtQuick + cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Templates.2 $(TARGET_DIR)/usr/qml/QtQuick + $(QT5QUICKCONTROLS2_INSTALL_TARGET_EXAMPLES) +endef +endif $(eval $(generic-package))