From patchwork Tue Nov 15 17:13:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Corjon X-Patchwork-Id: 695146 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tJDY16GR4z9t0J for ; Wed, 16 Nov 2016 04:15:17 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id D527631F0F; Tue, 15 Nov 2016 17:15:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HI6INK3k2scr; Tue, 15 Nov 2016 17:15:04 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 31A4D31DBD; Tue, 15 Nov 2016 17:14:07 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id B1CBB1CF7D6 for ; Tue, 15 Nov 2016 17:13:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id C157731C0A for ; Tue, 15 Nov 2016 17:13:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5voo4k50eiPC for ; Tue, 15 Nov 2016 17:13:44 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by silver.osuosl.org (Postfix) with ESMTPS id 0CC292E016 for ; Tue, 15 Nov 2016 17:13:44 +0000 (UTC) Received: by mail-wm0-f67.google.com with SMTP id u144so2053420wmu.0 for ; Tue, 15 Nov 2016 09:13:43 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=kPdFJAYDfIrNw47kBbt/m3bJXgKUmKJmABPQDN626oo=; b=Ss62XydilJTj1F9PQL03FIQZSBVSHBVlNBmdB+Y307D0VRa10fgSnuo2Kltp+lv35+ JKw7g1Vv3dba0zEXIotpIu78GwZSW65xvgQd5R6RGQPkX0M+FX2nwZ3p2tZ5m2EhaEpt IRqC5iiqLVkHH/fVC5qcIkP3eg42n8sZUycoUtrPGIck/JzbzmKH+DsmjpRtcwszIZ1e Ww0CTRA0VKTDx/dd+fC7Br1SWPvdy73nfCzATUPlNtbSj9L4auyofttmEQvkDGSpsREu UiIJ0l4mmBeoCgPKF0nTE1/py5xwFPfAf1pWw/XWe03HmLW665bYOsX7YRcApym89aYo DJtA== X-Gm-Message-State: ABUngvdISAchFOje/3Ix0mukg2r/BpbYislG3N0dABJQeAIWpQ65riGSDQqb/7BWf3GbOA== X-Received: by 10.194.39.7 with SMTP id l7mr23610747wjk.182.1479230022533; Tue, 15 Nov 2016 09:13:42 -0800 (PST) Received: from mic341-linux.sinters-int.fr ([195.200.174.78]) by smtp.gmail.com with ESMTPSA id jx8sm35711025wjc.2.2016.11.15.09.13.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Nov 2016 09:13:41 -0800 (PST) From: Julien Corjon To: Buildroot , Andreas Naumann , Alexey Brodkin Date: Tue, 15 Nov 2016 18:13:07 +0100 Message-Id: <20161115171307.7499-8-corjon.j@ecagroup.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20161115171307.7499-1-corjon.j@ecagroup.com> References: <20161115171307.7499-1-corjon.j@ecagroup.com> In-Reply-To: <1478601048-21388-1-git-send-email-anaumann@ultratronik.de> References: <1478601048-21388-1-git-send-email-anaumann@ultratronik.de> Cc: ECA SINTERS software , Peter Seiderer Subject: [Buildroot] [Rejected v2 7/7] quickcontrols1/2: enable for software renderer 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" Signed-off-by: Andreas Naumann Signed-off-by: Julien Corjon --- package/qt5/qt5quickcontrols/Config.in | 3 +-- package/qt5/qt5quickcontrols/qt5quickcontrols.mk | 5 ++++- package/qt5/qt5quickcontrols2/Config.in | 3 +-- package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk | 8 +++++--- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/package/qt5/qt5quickcontrols/Config.in b/package/qt5/qt5quickcontrols/Config.in index 0fe8465..d013491 100644 --- a/package/qt5/qt5quickcontrols/Config.in +++ b/package/qt5/qt5quickcontrols/Config.in @@ -2,7 +2,6 @@ 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_JSCORE_AVAILABLE help Qt is a cross-platform application and UI framework for @@ -12,6 +11,6 @@ config BR2_PACKAGE_QT5QUICKCONTROLS http://qt.io -comment "qt5quickcontrols needs an OpenGL-capable backend" +comment "Some qt5quickcontrol elements needs an OpenGL-capable backend" depends on !BR2_PACKAGE_QT5_GL_AVAILABLE depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk index b33ff15..c2946bc 100644 --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk @@ -31,7 +31,10 @@ define QT5QUICKCONTROLS_INSTALL_STAGING_CMDS endef define QT5QUICKCONTROLS_INSTALL_TARGET_CMDS - cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick $(TARGET_DIR)/usr/qml + cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Controls $(TARGET_DIR)/usr/qml/QtQuick + cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Dialogs $(TARGET_DIR)/usr/qml/QtQuick + cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Extras $(TARGET_DIR)/usr/qml/QtQuick + cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/PrivateWidgets $(TARGET_DIR)/usr/qml/QtQuick endef $(eval $(generic-package)) diff --git a/package/qt5/qt5quickcontrols2/Config.in b/package/qt5/qt5quickcontrols2/Config.in index 1e57674..e7271f2 100644 --- a/package/qt5/qt5quickcontrols2/Config.in +++ b/package/qt5/qt5quickcontrols2/Config.in @@ -2,7 +2,6 @@ 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_JSCORE_AVAILABLE # qt5declarative/quick help Qt is a cross-platform application and UI framework for @@ -12,6 +11,6 @@ config BR2_PACKAGE_QT5QUICKCONTROLS2 http://qt.io -comment "qt5quickcontrols2 needs an OpenGL-capable backend" +comment "Some qt5quickcontrols2 elements need an OpenGL-capable backend" depends on !BR2_PACKAGE_QT5_GL_AVAILABLE depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk index a5ad3f6..1a2949c 100644 --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk @@ -31,10 +31,12 @@ define QT5QUICKCONTROLS2_INSTALL_STAGING_CMDS endef 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 + 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/templates $(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 endef $(eval $(generic-package))