From patchwork Tue May 14 07:18:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Rosca X-Patchwork-Id: 1099289 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="smFHRlVl"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4538FT6d3Rz9sCJ for ; Tue, 14 May 2019 17:19:23 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 67CE6230BD; Tue, 14 May 2019 07:19:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KSJz82L25yi3; Tue, 14 May 2019 07:19:19 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 68E442318D; Tue, 14 May 2019 07:19:19 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id B19DA1BF424 for ; Tue, 14 May 2019 07:19:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id ACC4081437 for ; Tue, 14 May 2019 07:19: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 qyYZLChDNcKT for ; Tue, 14 May 2019 07:19:15 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by whitealder.osuosl.org (Postfix) with ESMTPS id 49B0481402 for ; Tue, 14 May 2019 07:19:15 +0000 (UTC) Received: by mail-wm1-f51.google.com with SMTP id f204so1632090wme.0 for ; Tue, 14 May 2019 00:19:15 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=IAWY8kt5qW6AHTqUsOzqYeN2hxE6L5CpmNVjc81grBw=; b=smFHRlVl4XOAEUv0t6gS/0Fds0eHZvu3BslO+mi5EZOAh7FELg4ORGz+8/nKQi1/+Q +Md1aZjFhleUkz5EocybjXYzp76NTyh4+fedxjeWHgnYtc686Majkd+waV8+CJ/SzBWI ttDzrpQTIPuEgLhRS5JfXKlocIwwCpjYOm45L6mnyr3lXoGtkedNoL300rENlVFukiXA YvpQpcEcTZ4bUw7lOQ+sGEhcDMmeAH66GIdyaFRCUG9QJYXZ/fT59Qgku+OtV26ywCuY K+JhbColv6GslVXwLfZWdVid/MOaTaG+Koea14LGqvLAg/nqWTGrEpo6encbzp2Wl5cb HdCg== 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:mime-version:content-transfer-encoding; bh=IAWY8kt5qW6AHTqUsOzqYeN2hxE6L5CpmNVjc81grBw=; b=ZqBFhGpAJE8M/5iHVuRDbGtGxCamxeogBvtiJF2lwfTOxIwCLzo7FP4ql20aEfU/Db ptMWnDStvEkUw/G8SFZOR3gnV42loeKuf3wLEaraqU77Uac0V4Nld+lek5fXD+AOisuI yJZurSnOIueXre8TILTDCh6GM1PvLL98iWdStBjQUiusiptNibonOYT4ffoWzOZVLvCf YZ6SG+B7jd0UbhTUlYmKqsjxxA1jVug1NHv7HlfaE8JOQqig7rDlcE9XVgp71L5DclPw y6OSZbUaXWL5AF4oOMzdwgIxVlWel2noy8Ghf6Oebyz5t7JZdR9HT9/K3qlm8yB2pJoz rVbw== X-Gm-Message-State: APjAAAUDAj2abH9b1ZB3vJHJ1M8hiot6VI26QWOmSidSjdGRVsXTi1IZ DN2uLqAPx51SAeDK4tCt5x+6Ava5 X-Google-Smtp-Source: APXvYqw+gFXB+BnnksWRJtPJpNAmYEIpSM9ZaWRwfIamKA3+Es9XtnpobP+OB4PB3ifTG+18o342tA== X-Received: by 2002:a1c:7606:: with SMTP id r6mr1850352wmc.25.1557818353419; Tue, 14 May 2019 00:19:13 -0700 (PDT) Received: from localhost.localdomain (ip-94-112-103-153.net.upcbroadband.cz. [94.112.103.153]) by smtp.gmail.com with ESMTPSA id q26sm1348497wmq.25.2019.05.14.00.19.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 May 2019 00:19:12 -0700 (PDT) From: David Rosca To: buildroot@buildroot.org Date: Tue, 14 May 2019 09:18:29 +0200 Message-Id: <20190514071830.30037-1-nowrep@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190511150750.5985-1-nowrep@gmail.com> References: <20190511150750.5985-1-nowrep@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2] package/qt5wayland: install compositor QML files X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Rosca Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Fixes using QtWayland.Compositor QML import. Signed-off-by: David Rosca --- Changes v1 -> v2: - move under BR2_PACKAGE_QT5DECLARATIVE_QUICK condition - also handle stable Qt version (5.6) --- package/qt5/qt5wayland/qt5wayland.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/qt5/qt5wayland/qt5wayland.mk b/package/qt5/qt5wayland/qt5wayland.mk index f96e4c2f8f..449640c881 100644 --- a/package/qt5/qt5wayland/qt5wayland.mk +++ b/package/qt5/qt5wayland/qt5wayland.mk @@ -52,6 +52,11 @@ define QT5WAYLAND_INSTALL_COMPOSITOR cp -dpf $(STAGING_DIR)/usr/lib/libQt5Compositor.so* $(TARGET_DIR)/usr/lib endef endif +ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) +define QT5WAYLAND_INSTALL_COMPOSITOR_QMLS + cp -dpfr $(STAGING_DIR)/usr/qml/QtWayland $(TARGET_DIR)/usr/qml/ +endef +endif endif ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) @@ -65,6 +70,7 @@ define QT5WAYLAND_INSTALL_TARGET_CMDS cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/wayland* $(TARGET_DIR)/usr/lib/qt/plugins cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/platforms/libqwayland* $(TARGET_DIR)/usr/lib/qt/plugins/platforms $(QT5WAYLAND_INSTALL_COMPOSITOR) + $(QT5WAYLAND_INSTALL_COMPOSITOR_QMLS) $(QT5WAYLAND_INSTALL_TARGET_EXAMPLES) endef