From patchwork Fri Sep 25 06:42:52 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 4853 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id C869940CA6 for ; Fri, 25 Sep 2026 08:43:11 +0200 (CEST) Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-49e7631c43asf6260135e9.3 for ; Thu, 24 Sep 2026 23:43:11 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1790318591; cv=pass; d=google.com; s=arc-20260327; b=qGbTZKCwCp1FvpfJYZnPRoMOi0aDNqj044MEE8/eXqw2dZElxucK/XHeaVcU4bbB81 axJvBTNjkCjGowkRE3gasES3A9IA/XwmOiSDCNsqahiNTWKcpcpQqPolROyQNsJYzjo2 7X0g5FpxDYz0c8IjtDAO1/9hzZbwF1viipwPqAgAE8sy1xp4Qk0qLb7heC6KNc4EykiP cAzsJKudSDWwY4kSN8nwr7u4kMB8Huu+2jOGagGVMxZHlvDyNEekFUMmmiNxxSyUrTU3 AEXkmfrR7prfQAIgRnIpq18rngcdmrcGLFiw11xLdcsosT/s4QZ2uVfzPKbrWT4pjuLE LPQQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=T3db3BD4/Pg4dE+VOovr/OqO4+ElqoCP9AO5EfU74C8=; fh=yQTBfSea+fT6PascV9gw7PCCgBvhXniWtCmZF+pN7bw=; b=O1LtTmWn4HVcvT5xNS+Ej4ZKtsRigGuYkUEVkliJxA9aT85Cl7E3NliGbosRYDD6vi 1fUDU+ne2sziFrnbgHknhNSFzgLNxNWs7ArFclLEjbKkfGtdNqyQKjwr2r0LtoqCtQRu lDu4iJm2EV9c1WmIbdImnveqpSO59F9RZ0Wcg+fv2CFVEf9t5+5O44mAjzOiwf0AGtIU qcO5TcDvuyWCIe0zmcKWszoY240NdVjm0UZRJFfqxVi6HgLpKjvo9/4UtHIV305CCcHW AGQhzCGCH8MrlnwTxR4fYYVEtG6QVqYo5Jq09EVDRLV+v9KNHaRewyieNOZcelkI2jLS jPgw==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=INO3qbC3; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=neutral header.i=@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1790318591; x=1790923391; darn=patchwork.amarulasolutions.com; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:content-type :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to:content-type; bh=T3db3BD4/Pg4dE+VOovr/OqO4+ElqoCP9AO5EfU74C8=; b=UAbWhY8hU+NVLRYFgw7+NBSVfFpMoOlqHsFAMm46UAGb/3/Gwqh+Q+3HirLMyyjAP5 axRbo0Ev3E2iiYvH+FOzSNOTyJ6i+Z1nBWRBBR2Qfb7b/KNapv2FvhrpKRTljz/n8eR/ 6KmuE5uglh8UDpfmZ6o86zOaf0OFjTamkC0UY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790318591; x=1790923391; h=list-unsubscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :content-type:x-original-authentication-results:x-original-sender :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-gm-gg:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=T3db3BD4/Pg4dE+VOovr/OqO4+ElqoCP9AO5EfU74C8=; b=0BcsbCKryOUHI6wo9ZSljbelK841+Xo8L2kAvovxk5Xq8flc0EIDEKfRcODWKjhAPJ ji7qMFYOTD8OiakaoLRI8XK1gvg9PWpvUrTjrzY38tJP1VGU2P3NDFmf3PEOOCzEX0M0 u862SV/GJN7jLNrpBjsIHijxbR1i/SnLpkxq6qrG0I9NVJZDzljsUTAE34oPB1zvatkr EFbORgSwvQSb7mO5V2mrS/6bjCc+s+5SQiUDGJWINYalfYw0XVtaCZUvjib6MteI4A8i 5LFNsbF2T83YTI+XgVpBlO5clbHqZKqq9idQt7MSkiuKJC/XNDuojQ5bDYby3LzEYytI iBHA== X-Forwarded-Encrypted: i=2; AKwUvBw71bnx0S3lUurD0+57gQQj5AnAprKEZDYFb5L+OP0zSAYXE9NLemn177oW0qPWx/GxrBwfSiJinyKwSDP/@patchwork.amarulasolutions.com X-Gm-Message-State: AFuF++lvVY44ZjKPsUzEPao9Qxz+jCyJ4BYkmir9S2NTyFEIEYfqqZnn TVuKBQ0scF4+evMZvnGRsLUpRObehut4A9537o1jDZzhIEeBjHF0DsR5A2x9bHOnY4aVkMz04E/ VLA== X-Received: by 2002:a05:600d:8482:20b0:49f:c451:b4ab with SMTP id 5b1f17b1804b1-49fe67bc264mr58923715e9.29.1790318591466; Thu, 24 Sep 2026 23:43:11 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com; h="ATskLddWo8/89uTJYhPphG8/hcQcMh6AR2AmfCGjMPGcOl4ilA==" Received: by 2002:a05:600c:4f47:b0:49f:c0e9:8978 with SMTP id 5b1f17b1804b1-49ff23497fels2293735e9.1.-pod-prod-02-eu; Thu, 24 Sep 2026 23:43:10 -0700 (PDT) X-Forwarded-Encrypted: i=2; AKwUvByeOs+KPP4EvWcFPCdOdQ7O4hfLVO6VH0l0FZTIkNF2+MGUxqACx9PCQJcKXOcvNFPmPSGDR4lipr7NxdOw@amarulasolutions.com X-Received: by 2002:a05:600c:3b01:b0:49f:bd3c:bc27 with SMTP id 5b1f17b1804b1-49fe6712096mr80158505e9.34.1790318590014; Thu, 24 Sep 2026 23:43:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1790318590; cv=none; d=google.com; s=arc-20260327; b=i+4LFsJuESW++k0WzYudG8INbNTfreMGKQtcvm88k3KMMpPUnXUG8Hk7FzkhSLeuux cJn43TPdr+bV4d7blMTHLVQgRNJpt+W267Ks053+KTNDx7jpZ1DCx5C/nKTt2YYGVnuc bDFig6hxgPbGz1em+/1qv3Y4NsaiSqtG4Co0GN1pJ/LpRpZUXeqFujOLBjbW1x38W1V0 uylHgxYP/CCt9JPzdQS5vMb3awPQx6xBxp18Sa26MqB5jYtNo/78ka6SNDD3j2U8BvJi h8K7xMJ4zieFvh0lYW2K1LcVfRvpchs0vShpx7IBdQZAvIbt5c1X9UGQUjXOxH0Pvb1T AEfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=20auQNm3uDX8WZ3w7I7my/2cXqw2hZACGqb8ZiB1RLY=; fh=Ds4dPnB064deH2Mc4ityCcQlVe/pOLr+QgZBweeFXjQ=; b=Be/U+CLE62hR533mD06PhHNchWTtpoVj1aLAJSWxJ3pQrqdUHrPGMpsSAwYCuIW/AW frccIr0lVPDywe5gJb+p6SzJtPv7x0hccXWzV5rxC2LRKT4r05yaHynqx/LnxXlRxF6t x/dWyUDxCG2sUPPg5QA6+qKvZMioIA7n1gL9GyvUVgkf3xMEk7b3N480KtNnbcnTPfVh 8/AYvcAFWHAV6eCCcwwtAtUT3ROmwiEGkXFl3MtqKOpGEvlUol+OprvKnQ2a7IrfsLGo ew1OT1O4sarFWFvH/b7l3f7wuQdXopGkHNk59b6O8g+SY5X8V3VuytMyCP4rOiy1XUYe /HAQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=INO3qbC3; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=neutral header.i=@amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id 5b1f17b1804b1-49feff4bdb1sor2333875e9.0.2026.09.24.23.43.09 for (Google Transport Security); Thu, 24 Sep 2026 23:43:10 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Forwarded-Encrypted: i=1; AKwUvBy2xopDIpv6NBICQf5BuqPH22NAbwZzZsgycdCS1ldXTmjw9eraKNld1I11b6zPsaNfDcj6MwimqWO+6riD@amarulasolutions.com X-Gm-Gg: AYBFou0xkneRHAmQmmKgzAkA9rYPh6ScOxOul1nwqOhSsw4mPZp4k7olb8q/IVeWVbX 8BpRqxT6mE29UIwCBFQU1eqbBJrNG9BZ8KdR0ZL6mB0L7yoQIFZaqnGH1Nlow7rrmf4MHloeGK5 Q3f+HkkBSJoMiZ9ZL5eevrZSAoG0aP+Hdm5+GsDhK7iBhnTpgSC0wvj2IDKqO296VL0IkU8YTN0 ysjwrFPZJtsHmsOwWnHNyaDnQE/oElpNLEqYZNxz9veBTBo/k/Vo+20pHCZx3L8+9jU0Pgok1h7 7uvgO6XTQhdAigT/Xv9FwrXv1mmlgzuTBs+bc8QLSoiWmUIj4QP81zmKNdjpij+0EMkKJnrzuio H1LilTl/8vkFmjXE06cFQ1F6eqii6OTuuiKNmju7US8cnZcXdJEw3QuIXITgVySlKdpBjgiPjdM ySmwiOudTIhmhd233hK96axf4BHJFZShpe3eZtjeoVChumNLaOR7leux47sEJV+RTanNHMdjfID +AKEmRBFaKiBXznvawByvYxfug1m7Ukru7SkZlxs8dwW9vKDNVeyE+TENaWHrmmTyW9Jmx2Zy13 zFFo8xs/DwSbhZui9XH5Hw83K1RzFnnShPt/QaHg+kR1F04CY1tpfcWpDGFh4K8DEbNZRIDm X-Received: by 2002:a05:600c:3556:b0:49f:bd3c:bc24 with SMTP id 5b1f17b1804b1-49fe6708a46mr80091765e9.31.1790318589574; Thu, 24 Sep 2026 23:43:09 -0700 (PDT) Received: from dario-ThinkPad-P14s-Gen-5.homenet.telecomitalia.it (host-79-14-29-58.business.telecomitalia.it. [79.14.29.58]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49fe5df44f9sm115584445e9.11.2026.09.24.23.43.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Sep 2026 23:43:08 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: Andrea Ricchi , Andreas Naumann , Angelo Compagnucci , Jesse Van Gavere , Roy Kollen Svendsen , linux-amarula@amarulasolutions.com, Thomas Petazzoni , Richard GENOUD , Angelo Compagnucci , Dario Binacchi Subject: [PATCH v6 1/6] package/qt6: Add qmake functionality Date: Fri, 25 Sep 2026 08:42:52 +0200 Message-ID: <20260925064257.1162394-2-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260925064257.1162394-1-dario.binacchi@amarulasolutions.com> References: <20260925064257.1162394-1-dario.binacchi@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=INO3qbC3; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=neutral header.i=@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Jesse Van Gavere The qmake functionality had been missing due to the new host/target build requirement, to get it working the main parts of the qt5 qmake has been kept, we're still making our own device spec which we use to run qmake with along with passing some additional device options for our flags/cross-compiler. A big thanks to Angelo Compagnucci for the encouragement and testing. Signed-off-by: Jesse Van Gavere Tested-by: Angelo Compagnucci Tested-by: Richard GENOUD [dario: fix HostData and add the target install dirs in qt.conf.in, quote QT_QMAKE_DEVICE_OPTIONS, use TARGET_CFLAGS/TARGET_CXXFLAGS, change the commit message] Signed-off-by: Dario Binacchi --- Changes v5 -> v6: - Rebase on qt6 6.11.2 Changes v4 -> v5: - Add ArchData, LibraryExecutables, Plugins and QmlImports to qt.conf.in - Quote QT_QMAKE_DEVICE_OPTIONS - Use TARGET_CFLAGS/TARGET_CXXFLAGS - Drop the redundant mkdir in QT6BASE_MAKE_BR_SPEC - Add Tested-by of Richard Genoud Changes v3 -> v4: - Drop QT6_QT_CONF_FIXUP - Drop -@EGLFS_DEVICE@ - Update the commit message Changes v2 -> v3: - Drop package/qt6/qt6base/qt6base.mk.save package/qt6/qt6.mk | 12 ++++++++++ package/qt6/qt6base/qmake.conf | 34 +++++++++++++++++++++++++++++ package/qt6/qt6base/qplatformdefs.h | 1 + package/qt6/qt6base/qt.conf.in | 11 ++++++++++ package/qt6/qt6base/qt6base.mk | 14 ++++++++++++ 5 files changed, 72 insertions(+) create mode 100644 package/qt6/qt6base/qmake.conf create mode 100644 package/qt6/qt6base/qplatformdefs.h create mode 100644 package/qt6/qt6base/qt.conf.in diff --git a/package/qt6/qt6.mk b/package/qt6/qt6.mk index cff9f5fbc73f..13482c33cc4a 100644 --- a/package/qt6/qt6.mk +++ b/package/qt6/qt6.mk @@ -12,3 +12,15 @@ QT6_SITE = https://download.qt.io/archive/qt/$(QT6_VERSION_MAJOR)/$(QT6_VERSION) QT6_GIT = git://code.qt.io include $(sort $(wildcard package/qt6/*/*.mk)) + +# The file "qt.conf" can be used to override the hard-coded paths that are +# compiled into the Qt library. We need it to make "qmake" relocatable and +# tweak the per-package install paths +define QT6_INSTALL_QT_CONF + rm -f $(HOST_DIR)/bin/qt.conf + sed -e "s|@@HOST_DIR@@|$(HOST_DIR)|" -e "s|@@STAGING_DIR@@|$(STAGING_DIR)|" \ + $(QT6BASE_PKGDIR)/qt.conf.in > $(HOST_DIR)/bin/qt.conf +endef + +# Variable for other Qt applications to use +QT6_QMAKE = $(HOST_DIR)/bin/qmake -spec devices/linux-buildroot-g++ diff --git a/package/qt6/qt6base/qmake.conf b/package/qt6/qt6base/qmake.conf new file mode 100644 index 000000000000..e0d53d755d41 --- /dev/null +++ b/package/qt6/qt6base/qmake.conf @@ -0,0 +1,34 @@ +# Qt6 has a mechanism to support "device" profiles, so that people can +# specify the compiler, compiler flags and so on for a specific device. + +# We leverage this mechanism in the Buildroot packaging of qt6 to +# simplify cross-compilation: we have our own "device" definition, which +# allows us to easily pass the cross-compiler paths and flags from our +# qt6.mk. + +include(../common/linux_device_pre.conf) + +# modifications to g++-unix.conf +QMAKE_CC = $${CROSS_COMPILE}gcc +QMAKE_CXX = $${CROSS_COMPILE}g++ +QMAKE_LINK = $${CROSS_COMPILE}g++ + +# modifications to gcc-base.conf +QMAKE_CFLAGS += $${BR_COMPILER_CFLAGS} +QMAKE_CXXFLAGS += $${BR_COMPILER_CXXFLAGS} +# Remove all optimisation flags, we really only want our own. +QMAKE_CFLAGS_OPTIMIZE = +QMAKE_CFLAGS_OPTIMIZE_DEBUG = +QMAKE_CFLAGS_OPTIMIZE_FULL = +QMAKE_CFLAGS_OPTIMIZE_SIZE = +QMAKE_CFLAGS_DEBUG = +QMAKE_CXXFLAGS_DEBUG = +QMAKE_CFLAGS_RELEASE = +QMAKE_CXXFLAGS_RELEASE = +CONFIG += nostrip + +QMAKE_LIBS += -lrt -lpthread -ldl +QMAKE_CFLAGS_ISYSTEM = + +include(../common/linux_device_post.conf) +load(qt_config) diff --git a/package/qt6/qt6base/qplatformdefs.h b/package/qt6/qt6base/qplatformdefs.h new file mode 100644 index 000000000000..99e9a2792329 --- /dev/null +++ b/package/qt6/qt6base/qplatformdefs.h @@ -0,0 +1 @@ +#include "../../linux-g++/qplatformdefs.h" diff --git a/package/qt6/qt6base/qt.conf.in b/package/qt6/qt6base/qt.conf.in new file mode 100644 index 000000000000..d1d2d9490fbb --- /dev/null +++ b/package/qt6/qt6base/qt.conf.in @@ -0,0 +1,11 @@ +[Paths] +Prefix=/usr +HostPrefix=@@HOST_DIR@@ +HostData=@@STAGING_DIR@@/usr +Sysroot=@@STAGING_DIR@@ +SysrootifyPrefix=true +TargetSpec=devices/linux-buildroot-g++ +ArchData=/usr/lib/qt6 +LibraryExecutables=/usr/lib/qt6/libexec +Plugins=/usr/lib/qt6/plugins +QmlImports=/usr/lib/qt6/qml diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 01661b7f01d4..032947417259 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -436,5 +436,19 @@ define QT6BASE_RM_SBOMS endef QT6BASE_TARGET_FINALIZE_HOOKS += QT6BASE_RM_SBOMS +define QT6BASE_MAKE_BR_SPEC + $(INSTALL) -m 0644 -D $(QT6BASE_PKGDIR)/qmake.conf \ + $(@D)/mkspecs/devices/linux-buildroot-g++/qmake.conf + $(INSTALL) -m 0644 -D $(QT6BASE_PKGDIR)/qplatformdefs.h \ + $(@D)/mkspecs/devices/linux-buildroot-g++/qplatformdefs.h +endef + +QT6BASE_CONF_OPTS += \ + -DQT_QMAKE_DEVICE_OPTIONS="CROSS_COMPILE=$(TARGET_CROSS);BR_COMPILER_CFLAGS=$(TARGET_CFLAGS);BR_COMPILER_CXXFLAGS=$(TARGET_CXXFLAGS)" + +QT6BASE_PRE_CONFIGURE_HOOKS += QT6BASE_MAKE_BR_SPEC + +QT6BASE_POST_INSTALL_STAGING_HOOKS += QT6_INSTALL_QT_CONF + $(eval $(cmake-package)) $(eval $(host-cmake-package)) From patchwork Fri Sep 25 06:42:53 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 4854 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id AF4F23F9EB for ; Fri, 25 Sep 2026 08:43:13 +0200 (CEST) Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-4843227cfcfsf1117239f8f.1 for ; Thu, 24 Sep 2026 23:43:13 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1790318593; cv=pass; d=google.com; s=arc-20260327; b=hA4accMMGal1rGoq1+p1FhW82jbpiOaXkz8H2Bk55JH+z7cZAHfWcRCVklVPxPUmAc f6E/NrhbIvPg9fPwhFi3pPy58HJ49343KlwfmHTHT+TXIDC0YO/K9JTLgWQCAmLezF8j 4+npcwIdoWLmXGoWTvNgkLUZxdhtXFXR+4DM8C44qGviwJtba6NiyFrxMXpJcnR36YSX YcJTAP8ddG0KbL3hV2XPGuEUKUUqAnu5yHy0KM/WxWC6QEoQuy6Kv+QUCtAxpt9oK44j shDu+qsmGPApZ6pUmeCz7WDfLwRHZP+wofz5IUq3fTva9JYVXJ3jb1W90HxkthZtZG7U 1qcQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=1Kymjfpw7Ov9Irme+BLzLaet00J0pwuwrs2uJPc9Wcw=; fh=RwjDS+9A8fZTdv5JdEkP38Z+Xxkae84gQcngZPTAL3w=; b=QNinVZXTRAaRefTdsTODDkuOm1PhkwGSDnQYqqukcRJNr7b30A7K4IlcOziirk8BOw bZXyokz43mIecQ5DWhyuney435SI26CjEZv+aSFzm19T5nPzjmeGOXU3x46z5buVkV0q rk7yh8LChyXgxSbqhZ8eg1WD2VH5Wd98slpT+mTc9XD/bpgmCvg9Y1hGdSz7qUazi20w kOuwmV8Glxc6IbuDFCVwQjHmEQV9yM9BhnB3obVxNJp0V1VnOu/qpjCIoXYB7du0vEdx cOP4V8l7xiWIwiPLzJQOT7v0IMDqPOR5qblxeXDPkvVITLLgHRx0unY/KODoQvh7T0+N NoBA==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=HmD37S20; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=neutral header.i=@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1790318593; x=1790923393; darn=patchwork.amarulasolutions.com; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:content-type :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to:content-type; bh=1Kymjfpw7Ov9Irme+BLzLaet00J0pwuwrs2uJPc9Wcw=; b=UGZGPv2dQ3DKIsVtGD8JDxEOTMvzUE8JYLhgByCET5o2bqsKq8QPVdST6phxGR8a5H bPZvS+DKHvb5u6EI8CfCHVW6GuuKoLYuhh2banRgmbmuAu7o9zVkrvLuOQcSSX133BJh VBuVa8r1NP0ZCuQAnL7MLbdG1JCqvf0/Jiksg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790318593; x=1790923393; h=list-unsubscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :content-type:x-original-authentication-results:x-original-sender :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-gm-gg:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=1Kymjfpw7Ov9Irme+BLzLaet00J0pwuwrs2uJPc9Wcw=; b=dcviZwlj8VGWFBHzjpUFmVaN9SlYyXPYYmmNgxoVEtWL2ocyrVCl5LLlysJvr8Bfkb aEv9IT56Ko2MB/UeLP0DKs3v+DgKp7/jSaVzwaE/BYju5gindtggesrj2Y1CgddwHm6R 3EFavzBekb2Tdwcdx9h60AlJ6CV2n/0zD0k0OeWBgN8VRmvwdOVXDyLec7WvWG9TdmdF v8LyzvOIJzoSOYDlMUo8dK852SjtTc9GTTFnB5yjWAtZCcCGTmscTtVk/kmYqcVBQPPQ FfB3a/49gNFq3sKhauzFt5fYKwJOHgs+lpJRyV01d02Owa9dK28Ezj5Cj3OVcog8SVRJ pqHg== X-Forwarded-Encrypted: i=2; AKwUvBy/iVMq8fO7/5Poz9VSJcipRLvAd6LVVYNOfc9c9FRSz1aAL6ZBecCnsu/RVvdUBsdg/swb5QjK1ZRfd3rq@patchwork.amarulasolutions.com X-Gm-Message-State: AFuF++mLtvGwue8AxgxEdCEfd224W6stLu+xcxZO9Nb0VVPM0g9bajGw gpZsf+P+NpsfCJl/ywPLWii+Qt++jOabi9igNM2JTwVgp64nJf575iMDcoieN9L3Tx3jTw== X-Received: by 2002:a05:600c:468c:b0:49e:715d:95ca with SMTP id 5b1f17b1804b1-49fe66f9fc1mr82922615e9.13.1790318593267; Thu, 24 Sep 2026 23:43:13 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com; h="ATskLdePVIGGm3TFqcmJYUbGnyZBP+p9y7LfbYMj+LoetY0Wdg==" Received: by 2002:a05:600c:3ba1:b0:49b:91c2:4f0d with SMTP id 5b1f17b1804b1-49fed9ae5c9ls4740075e9.0.-pod-prod-00-eu; Thu, 24 Sep 2026 23:43:11 -0700 (PDT) X-Forwarded-Encrypted: i=2; AKwUvBxyo0UdRWnPi4qfmfLDUmkgmlMEPOIC/2DmD/EeIr/5ojjl22YX69AHrFhr3xkHyfzyMFAu2xwX1dK3Cw4p@amarulasolutions.com X-Received: by 2002:a05:600c:1f83:b0:49b:8f5e:51fb with SMTP id 5b1f17b1804b1-49fe66c8087mr80503815e9.3.1790318591342; Thu, 24 Sep 2026 23:43:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1790318591; cv=none; d=google.com; s=arc-20260327; b=JuKnUzK7vZ9L/tDixOJLrjq9XYNS7QaRwUY1dG76mBs/JmR20Lzd2CW8SB01y91iQE hrijEFQ+xW7fDiTghKiJVXHZD7B31wubUvV9VYBB3MDAHNKqs9TiE45ynVHhxs3A2ktw nxYcFwbA1EZwD/5Eff6/S6Da5b/8KyUtTLxpI8Izyfq8HrRtbmfa0pem5bSZYhvC0TLi VcMyHfOUK/B5uq1SSxqVLu1JLffMYUZPqMS7WBKatm8bqj3TkX0qw87hcuzEJayIwiSN x/DAlojy6X/bHLf0UNpNW3KrIsTu2Ap2J7MnMif4gZT68rG6Ti9rcfkv0MwA2ikVmhRf 8XEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=Jp+ZPtL10f0BmZfyFXm00nuL/Dv9t1vkiyoYVe7vzmo=; fh=/yuKwm11ZuAkjSdGtbInvP26Xry7ttg0dnQPxqmD19s=; b=FiCFGN4Um4261dybOYfIRN3Nd3REFxIYver5g3g9JZ6cDTW9uLX+Jc+9u0epIT0Raw WDbC1CTgNMmPw+y5HMClFoMzeelbIhkSHjIxQ5EkPkAGFQyR5dlzm+DcCRNWEMOeZJN1 sGui4ZCJ9Q1NUDMGLeqxymOR9/uD2U0BEqcYoveuB5T3VIPGxkek7sSvoukbcP8Aq1sc UKhKUkg3nVzbRIA6u8QzRuh5vXyd5MbDCV8QZrejXLciGsJ98FnZloScTcFMgYxoI/Wj SGTd1GuvQ8o8vLKrgST47oTKs7doG1Fn/BOcyfmg+YYHZN9v5CoRUe6rkl6KHrWbQvAY nOZg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=HmD37S20; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=neutral header.i=@amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id 5b1f17b1804b1-49fe6693f3csor5786475e9.3.2026.09.24.23.43.11 for (Google Transport Security); Thu, 24 Sep 2026 23:43:11 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Forwarded-Encrypted: i=1; AKwUvBw5uklmqg+ngiPV6ali8heAJpe1EZJWWYDeP47y6IA5iUOi9AeRp8O/vG8CfTisFvbIotRIKsjpVUHSyeqh@amarulasolutions.com X-Gm-Gg: AYBFou3AEUtWVBienf79OQsNeO3suknHZyrGJGCIxwNz5iKd+7teh4iKl+DWY2yD1PV psmmrVNzycWtlzdVeIKhjHuYXOClHRjsG501xxjmXjkj9bKIFd4RBEvMeuo1NGtBw0KwzeXcr4o 8xf1iospbWeDa++7HvLLU2qWwLkLvA7u/VVuSBJK45KdqZamadZxpwMuUqUDWKKU+vCIiny14hB 5jEznnDkbeTW1roElWkuulQ2dYjgVl+QUy6WoqHWnOx8vajDMqRIfcKihJgzCTDGsnK33HHvSWu arKwZMiQl3C1wAv8zBgpsNSPpTaBtGuEArydBxDpeOtVjnxk2B5BPWfnuqckwOOv9GWfbKY2Fv3 Wx9NuDNpf8D98rqoZovy/PpacxFhhHQfHBR7sT6bQ+qoucaUB4R7qEAYxESylA1mwJvZBYu+HKo Q4uQTkYLfOL1PqGUjVuYNC9p5hLsCMP4yt2YfamJE5Ttbc8NqxHLR/AE8GxGlZm9ifoqkbqzKP/ 24kFp/I+ERdUQHKlf/U0Gjy8UoIxjdSxMmtEp2uVZLCFrL1TV8U7rn1xzNOMKbtTnXNApS9Z+DO D7eBcd0nsdqrjuYpLAdSvcNyBccZAwVBU1orxo2Ls5MyVVlOZ/G3ie8VD3YAfqvyw2Xr1zU= X-Received: by 2002:a05:600c:1d04:b0:49e:63cc:6324 with SMTP id 5b1f17b1804b1-49fe66d0606mr79707745e9.6.1790318590987; Thu, 24 Sep 2026 23:43:10 -0700 (PDT) Received: from dario-ThinkPad-P14s-Gen-5.homenet.telecomitalia.it (host-79-14-29-58.business.telecomitalia.it. [79.14.29.58]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49fe5df44f9sm115584445e9.11.2026.09.24.23.43.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Sep 2026 23:43:10 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: Andrea Ricchi , Andreas Naumann , Angelo Compagnucci , Jesse Van Gavere , Roy Kollen Svendsen , linux-amarula@amarulasolutions.com, Thomas Petazzoni , Richard GENOUD , Dario Binacchi Subject: [PATCH v6 2/6] package/qt6: add QT6_QT_CONF_FIXUP hook Date: Fri, 25 Sep 2026 08:42:53 +0200 Message-ID: <20260925064257.1162394-3-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260925064257.1162394-1-dario.binacchi@amarulasolutions.com> References: <20260925064257.1162394-1-dario.binacchi@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=HmD37S20; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=neutral header.i=@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , With per-package directories, qt.conf is generated at qt6base install time and holds the paths of the qt6base per-package host directory. Add a hook to regenerate it with the paths of the package being built, as QT5_QT_CONF_FIXUP does for Qt5. The qmake infrastructure will use it. Signed-off-by: Dario Binacchi --- Added in v5 (it was part of patch 1 up to v3) package/qt6/qt6.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/qt6/qt6.mk b/package/qt6/qt6.mk index 13482c33cc4a..f039ccef30c9 100644 --- a/package/qt6/qt6.mk +++ b/package/qt6/qt6.mk @@ -22,5 +22,11 @@ define QT6_INSTALL_QT_CONF $(QT6BASE_PKGDIR)/qt.conf.in > $(HOST_DIR)/bin/qt.conf endef +ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) +define QT6_QT_CONF_FIXUP + $(QT6_INSTALL_QT_CONF) +endef +endif + # Variable for other Qt applications to use QT6_QMAKE = $(HOST_DIR)/bin/qmake -spec devices/linux-buildroot-g++ From patchwork Fri Sep 25 06:42:54 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 4855 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 089853F9EB for ; Fri, 25 Sep 2026 08:43:15 +0200 (CEST) Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-49ff43a1ecbsf666305e9.1 for ; Thu, 24 Sep 2026 23:43:15 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1790318594; cv=pass; d=google.com; s=arc-20260327; b=GC+106jrTLRGdpF1aP4FqnQoZv9TOIxnMloPUcvAeY4RLpcTotp7bm57reRJyc/j/J 5yn79YV+etOfoY00j2ODb79rHDYEjtfB73P3pXB9PcEKIujVQT6U0My3NkAYy49JfaXW JPyoGTO+yjfaN4MpTEb05xKmdhTIdA+TM8kbjtEPuBWfti5KoWTYSfll/Rg8UUC1kxn6 HFS53wFw7WyQsxlf+3bDN9efx8lHL6Ul0uYi4YA2DMz7MbiZG3uvAZ0LQW/MjTwq1Udn i5+io87mjuoneljCzrwMiGWNqMmU6DDnzx9P45l2pUv6SLkbHRlqNTJ1rTkBlb+HDp1G vkoQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=h5nq3UMTXnWRHARrfE+uR39yifP9DZyZoRlbMg/lKXM=; fh=FP07k5uf9qmIfFnPWF/NMcyfEiwvYvC1iqZbxCEWK8k=; b=pcQk1FTfOTIPGpIe31gi9p5gHS/RiWIfNEIjWCspgbGVVIGMRGk04FJG2KP+oaOedY buc5SGn+7Vng2um7L93SSJrJb1f5zNHkhx15fg7BuHJwpdqBgybkDO+n2Wckmn7Ufokv n+KEAJyyYIg0R4O6UImq/1yFwUdIOiavEfgMrFnCS16Y4Y+a9Uz6xlRLrHEcD0mHfgX+ BTd5B2GZFfEpo2NwWrwmFAZ1zI0Z6orb2aU8zmN+tkFLFsR2/8uP2jOgifNzo4pQLlZ+ HfAoBRqku6jUvPA3epIkFffbwosWjGZX3UbfQP9/45YVXqZ2nZHMaIPMecd97+wkDbXo 5olQ==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=LGlaiA+6; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=neutral header.i=@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1790318594; x=1790923394; darn=patchwork.amarulasolutions.com; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:content-type :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to:content-type; bh=h5nq3UMTXnWRHARrfE+uR39yifP9DZyZoRlbMg/lKXM=; b=rT/ml/Dh5mZaybp1Fe5ItMC+I2hI2MSW9vo3JvL1ib0KhE4gu0jy7q3l1B+ldU27UF a0ba2QyaNZnO92f6GEN4SC8tZ+HRkFqZpsUx/SAbm/wmmjPkJtI1WTxkoyuluFYNcrJ1 5EEE0FM0HvvMq1Wz8oyvXQLfAOav3ABMf44Lg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790318594; x=1790923394; h=list-unsubscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :content-type:x-original-authentication-results:x-original-sender :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-gm-gg:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=h5nq3UMTXnWRHARrfE+uR39yifP9DZyZoRlbMg/lKXM=; b=25OKl9ZA/cl2NT5kMX1CJ19uHDAVP6shgyctvy8uiJkOmjZy2qCaUppj+5mt64Vrus JmNq1QuXzNrTXvUVHcdrH3Ph7AkrvfhPsVFRiH9Ebnqk9ZuXto4hQ95vB9UQ/uZZ/fPj EqTWXIEe2tpmZW55bQdAz4IMTIonUmqC8aRzvJTOlVeHXwxi2YV/EOnjWIybVuF7656G PAKsT60Z997synpzlf2fytvJdGkarYnv/nuT1Z5pJctCTom8f55utFLVF+X80ZAFDwy2 NG8vjjD89vVxk7jJYCTTaEUNAUxr3a2dfmZ7+eVZoquvlIpSVJVzHuOP37uYQ+GkIF/N z8NQ== X-Forwarded-Encrypted: i=2; AKwUvBwsYvZncH1LH4Sa5X69blc0UI0knrvrAibFXaCtQF0tAh1D7iKfexWveRamOaTW62Ap5CYi5K/78A5fX9i+@patchwork.amarulasolutions.com X-Gm-Message-State: AFuF++nU/c2CPJU1b3N1W2Hrp3n6A7dtbcKsskjC1sqDrcBDexcN/3gc v+LqE+EZQ2SH4tmmJckmJdrvVlhdNMu/XWivMn3Nw8DK8Pyxw4pVE+120z6F7BSQVQa11g== X-Received: by 2002:a05:600c:630c:b0:49c:ffde:45ff with SMTP id 5b1f17b1804b1-49fe66eb254mr77409835e9.17.1790318594533; Thu, 24 Sep 2026 23:43:14 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com; h="ATskLdc+JfiaopTjj6S1cBQ9rLhqWJK9n3Q3DLqWVSk4YgACBw==" Received: by 2002:a05:600c:4f51:b0:499:8364:19be with SMTP id 5b1f17b1804b1-49fedb50afals6304255e9.2.-pod-prod-04-eu; Thu, 24 Sep 2026 23:43:13 -0700 (PDT) X-Forwarded-Encrypted: i=2; AKwUvByPcPQe14MQIPpz8XQyoT2tbgb5CKLe49ZzUdrOACazmhEtgt1k7YM7B8bkQQ7bgWZBqM55hrPcCs5Ijkij@amarulasolutions.com X-Received: by 2002:a05:600c:4f4d:b0:49c:dadb:18a7 with SMTP id 5b1f17b1804b1-49fe66cbb21mr94872025e9.10.1790318592826; Thu, 24 Sep 2026 23:43:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1790318592; cv=none; d=google.com; s=arc-20260327; b=Pq+FxEHfgNzKci37nImerJ9yrcbHBrj2gpp8+vh5Ltn7rW0BGFg3e6U5gldqyqHs8g n3FPmrWI7j0Bund9ZU6wW41O6OZkPtLU7xyeUzeThwES+HroGgifi5niYc53qeK25jUU 3WB7rhsrl6hUj6p/H2zzV1ctYDzMI+BeSEBGOly2D6F8lPt7IIZgSm8MQnWe9KpAl/tD 7wT8z7JfzzD3DyuBpSRq7byOs8e81/cOa1bgqXQpXpdCGM3/7knTx059P/Taatcd+Knd WBdiMMJux64kr9DzvquZQhLGJ+ZQh+atBWYA6j1sJIMt14rSA0MrXhM/okL1j5yIgLCu nfCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=FsDovDfy8TYBhQEXo3mx+ibnkUcW/VGzrXQogKLrhdw=; fh=2c3x0jvMf7lYGY6Qnh2Gg1ZR3Q21RJXtBPW6/ZvJz/s=; b=dhqZ78AEK/t32pb7iU8CZKpTJ7K338uNHPiPmAE5h4wkLJ5OX+thq11tOwwwVuWHci mcP3IJBprI6Mh9NIrW8UaUr05+pZrHinqVjm6ZJOaFzMw/BJQRUzcwN+sqqL9J49xev/ ZfMTk8lTk5qQCnZi6g33m1DlxCnEafzWvI3FLBVaxriLwNapioTtbwslO9ue1lvOdXAb GWaydB4i6WvXJrbnUe9UPCtEedgNyF2xCyOzpKEK+XJGUjllTMXSjVglWtxV/CMvbZGm TPx/iEiPMhSn5+RSIErmafDd3n+9R66FWDalMBO4TbWG/HQJzWovrw0P7nLEgoiuWMWY ooTg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=LGlaiA+6; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=neutral header.i=@amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id 5b1f17b1804b1-49ff06946b4sor1803005e9.13.2026.09.24.23.43.12 for (Google Transport Security); Thu, 24 Sep 2026 23:43:12 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Forwarded-Encrypted: i=1; AKwUvBzGFCVRDBlG9BRBrAw9kaDMqFuBujYAuWoO2T1cOzuT8Wj/r3oxrehQA4wOnIqP5zfo5QO7fep9i44zGrE4@amarulasolutions.com X-Gm-Gg: AYBFou13ecIusipgrwLGHdDBHrQYgj2s7Um4MtP6wa05mw6CXGp1lB2RvPmjbfkFcUB 4WTpmQRP+YXg/QijozriXwHFYC6s8jquLV+BL0/wFcR1H9kzNiLTFexEPWAJhF7sgunpxvZhMf2 mF0eHRXvQiY9Na4cGNK9sdyjf289bt+TCuvuHDW+vHVkk/0gjVoc2EGG7Ev5xgmIOkc337+bPsZ GsEeTw3z+8rYL5qnKNNERL8s80Uvk6NA4qwe/vW48xfzfvUKK5PAwK7YQ2EKDj80y7OjyDoN67G jJenRqV8QN6HUYq4RTAo4i+T/5/U2l2A1CUKl+5OCvpGnO6kvF+yFAeMDQyhgkWQ2VxejzS+xOl jzC9l45NR+7YyrpRn0OX6TZeqG3IFu9/J6qgCHfaCFvEpDtZDF4rGloiVBt+YYDJow0F5ADGGU+ dAIRtG3/0dD0qTwC73Gt9QO99Y1zop9bLn0RoUK5KXF4WGOJOIWAlVjbcVpvCs7tcsVYjOo+LtI EqAmlj3Uw2o7KvSXtg7ks4zBv8mJdiLY1NuFwBVarTL5E0EEum6+TBLTROZGLAKP7U2kVfYu27a DJC96707lESJnY1dy7WJDLno9IfpNQwmSlotESM7K02gfO5+Ex3yPyhZErWgxnLa9h7nP9O2wnM qcjWd0Q== X-Received: by 2002:a05:600c:4f4f:b0:49e:69f8:e846 with SMTP id 5b1f17b1804b1-49fe66cbb70mr89977005e9.9.1790318592381; Thu, 24 Sep 2026 23:43:12 -0700 (PDT) Received: from dario-ThinkPad-P14s-Gen-5.homenet.telecomitalia.it (host-79-14-29-58.business.telecomitalia.it. [79.14.29.58]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49fe5df44f9sm115584445e9.11.2026.09.24.23.43.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Sep 2026 23:43:11 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: Andrea Ricchi , Andreas Naumann , Angelo Compagnucci , Jesse Van Gavere , Roy Kollen Svendsen , linux-amarula@amarulasolutions.com, Thomas Petazzoni , Richard GENOUD , Dario Binacchi Subject: [PATCH v6 3/6] package/qwt: bump to version 6.3.0 Date: Fri, 25 Sep 2026 08:42:54 +0200 Message-ID: <20260925064257.1162394-4-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260925064257.1162394-1-dario.binacchi@amarulasolutions.com> References: <20260925064257.1162394-1-dario.binacchi@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=LGlaiA+6; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=neutral header.i=@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Release notes: https://sourceforge.net/p/qwt/git/ci/qwt-6.2/tree/CHANGES-6.2 https://sourceforge.net/p/qwt/git/ci/develop/tree/CHANGES-6.3 Signed-off-by: Dario Binacchi --- (no changes since v1) package/qwt/qwt.hash | 8 ++++---- package/qwt/qwt.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/qwt/qwt.hash b/package/qwt/qwt.hash index d4fd210cbd69..e20c9ebadab9 100644 --- a/package/qwt/qwt.hash +++ b/package/qwt/qwt.hash @@ -1,7 +1,7 @@ -# From https://sourceforge.net/projects/qwt/files/qwt/6.1.6 -md5 cc71be5d6c33c2fc19ae8082ccdd3e83 qwt-6.1.6.tar.bz2 -sha1 b1f17a86c9b1b0790a0c0067ef69fb6277efac79 qwt-6.1.6.tar.bz2 +# From https://sourceforge.net/projects/qwt/files/qwt/6.3.0 +md5 06a8f8eb1bc07bedfb1df601804439cb qwt-6.3.0.tar.bz2 +sha1 9180f33f75ff8817f27019c94d10f92de840a5e4 qwt-6.3.0.tar.bz2 # Locally computed -sha256 99460d31c115ee4117b0175d885f47c2c590d784206f09815dc058fbe5ede1f6 qwt-6.1.6.tar.bz2 +sha256 dcb085896c28aaec5518cbc08c0ee2b4e60ada7ac929d82639f6189851a6129a qwt-6.3.0.tar.bz2 sha256 d8737db330e1eeb439962e11654ab7f1aece3561d9415454a8c538643824ede6 COPYING diff --git a/package/qwt/qwt.mk b/package/qwt/qwt.mk index 9f0b78655f6f..67292ee025be 100644 --- a/package/qwt/qwt.mk +++ b/package/qwt/qwt.mk @@ -4,7 +4,7 @@ # ################################################################################ -QWT_VERSION = 6.1.6 +QWT_VERSION = 6.3.0 QWT_SOURCE = qwt-$(QWT_VERSION).tar.bz2 QWT_SITE = http://downloads.sourceforge.net/project/qwt/qwt/$(QWT_VERSION) QWT_INSTALL_STAGING = YES From patchwork Fri Sep 25 06:42:55 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 4856 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 1A41F3F9EB for ; Fri, 25 Sep 2026 08:43:17 +0200 (CEST) Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-49e6422198fsf3818975e9.1 for ; Thu, 24 Sep 2026 23:43:17 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1790318596; cv=pass; d=google.com; s=arc-20260327; b=M5GEqNSS45L2DfcOuQ2LreuL/MW7hAKJO71AIPdHldnnYoxfnvzyB4rKUq9+BYIr4m 6vGA0HkbkFMhXNqLuAeb0CcdoeXIBvzrs7aSUI8Id/YlN18HwclxkBjDL/5YxhXOw2Ue 2geWMtBlgjDSDD3Tc6+3xCV2ySqXCci0xCqP8M9vb6WnQiJ3cTbEmOFByFZLp2YjPvH6 0/BJWFyLqbaNo7qDvmdUdPy5b7vv6MbFgN712pTrKlfhMy8aiQwiPvr+oo8PEx6kVobw ErKA2+WaIyJ3+cTrd3bDwzIzZeUbcrtei7eW3ZyUDVuXrSDTT02auKbSzsOm1ll2uBbR BYQg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=7RS9WuYl4tN/FgKUuYN8SU/a21bUOdMSKdOolCfvmT8=; fh=9QPjJDMU95SSFVVAxksY5Ms4rDwltfA4XSel1ESqZB0=; b=stlbCfqyTjnVYIX3eE5u152a3j6uVO+R4hRwYIliO8xEf5T90gO7T12ewvDQzCZCYd yv3Arb369euBNTg/HIdyTVAKCig5OV0jZWYVJCrOL36048zZY5jTbCmFc0jShq1GTJKo WuX+OJihWwnb7KHZOWe80KuOKiJHg3I+nCsBrlmKY3iqMSagHbC4kjQecv36E1+fJfX2 2zShV9mXg9ThQYWdpNxsyP8iNL1Vd80oxGFN3e29JBvTZZ4rJ/iqvVzFHxW/JjwmPre6 jF/cASZLohicDJ6xx9ysDCUfLrg5q/zD9ZUbVKQgR2bT1kZx9uj9HH6kgs8gGBuF3FfJ jeNg==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=alI8kjBx; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=neutral header.i=@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1790318596; x=1790923396; darn=patchwork.amarulasolutions.com; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:content-type :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to:content-type; bh=7RS9WuYl4tN/FgKUuYN8SU/a21bUOdMSKdOolCfvmT8=; b=MBdyWZe6d7Y5JsOLcAx0LWbeEIQ7vkI3/3YZ4RJPZZPB/tSYqLTTEW5dtcCioKljNn AsIhtdg15vAM1sUa6wjeeZNIXmz78mmieYWqVCe2jTFYt17tAA2W9//gmUcZIbedN8MP kRd5eU0MBWwjUpyPxl1t41yJDjkwHYuHb7CjU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790318596; x=1790923396; h=list-unsubscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :content-type:x-original-authentication-results:x-original-sender :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-gm-gg:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=7RS9WuYl4tN/FgKUuYN8SU/a21bUOdMSKdOolCfvmT8=; b=K4o9fc8lh5A4O5+SXycLBik13r1aLN52DJILOihGRcZZAMyhLjCGKDBfbwo/MSYZaF WzcFn0piqnPHiJinuKtBQ0qlGSOGxk8w8y9nn7bmLjTkr9sMIx55e1W8JkJyHM9pATJ3 K5Z6xrMxn/4A9dWawFvEjOfh3A5tZrl9AaXbbo1egdN5sZtFVoQ6P02hgFNhKcT5eyku gupk8jcNEsVs+kIqvMmcQbPdPEnkdhNzgFQ9VEVM6b1G0uXhityrl0zhQcXkRyRcf3Tk jQq6rMYEVt2C6qPmvevpFqf08WVkJP6BuA1F2wE5zgHsCXInai0vtSQIv7APFeQtCIUa 4pJA== X-Forwarded-Encrypted: i=2; AKwUvByVMNy9CvZ0wohO3wYjQYiDsfLE0DtfS/BqSjJC6qIhDVEKVKNFLiW4BUfd07d2VQ49Ag2tdNk8VAtkSH3h@patchwork.amarulasolutions.com X-Gm-Message-State: AFuF++nNGamSSPjVwAMY0YiBEGSCFO2Yf4yC5cOE4DGyneUk4HHBSrQ1 tsX/aX8xOfny4QOwYlJDMKsfMRjAuUcKvz83GYd1MIMc74b3nFTewCRfc6/7Syj8srzB5GAaIG3 XIA== X-Received: by 2002:a05:600c:19c7:b0:49f:e546:86e3 with SMTP id 5b1f17b1804b1-49fe670ee79mr80816235e9.35.1790318596554; Thu, 24 Sep 2026 23:43:16 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com; h="ATskLddfDbRgmXnupcTDzV+9wxnHjYb99xGKGAxA0d4CRRpkwA==" Received: by 2002:a05:600c:3b99:b0:495:abbb:e313 with SMTP id 5b1f17b1804b1-49fedb5ea36ls6521405e9.2.-pod-prod-01-eu; Thu, 24 Sep 2026 23:43:15 -0700 (PDT) X-Forwarded-Encrypted: i=2; AKwUvBxEleLSIRqpa9WGvqA4PvBVDJI7LYRzhFrgppMlcaV2V3xsiHpLNwsjkjAeT32WXFYwky//KmqUUV0jzvzu@amarulasolutions.com X-Received: by 2002:a05:600c:348a:b0:49f:ce78:356d with SMTP id 5b1f17b1804b1-49fe6705942mr75247185e9.30.1790318595186; Thu, 24 Sep 2026 23:43:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1790318595; cv=none; d=google.com; s=arc-20260327; b=S4Se3+/yxfgGsHsbEzFw6aT6Tcx/G+G4yKl2lJ5Dqddd969x3sojr7ZdtmoSG/MSU1 HPM0XJc8Z38Reo5v6w8oJOATj99q/YK2G9rvl77tgjYzQ9IQY1HYVe/DxoE04C/PihUY DKVOrNsyDtZGlAtYFIJjHvJ1z3eOaSS0xrt5aRE08mjumMk5W1Y/gFaC+EFJEaVvEjyS ktZkGlXE6w6fhZfrzJcaJ3C7Lio14kgnUHxck6mnv4mN5ZaB41xXOkV7j29hgffkqHsD 7OZ0+noG0hXnR5fBQO+Ee+CKKQRQRf1oVhbx5K+x4mz77W2nslC9/ilGxhU+HJG8rRJF qmUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=NyB/LB17yMC2PyrbWg24mMu9CT5cPQVqGOL3o80HKIg=; fh=89dWqauuavpOMdpCY/mnFjDmJlVgIgchyICnXsVYUdk=; b=dQDGArdpr+04ypQFbfkpx2chVgAPM6y0WDGVGk9SnbJFqDGhWZslf4vPKTkh9R4rX9 s1LmKVBIRknnQ97xz7BY27gppDV4jPXI3bXLjxfHbhfIvS7Jc0kaZkleXNGYG7NGPjQ4 WGpG1mApLP0lfsQtoZVrUI2niel3FRbKXDUv8tqgdp8CYE1Aiaatj94NJGOfOxfUyAtL KYWnsRLbvg5ssgCC+kqXvUYgyOTFNdn9feWaAH6KPOuqFgRRqJFh7eLSdkrOAiSHLneW EQrk/f/ZJ4c9PP6JXQRqKkNNTpzxM8OvgAsN1nC1XUgtfJSyhgD5OH0D6RCLqaSGLArV i3Fw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=alI8kjBx; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=neutral header.i=@amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id 5b1f17b1804b1-49ff06a9b09sor1770545e9.7.2026.09.24.23.43.15 for (Google Transport Security); Thu, 24 Sep 2026 23:43:15 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Forwarded-Encrypted: i=1; AKwUvByI9A6sYMzKQzzpO6lXp5lQo8tFQb8pyNxB1xEJDKSGmLA5jPrtYr2Mc3kqh511GhsEJjitwfyv59iV4Sou@amarulasolutions.com X-Gm-Gg: AYBFou1fh8nyQ60Op9cXL7LeyooBNuen4Ss+tbgR/vd6TI0eZ3KkBGP/NcYQ99wNrxi dJNAnzCmmenyZpPctMeyZDTbnPnOBoQfU9fy12zjesit6CQtTszAyOx7659N0szOJPXPpL1COAk jAaoa+MrxL4fbrhDq+d/KfjkodAi7ZjqFmBQcrvfj/sOELQnn/lLTHnLCXILezVARz96jiHB92I 5PgeHG4NPL/BE/bDH0c0Gua6xderJ2y1b8pnjGgF9lJEKPTpXi8vkQ2inCe4BFS7df/2UwAHR6D 25GEkbwrLkMM4eaSL+iLhyNG8SFavOutBFkVj97E3FXI/TIce2JGZmFxCbVZMd6kei3HEVsgfXH 1ic7CrKqIANO2cr1OJ/4F4INZJGR4yBawx2dOkglibdOEsYvs+CN/rh7I4kMPJMZd84LG43zBEL lNUPPFX0lzEL60ZIe8AcYTsJ8B/QBiee+y1ANHBCChqJ7l32EVfsJ+VTPeq2b4399lBHmswj4wm Gp/yTUn7G+GcYcwSiGKVf4b2oyZBVhRJc9Czi187GxcdoFYNKjf42xtCPxuXZamvD/MD7nW881r TQq3/fle9GaQhotXRVVpqDz6pBTm7b4czlqqtVA7sz41frmr3IhuJU5iIPNZ1bBrSzqN+bY= X-Received: by 2002:a05:600c:4e8b:b0:49f:ce78:356a with SMTP id 5b1f17b1804b1-49fe66fb018mr81759845e9.27.1790318594524; Thu, 24 Sep 2026 23:43:14 -0700 (PDT) Received: from dario-ThinkPad-P14s-Gen-5.homenet.telecomitalia.it (host-79-14-29-58.business.telecomitalia.it. [79.14.29.58]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49fe5df44f9sm115584445e9.11.2026.09.24.23.43.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Sep 2026 23:43:13 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: Andrea Ricchi , Andreas Naumann , Angelo Compagnucci , Jesse Van Gavere , Roy Kollen Svendsen , linux-amarula@amarulasolutions.com, Thomas Petazzoni , Richard GENOUD , Dario Binacchi Subject: [PATCH v6 4/6] package/pkg-qmake: support Qt6 Date: Fri, 25 Sep 2026 08:42:55 +0200 Message-ID: <20260925064257.1162394-5-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260925064257.1162394-1-dario.binacchi@amarulasolutions.com> References: <20260925064257.1162394-1-dario.binacchi@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=alI8kjBx; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=neutral header.i=@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , The qmake infrastructure hardcodes qt5base as the Qt provider. Select the Qt major version from BR2_PACKAGE_QT5, which is mutually exclusive with BR2_PACKAGE_QT6, and use it to pick the qtbase dependency, the QT_QMAKE command and the QT_QT_CONF_FIXUP hook. The header sync hook now takes the version from QT_VERSION_MAJOR and QT_VERSION instead of hardcoding 5.15. Document in the manual which Qt base package is added to the dependencies. Signed-off-by: Dario Binacchi --- Changes v4 -> v5: - Drop the hardcoded Qt versions, only select the major version from BR2_PACKAGE_QT5 - Take the version for the header sync hook from QT_VERSION_MAJOR and QT_VERSION - Document in the manual which Qt base package is added to the dependencies - Update the commit message docs/manual/adding-packages-qmake.adoc | 4 ++++ package/pkg-qmake.mk | 18 +++++++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/docs/manual/adding-packages-qmake.adoc b/docs/manual/adding-packages-qmake.adoc index e09da166b909..1d97556abe79 100644 --- a/docs/manual/adding-packages-qmake.adoc +++ b/docs/manual/adding-packages-qmake.adoc @@ -55,6 +55,10 @@ All the package metadata information variables that exist in the xref:generic-package-reference[generic package infrastructure] also exist in the QMake infrastructure. +The Qt base package the package is built against, +qt5base+ or ++qt6base+, is automatically added to its dependencies, depending on +whether +BR2_PACKAGE_QT5+ or +BR2_PACKAGE_QT6+ is enabled. + A few additional variables, specific to the QMake infrastructure, can also be defined. diff --git a/package/pkg-qmake.mk b/package/pkg-qmake.mk index ccf78692e885..7f73c3087b5f 100644 --- a/package/pkg-qmake.mk +++ b/package/pkg-qmake.mk @@ -20,11 +20,19 @@ # ################################################################################ +# Qt5 and Qt6 are mutually exclusive +ifeq ($(BR2_PACKAGE_QT5),y) +QT_VERSION_MAJOR = 5 +else +QT_VERSION_MAJOR = 6 +endif +QT_BASE = qt$(QT_VERSION_MAJOR)base + # # Hook to sync Qt headers # define QT_HEADERS_SYNC_HOOK - sed -e '/^MODULE_VERSION/s/5\.15\.[3456789]/$(QT5_VERSION)/' -i \ + sed -e '/^MODULE_VERSION/s/$(subst .,\.,$(QT$(QT_VERSION_MAJOR)_VERSION_MAJOR))\.[0-9]*/$(QT$(QT_VERSION_MAJOR)_VERSION)/' -i \ $($(PKG)_BUILDDIR)/.qmake.conf touch $($(PKG)_BUILDDIR)/.git endef @@ -45,15 +53,15 @@ define inner-qmake-package $(2)_INSTALL_STAGING_OPTS ?= install $(2)_INSTALL_TARGET_OPTS ?= $$($(2)_INSTALL_STAGING_OPTS) -ifneq ($(1),qt5base) -$(2)_DEPENDENCIES += qt5base +ifneq ($(1),$(QT_BASE)) +$(2)_DEPENDENCIES += $(QT_BASE) endif ifeq ($$($(2)_SYNC_QT_HEADERS),YES) $(2)_PRE_CONFIGURE_HOOKS += QT_HEADERS_SYNC_HOOK endif -$(2)_POST_PREPARE_HOOKS += QT5_QT_CONF_FIXUP +$(2)_POST_PREPARE_HOOKS += QT$(QT_VERSION_MAJOR)_QT_CONF_FIXUP # # Configure step. Only define it if not already defined by the package @@ -62,7 +70,7 @@ $(2)_POST_PREPARE_HOOKS += QT5_QT_CONF_FIXUP ifndef $(2)_CONFIGURE_CMDS define $(2)_CONFIGURE_CMDS cd $$($(2)_BUILDDIR) && \ - $$(TARGET_MAKE_ENV) $$($(2)_CONF_ENV) $$(QT5_QMAKE) $$($(2)_CONF_OPTS) + $$(TARGET_MAKE_ENV) $$($(2)_CONF_ENV) $$(QT$(QT_VERSION_MAJOR)_QMAKE) $$($(2)_CONF_OPTS) endef endif From patchwork Fri Sep 25 06:42:56 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 4857 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 5769F3F9EB for ; Fri, 25 Sep 2026 08:43:18 +0200 (CEST) Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-4870487e33asf162533f8f.1 for ; Thu, 24 Sep 2026 23:43:18 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1790318598; cv=pass; d=google.com; s=arc-20260327; b=RN5Qzzlz2bQEOxic4LjNspvTPO/wxTyRZa6ckKrSc/zOhoYAQ06dyzZ1ri0UqkMc5o DXIMOunr8ArciQX4yTJnEXyzo40gzZjIlzDh7l9mL6NU6GWw9UabBqTCg3gVO4RFnKgw rlMG0NzikrR6xDXa5i5Z6jfDoD9dR3PXF8P9sTGgnAJ3ha9IRSWTQQLSNrLqaLOfmzuM EUImr2DfFF73Sd1XDFZQ+zL7pcojauxZxatYVP/ybfeVfXxsPwX4SIXf60GKEPQ0K50c 0UGt4a/X8lO8/Sl0ciig22g/YYdf0L62SjoIqTOVhVCyR4TTTtN1djKKQrkKVvJJCiIq cHnA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=2YRX5im0wfrGvWLxt2lS5FjQvbYMLZmXzPKk1DIIW8Y=; fh=EBl0EW9Yvp7+8RtKtik20fzmspk3zwkRPVJW+5yl7TQ=; b=g0FaDOd4LzUEGWi8X9HVM/LmdUpdh+/j8IaP/tHhJCyQcxWrRtAbR13qwgzDlSPss1 2+iSwBmMCDfqoP+esrNN2oZ9ygn9xkAZjIfbNJA2ZHyOjhxwui6kt932kO/0b9+/4Y5L zsbMpep8qLGTN0Oc3M3ZWllDgbSR6+38iQjtOZ/1I04T4xB8M7ZQtqFnJNba/ieZ8rnp aXdUyfmmi3NrWcPtkRs5BZ148BbP5GRQLCHbzMg5qrvcJOsiuBRnYmuXbxqQI+iYrkGc viCQXsPBgTPFywZQAAPF4PbTbzgVLRaCpGccMFDpuBHn5yuDauWqX4+D8WszQWQKGq7Z m8+Q==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=BMXgUQYD; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=neutral header.i=@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1790318598; x=1790923398; darn=patchwork.amarulasolutions.com; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:content-type :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to:content-type; bh=2YRX5im0wfrGvWLxt2lS5FjQvbYMLZmXzPKk1DIIW8Y=; b=B/AIpDAYXzKbGqlhKYLubx1w/VXVv7H1XVz8VA1lRvDnDpfGnVTyWBQT7AiQljkWSA fKqvU8FmD0RZyMgAIQ97g1JZniLkCnMhAkSwfgqUbEUVY571ICuCpiqM0MnKDv/LS/rA A7NTIQCjJX20IceRc2nrVjWWOSLXHR3SMXhWM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790318598; x=1790923398; h=list-unsubscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :content-type:x-original-authentication-results:x-original-sender :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-gm-gg:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=2YRX5im0wfrGvWLxt2lS5FjQvbYMLZmXzPKk1DIIW8Y=; b=2lCT1HICtVIr5zyh3KHGr9aH+bpr2+LXcn71L+4CEAo1wBinbQTCoJ6SkM8BRDEtlg BE5JdFUbjAEXZ+D0r2F1v9M0dWw1LZVi/afuWDgTJ5/paAK/h1fMITFdNfjhpZaZ9lqO JhfVqaOl6zfFy7jsUVdVZonQlga+RFYakYQORERXIJ7kvHiUSisq12e3iNMKg0waDbl8 rvFpbbg2uqgwERhazC9jiPhELrIYwPu1FscbABsOPPkMjTO1N6MwA8TR/ZctKwofUviS luX6w2C7zh6LI1MZW2P7ja4OQ4iZLiBtX1dXAjofGJ/k9EiyLUCquUoHqY/Up62MTbB5 rKvg== X-Forwarded-Encrypted: i=2; AKwUvBy74q6tEt3SphX1heijfvuOpNaXH57xl+finwEq/uqx5rKrPAiDNLs30+Ane7tt4ODHV77XZGey3iipWnHC@patchwork.amarulasolutions.com X-Gm-Message-State: AFuF++kAhh3qXfrRy0SHipGUTsj15xxk+jC8S0E0j+towyaFQrYVxMpv qWn1D0Rmbgnx3cMXldTmKD50SUVJeYhpgNE94M4KTgOlPb/i+N1dJz2NAStFuP0hiGuzgQ== X-Received: by 2002:a5d:5e0d:0:b0:488:7b66:1413 with SMTP id ffacd0b85a97d-4887b66155fmr1951072f8f.39.1790318598012; Thu, 24 Sep 2026 23:43:18 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com; h="ATskLdcxlMCwZnC4jxDLfgJf64Dlkza5NPcSqwcweMUuSCb4eA==" Received: by 2002:a05:6000:18ac:b0:486:fa76:492d with SMTP id ffacd0b85a97d-488795dc7c1ls513700f8f.0.-pod-prod-03-eu; Thu, 24 Sep 2026 23:43:16 -0700 (PDT) X-Forwarded-Encrypted: i=2; AKwUvByHuNTOOPlKz2UUtTRmzQhQz1I00ZcUuq/488JUM9/M+36dIs5AKAlYST0xZpGgAlGOR2UtYaDWtYHpLyJr@amarulasolutions.com X-Received: by 2002:a05:600c:8b26:b0:49c:c0d4:53d9 with SMTP id 5b1f17b1804b1-49fe66d5f50mr90689115e9.14.1790318596256; Thu, 24 Sep 2026 23:43:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1790318596; cv=none; d=google.com; s=arc-20260327; b=ePv9x+lICiXk8ISJ0ZX/+W98CYzERnilceoCndZMJT7CLX0PgVN5I3+53+AWPvGSFD ld1j+Ocy0tYN5Sy1YbsKLZ/a8kz4e80xFFsVxGim7xVqbc6tcyCX3SeFivaB0fPN6gpU Dxp2p+uV/fYfSS/WkQ+jQ387oIqI9pnqLoDhkYuSyN0+6uWSN8Jxtk01Rb3K/aBdrR0+ GTpVwVMzsrqEJB2VIfnKOMMuTmpfxue/M1xkk/BDa8dAsWO28rKA03XXpgBGVl4pIX7H NYak74NfMPRf7avRIlqFRw6Z64ZVT1CRIvmGl1ThMlyT/BxPXuJUGDtzaKZZpTdwUe+b LQDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=O5P5nkyq0hPCVocnpTwOrn9Pkk7unn0FdtvmXk4STK8=; fh=g332I62xY7mDK5eyfxcW1JkCzVcSlkJEeZjD7aWENBw=; b=kqepdaAVFaBw2oWE2dr9YvoDQ54GxGcLDwty9ZFV/O9qcP38bOJRL1kQ8G8d7+WayT W69qFlgcPMsXBogJjZDcZe83gjpxUzM9k7uBrTD2x25EvnjeI5TWPnfwt4Xb50u4HHxo /SSZgXEu+K+INasWc5mG4QqMu++1+7IfMumbxToSS4o6n3ikGloIT9GkZJhRMOuIJ9Jp O1Sn873IH7UcUjcNszvK74HjhBp/YDRRbZkyKxHuNlcz/NR/t1eq/59FZcTIDDx/42/+ N3OZp9e5rDa1BstHcBZs4C/gkZ4ih8O2PMyepXmPBfKtUw4Ve6axG8fZzaCDXmW+8DMj YMAA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=BMXgUQYD; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=neutral header.i=@amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id 5b1f17b1804b1-49ff06cc6aesor1607355e9.19.2026.09.24.23.43.16 for (Google Transport Security); Thu, 24 Sep 2026 23:43:16 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Forwarded-Encrypted: i=1; AKwUvByEOMkG235yHF78FM64ZvsMWBxWUJJ0EOGjQoLFMUEEslT++HtnvSuebUYNXCy83XZuUgqZRKVYv05dLJ+G@amarulasolutions.com X-Gm-Gg: AYBFou1LPXq4r/cO1T1vxGH6JHSF3B3ItTMfB73gJzZdJGmzZUT7h2phVX9uVCZPBO2 g46Bp8p0PgzbDDu6mkFFF0IGg+qiYP6zCZec2gdK5s56Oci57/QYnnno9vz2q1RDVk+u09BfGUi eK9Ke4FiNfbCdggAu982NbA0CFz+HgMgylHi0j5uSgrsjLKM+VQxl+WBHByOx9vCqn+0DhVQNOV sI0ZeT8YMvjZp4JB3S8MnD4ouXOX0bllCGupQfoUFocnI7NkFJYJJMmKeJdD5yKbZkoOcGCiUgV 6d37vfIFd5E8JA96u+XubN3Aplxag24+bFTumo7VLpNNZq/H1jMFlRaKJH2xvZJyNZYylOPQybU NLR4YXNaaJlQauBG+fDCjob5kqqtv2g4I+Fr1BD3Dxyc3AvxwYajLeIgSTbL94OHqzSP8G5PQpu szjtoG/rvQ3gR2Etw5z7kWkCQpUgiCZkM/YHcJGcLXy533Zb8uUwULpqhmJCsHbZ3RGleq3O9tq Wn55Xa1otGiopsxy97ekDfJ4+dHFTKpIAC4wxjp5atl86F3ThAzcuuiK3VReQ5+/kxHim43AyqG N31xby3mMVtH9GRdWtK3dWi9IwKoasLJuoK8hxhcIoNqxQ8WHwclfTaIWHaXQOcyocdvP9w= X-Received: by 2002:a05:600c:83c5:b0:499:bf0e:95c8 with SMTP id 5b1f17b1804b1-49fe66c8623mr78638385e9.1.1790318595912; Thu, 24 Sep 2026 23:43:15 -0700 (PDT) Received: from dario-ThinkPad-P14s-Gen-5.homenet.telecomitalia.it (host-79-14-29-58.business.telecomitalia.it. [79.14.29.58]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49fe5df44f9sm115584445e9.11.2026.09.24.23.43.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Sep 2026 23:43:15 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: Andrea Ricchi , Andreas Naumann , Angelo Compagnucci , Jesse Van Gavere , Roy Kollen Svendsen , linux-amarula@amarulasolutions.com, Thomas Petazzoni , Richard GENOUD , Dario Binacchi Subject: [PATCH v6 5/6] package/qwt: enable build with Qt6 Date: Fri, 25 Sep 2026 08:42:56 +0200 Message-ID: <20260925064257.1162394-6-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260925064257.1162394-1-dario.binacchi@amarulasolutions.com> References: <20260925064257.1162394-1-dario.binacchi@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=BMXgUQYD; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=neutral header.i=@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Version 6.3.0 added support for Qt6, so enable building Qwt with Qt6 as well. Signed-off-by: Dario Binacchi --- Changes v4 -> v5: - OpenGL option depends on BR2_PACKAGE_QT6_GL_SUPPORTS package/qwt/Config.in | 22 ++++++++++++++-------- package/qwt/qwt.mk | 4 ++++ 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/package/qwt/Config.in b/package/qwt/Config.in index 736ccc2a5ea5..7b0e068ad131 100644 --- a/package/qwt/Config.in +++ b/package/qwt/Config.in @@ -1,9 +1,13 @@ config BR2_PACKAGE_QWT bool "qwt" - depends on BR2_PACKAGE_QT5 - select BR2_PACKAGE_QT5BASE_GUI - select BR2_PACKAGE_QT5BASE_WIDGETS # printsupport - select BR2_PACKAGE_QT5BASE_CONCURRENT + depends on BR2_PACKAGE_QT5 || BR2_PACKAGE_QT6 + select BR2_PACKAGE_QT5BASE_GUI if BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT5BASE_WIDGETS if BR2_PACKAGE_QT5 # printsupport + select BR2_PACKAGE_QT5BASE_CONCURRENT if BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT6BASE_GUI if BR2_PACKAGE_QT6 + select BR2_PACKAGE_QT6BASE_WIDGETS if BR2_PACKAGE_QT6 + select BR2_PACKAGE_QT6BASE_PRINTSUPPORT if BR2_PACKAGE_QT6 + select BR2_PACKAGE_QT6BASE_CONCURRENT if BR2_PACKAGE_QT6 help Qwt is a graphics extension to the Qt GUI application framework. It provides a 2D plotting widget and more. @@ -14,15 +18,17 @@ if BR2_PACKAGE_QWT config BR2_PACKAGE_QWT_SVG bool "SVG support" - select BR2_PACKAGE_QT5SVG + select BR2_PACKAGE_QT5SVG if BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT6SVG if BR2_PACKAGE_QT6 config BR2_PACKAGE_QWT_MATHML bool "MathML support" config BR2_PACKAGE_QWT_OPENGL bool "OpenGL support" - depends on BR2_PACKAGE_QT5_GL_AVAILABLE - select BR2_PACKAGE_QT5BASE_OPENGL - select BR2_PACKAGE_QT5BASE_OPENGL_LIB + depends on BR2_PACKAGE_QT5_GL_AVAILABLE || BR2_PACKAGE_QT6_GL_SUPPORTS + select BR2_PACKAGE_QT5BASE_OPENGL if BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT5BASE_OPENGL_LIB if BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT6BASE_OPENGL if BR2_PACKAGE_QT6 endif diff --git a/package/qwt/qwt.mk b/package/qwt/qwt.mk index 67292ee025be..0e835c700e16 100644 --- a/package/qwt/qwt.mk +++ b/package/qwt/qwt.mk @@ -18,8 +18,12 @@ QWT_CONFIG += -e 's%/features%/mkspecs/features%' ifeq ($(BR2_PACKAGE_QWT_SVG),y) QWT_CONFIG += -e 's/^.*QWT_CONFIG.*QwtSvg.*$$/QWT_CONFIG += QwtSvg/' +ifeq ($(BR2_PACKAGE_QT5),y) QWT_DEPENDENCIES += qt5svg else +QWT_DEPENDENCIES += qt6svg +endif +else QWT_CONFIG += -e 's/^.*QWT_CONFIG.*QwtSvg.*$$/\# QWT_CONFIG += QwtSvg/' endif From patchwork Fri Sep 25 06:42:57 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 4858 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id E2C613F9EB for ; Fri, 25 Sep 2026 08:43:21 +0200 (CEST) Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-49e6c17ec1dsf5847325e9.2 for ; Thu, 24 Sep 2026 23:43:21 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1790318601; cv=pass; d=google.com; s=arc-20260327; b=EEUj+/s02qag9m0cZvKuqQRHfsvy/ZWmiv39qSpQKwPCXrbHKODOhkyCgAie7nvmsa ynRZtI7/oC0hRpDl9RlxdV/Dao0MdX/JNWufjSHzexfUOnHAG6mzBUA0a92sGZnP9DSK DQeeA/ASZ47l0ktt+7x5OkHr/5tNBgcMjjJnO6BJA3RHlUYaKm9bOHMUnZAYsKVTPBzB AcJkGMYRP+rr3w+B9M1NCZmAFe79CMQqSBNOmjWUD9xaX0K07yocOS8zxSBqW5nEYaT9 tgSH0iBqjX6edQjuoQ6BVPgMo60IHSwRzMiTWcdtlq1a50emIXFlAR0zxK7EsAA3MTXC GYag== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=ap8kt/ivOmkzCcw6IUI91zPJr7Tjm4tqpa4YSsdWW6M=; fh=DpFHh1OxaMvesaxXLh85Pwp8GApFqSPdUl4he4k45Sc=; b=i8C1QcZJZp8Dsfi+ypNe+2N0nZ+IBYWpNptMgdjq20VNco4Hq6bJOCu5qxhRsnW+IG QjNx3/SwBatgibYnNJwEr2tZSCXqG/t/iNO/pzfROzGKF5UZMFvv6ic0vsYaNaW/rvfd y+e0S4ZXbq1BgAgBsVBU0XKdxVhGoPq1LkGI/u4OEQ4wl/c1+HrOEuVYC/hyvKKJBg8n AeWWbNjWZ86HecBhOQ+fmoMpPRB+THA3oBOdDP5f2TjMz0BViZi/jM2WadlM8nIVFFd3 lE00o+INow49d67b91xHOmYjBLGWNJqTrD3UdI2CdWhsg8CN3ISCwoqwqkCFvGYCCWmP /gQA==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=UM5yTkES; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=neutral header.i=@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1790318601; x=1790923401; darn=patchwork.amarulasolutions.com; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:content-type :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to:content-type; bh=ap8kt/ivOmkzCcw6IUI91zPJr7Tjm4tqpa4YSsdWW6M=; b=MxGMqpp7wqsyFkGdNf6EE4uTPaCJjwME68KMiH5656OFnKWuRdfoRZ0Bfvo5+9eo+z fz4xpvt2uxizTlSHCwO5aF6CnnQE0z01Yu60UdulYgHyEnItc3wWwDZa1Weq0APRBZsV GIcSJPvZTr9Odc89di+atTIQvA6Vv6VjYq4ZM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790318601; x=1790923401; h=list-unsubscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :content-type:x-original-authentication-results:x-original-sender :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-gm-gg:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=ap8kt/ivOmkzCcw6IUI91zPJr7Tjm4tqpa4YSsdWW6M=; b=x+wE0fuaIbD58XtD/zK96nEQKEvgb37EhGJs4h4gYQaiup8kI9BsSAf2JgahW21ajx XuVqELAI8dMTGkmdP/LPf6Efw4B2Rxl+LKkId5r3osBVM355vYaETIkf++OQG87hqTFr AXoMpM7xUeET+wEwVOlPbeeoVa+71fE6DqniaOVdNU/y6MWSoSeMKsdfkHGgFRpm3DFL aW5RPJZTCuwMPd8ITI26oWvRFP5UtsRbX7jXZJfx2Gj9slKmnjV6BwMAu+ItGHFnRBcT B68QxSBVUXM7lqyQHRDE+bGii/F5xiA//zaLX79UveuQ72EjcJEC8KIhzthCi0CQcjB4 UdXg== X-Forwarded-Encrypted: i=2; AKwUvBwwdQsxr0rwk9VTNTsOU7nKhPpwOYa4Y2EaGZma7gyyB8eHwtihbAv/sgm9Rwt0QEhFaNq7sKZxfy5NbZj7@patchwork.amarulasolutions.com X-Gm-Message-State: AFuF++lxSjW0agW+u3G15pmMB7QdKpGkYG1CyQ+FmdzhDMK3CKtMfERf cmMXkfB6Rep0p9sXR9LaCGe7SthKUSC6YXOAAJMnnDCFR9+fNwsPy4Hm8SUAmyK2H0d0Aw== X-Received: by 2002:a05:600c:468c:b0:49f:bd3c:bc19 with SMTP id 5b1f17b1804b1-49fe66f4cabmr77709675e9.20.1790318601583; Thu, 24 Sep 2026 23:43:21 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com; h="ATskLddBdSSAhw7//cCRtD0yNDTbmiMfgw0D04450SZd+L5Y3A==" Received: by 2002:a05:600c:4e91:b0:49f:c717:1c5f with SMTP id 5b1f17b1804b1-49fedb55f54ls5085345e9.2.-pod-prod-02-eu; Thu, 24 Sep 2026 23:43:20 -0700 (PDT) X-Forwarded-Encrypted: i=2; AKwUvBzVWeK0LUPmsi9PirDA5PmbdGY7UvRZ3pAwFLaWLQpgUeZblWZ7VAH7bdNoxGbWRN1zVnH/+2ihAD0Pt2YW@amarulasolutions.com X-Received: by 2002:a05:600c:4e55:b0:49f:bd3c:bc1a with SMTP id 5b1f17b1804b1-49fe66f506fmr79409155e9.21.1790318599957; Thu, 24 Sep 2026 23:43:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1790318599; cv=none; d=google.com; s=arc-20260327; b=iK/xUi5GYa5L2ArUfXnT1R6k3KXEs8X1Z7GIqsR6uXpheYTh3OL5n34hAMOqFn14Rt Eprh4mK3ABW5d2lwwONqMIqlc9puMrqvdct97FPTXZ5+kz+HY/dbqxOK7lyyPXps4SFz VtnXMuCaw1wDa8dMNkV0tTbpMRwE+cH8XJVOhPHg7yQulEQRm+blwVMB9Iq9jTq9LStT nH4QVz7DQ8gr6gt2pzd/y/Ysqco5lsu52en06rlWDfDlr8LAzFCX2AnfJcuo1Ec+i7bU GwcC/F1YSsflgUOgpbxrqRi8NJL1+Xm/1MnGD8QGEv8dilqWgs7mdGJvQkKOks3kwdSt ylEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=Er2259if0WDm3M/tB1lV1fsxt9V1wPAGIbTL3MVuwlw=; fh=crhntt0L+yK/by259RYLU+38UTo95uBhlzHpD18tsgM=; b=VRUV8KRHT+Zgc2XwMNytQWEnPZ1e/sZJfGbL/iX4A4hnInIqVG6a6n/NGk3DApxIZR NZucyGqnfyaM581MgH9nRLaVDK3pXSRyj1J3S2Eha5bdi42zxmVbAItAMw1xQ/qqwEzY TFQGE01ALLcF7VRom0LP5R2Wk6JZ5TROQ+ve779aLx42O6k1Tg3RnzNn/VgaRvx+FbYB 1EUHBO9600CIZ/LCPm5+RwgT6P/5ZDSEG6QLA1GhjKn/bX2kJ8sXydzZNA6B7lHVgt3f pY7DNpBvHvtH7DTywubZyJ1wEDSaWaPAQmPdsStaXwpPktsE7HTKA1yfQFZCCC5Cnq6k 5RcQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=UM5yTkES; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=neutral header.i=@amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id 5b1f17b1804b1-49ff06b9f7csor1686345e9.11.2026.09.24.23.43.19 for (Google Transport Security); Thu, 24 Sep 2026 23:43:19 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Forwarded-Encrypted: i=1; AKwUvBzvY3Y1ZOezwpjCnPy5lIDZ/7rE3TlbwGdPBeutT6Rni2pKOSfjU3eoPSir1ZvOXD/KzeBAvxF6pacLRCa/@amarulasolutions.com X-Gm-Gg: AYBFou0ydpSENZSVHBiF8+68Hs9he+4R/C6apxgWoT2VB/nv+LaOn9P/YHtnKq3UdUD Cuhanuohuud1fmbIsuUxtkq5aES5CGjTnUeLfqUddgvYxSyxElZOJQqsmhkbO5JledlPv9snVaT Fit+8hd4qqrHELnVxkIN97YsuqEajPOk3NJaKcn1gH6YUwjfdQAtwa+W4N0jnh/wKgchseyz1uE W1o+0iKoOfSAcW9mDXq+KHrEcFbFNfX5zJPP9xnMi6xyC2z907cyl/yOnHubZdi95S5xBQic4CQ ZEiznqvEI9BHiMQ5o0V1Sjiz3mna+Djxcqz0Zt0xlbccUNxUDUoyAXu6vwM9b6x/uHW2Bkn/pIM 1BFVgirND/OGgr8KFNKQAWv7PWtgxECdiup9dK5/FL8bziyw+Y/JGmK9x+h4sZE8k5sYkGaE2IC dBChaNJDRETOdBIcFjP49ib1KvEcMwbd6y9inLc7SZMgqMqvT4coY4jw88RrW9z5MaZErLNx0bN FoOoJpBYy2f9Km8Tgqy9j15ZcvWyRKwvdZe5w9cChZ2FMtJMc1sgo+33Ho215GpNRmF7FZIe5KJ rCwkaIj5DVldjRBkDsk0adh8Xyy+Zo9MrklA6O499xjvvm3uwMHYCJifBfGq3VPnJmRZHIk= X-Received: by 2002:a05:600c:4e49:b0:49d:1cc7:5ec3 with SMTP id 5b1f17b1804b1-49fe66d456cmr75178495e9.9.1790318599602; Thu, 24 Sep 2026 23:43:19 -0700 (PDT) Received: from dario-ThinkPad-P14s-Gen-5.homenet.telecomitalia.it (host-79-14-29-58.business.telecomitalia.it. [79.14.29.58]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49fe5df44f9sm115584445e9.11.2026.09.24.23.43.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Sep 2026 23:43:18 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: Andrea Ricchi , Andreas Naumann , Angelo Compagnucci , Jesse Van Gavere , Roy Kollen Svendsen , linux-amarula@amarulasolutions.com, Thomas Petazzoni , Richard GENOUD , Dario Binacchi Subject: [PATCH v6 6/6] package/cutekeyboard: enable build with Qt6 Date: Fri, 25 Sep 2026 08:42:57 +0200 Message-ID: <20260925064257.1162394-7-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260925064257.1162394-1-dario.binacchi@amarulasolutions.com> References: <20260925064257.1162394-1-dario.binacchi@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=UM5yTkES; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=neutral header.i=@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Enable building of cutekeyboard with Qt6. With the merge of QuickControls2 into qtdeclarative, the corresponding Kconfig option has also disappeared in Buildroot. Signed-off-by: Dario Binacchi Reviewed-by: Andrea Ricchi --- Changes v5 -> v6: - Drop the redundant select of BR2_PACKAGE_QT6BASE_GUI, already selected by BR2_PACKAGE_QT6DECLARATIVE_QUICK (Andrea Ricchi) - Add Reviewed-by of Andrea Ricchi - Rebase on version 1.7.0 Changes v4 -> v5: - Rebase on version 1.6.0 Added in v2 package/cutekeyboard/Config.in | 12 +++++++----- package/cutekeyboard/cutekeyboard.mk | 6 +++++- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/package/cutekeyboard/Config.in b/package/cutekeyboard/Config.in index bd661b0cd42e..ee8017def034 100644 --- a/package/cutekeyboard/Config.in +++ b/package/cutekeyboard/Config.in @@ -1,10 +1,12 @@ config BR2_PACKAGE_CUTEKEYBOARD bool "cutekeyboard" - depends on BR2_PACKAGE_QT5 - depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative - select BR2_PACKAGE_QT5DECLARATIVE - select BR2_PACKAGE_QT5DECLARATIVE_QUICK - select BR2_PACKAGE_QT5QUICKCONTROLS2 + depends on BR2_PACKAGE_QT5 || BR2_PACKAGE_QT6 + depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE || BR2_PACKAGE_QT6 # qt5declarative + select BR2_PACKAGE_QT5DECLARATIVE if BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT5DECLARATIVE_QUICK if BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT5QUICKCONTROLS2 if BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT6DECLARATIVE if BR2_PACKAGE_QT6 + select BR2_PACKAGE_QT6DECLARATIVE_QUICK if BR2_PACKAGE_QT6 help CuteKeyboard is a Qt virtual keyboard plugin for embedded applications. diff --git a/package/cutekeyboard/cutekeyboard.mk b/package/cutekeyboard/cutekeyboard.mk index 2b0f5a9f2c2c..baaf371f977d 100644 --- a/package/cutekeyboard/cutekeyboard.mk +++ b/package/cutekeyboard/cutekeyboard.mk @@ -6,7 +6,11 @@ CUTEKEYBOARD_VERSION = 1.7.0 CUTEKEYBOARD_SITE = $(call github,amarula,cutekeyboard,v$(CUTEKEYBOARD_VERSION)) -CUTEKEYBOARD_DEPENDENCIES = qt5declarative qt5quickcontrols2 +ifeq ($(BR2_PACKAGE_QT5),y) +CUTEKEYBOARD_DEPENDENCIES += qt5declarative qt5quickcontrols2 +else +CUTEKEYBOARD_DEPENDENCIES += qt6declarative +endif CUTEKEYBOARD_INSTALL_STAGING = YES CUTEKEYBOARD_LICENSE = MIT CUTEKEYBOARD_LICENSE_FILES = LICENSE