* [ptxdist] [PATCH] qt6: correctly gate QtQuick vector image modules
@ 2025-11-14 10:46 Lucas Stach
2025-12-04 13:14 ` [ptxdist] [APPLIED] " Michael Olbrich
0 siblings, 1 reply; 2+ messages in thread
From: Lucas Stach @ 2025-11-14 10:46 UTC (permalink / raw)
To: ptxdist
Those are only available when QtSvg is selected.
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
rules/qt6.in | 4 ++++
rules/qt6.make | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/rules/qt6.in b/rules/qt6.in
index 59e0beb0cb96..f1d24000f9ab 100644
--- a/rules/qt6.in
+++ b/rules/qt6.in
@@ -371,6 +371,10 @@ config QT6_MODULE_QTDECLARATIVE_QUICK_PARTICLES
bool
default QT6_OPENGL
+config QT6_MODULE_QTDECLARATIVE_QUICK_SVG
+ bool
+ default QT6_MODULE_QTSVG
+
if QT6_MODULE_QTQUICK3D
config QT6_MODULE_QTDECLARATIVE_QTQUICK3D_DEBUG
diff --git a/rules/qt6.make b/rules/qt6.make
index 7d893bae9c90..1e9ba9a8aec5 100644
--- a/rules/qt6.make
+++ b/rules/qt6.make
@@ -1035,8 +1035,8 @@ QT6_LIBS-$(PTXCONF_QT6_MODULE_QTDECLARATIVE_QUICK) += Qt6QuickControls2Material
QT6_LIBS-$(PTXCONF_QT6_MODULE_QTDECLARATIVE_QUICK) += Qt6QuickControls2MaterialStyleImpl
QT6_LIBS-$(PTXCONF_QT6_MODULE_QTDECLARATIVE_QUICK) += Qt6QuickShapes
QT6_LIBS-$(PTXCONF_QT6_MODULE_QTDECLARATIVE_QUICK) += Qt6QuickTemplates2
-QT6_LIBS-$(PTXCONF_QT6_MODULE_QTDECLARATIVE_QUICK_WIDGETS) += Qt6QuickVectorImage
-QT6_LIBS-$(PTXCONF_QT6_MODULE_QTDECLARATIVE_QUICK_WIDGETS) += Qt6QuickVectorImageGenerator
+QT6_LIBS-$(PTXCONF_QT6_MODULE_QTDECLARATIVE_QUICK_SVG) += Qt6QuickVectorImage
+QT6_LIBS-$(PTXCONF_QT6_MODULE_QTDECLARATIVE_QUICK_SVG) += Qt6QuickVectorImageGenerator
QT6_LIBS-$(PTXCONF_QT6_MODULE_QTDECLARATIVE_QUICK_WIDGETS) += Qt6QuickWidgets
QT6_LIBS-$(PTXCONF_QT6_MODULE_QTDECLARATIVE_QUICK_PARTICLES) += Qt6QuickParticles
ifdef PTXCONF_QT6_TEST
--
2.47.3
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [ptxdist] [APPLIED] qt6: correctly gate QtQuick vector image modules
2025-11-14 10:46 [ptxdist] [PATCH] qt6: correctly gate QtQuick vector image modules Lucas Stach
@ 2025-12-04 13:14 ` Michael Olbrich
0 siblings, 0 replies; 2+ messages in thread
From: Michael Olbrich @ 2025-12-04 13:14 UTC (permalink / raw)
To: ptxdist; +Cc: Lucas Stach
Thanks, applied as a1f50f13c56e80f886b80ed6cb7ae14015db77be.
Michael
[sent from post-receive hook]
On Thu, 04 Dec 2025 14:14:47 +0100, Lucas Stach <l.stach@pengutronix.de> wrote:
> Those are only available when QtSvg is selected.
>
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> Message-Id: <20251114104632.2878445-1-l.stach@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/qt6.in b/rules/qt6.in
> index 59e0beb0cb96..f1d24000f9ab 100644
> --- a/rules/qt6.in
> +++ b/rules/qt6.in
> @@ -371,6 +371,10 @@ config QT6_MODULE_QTDECLARATIVE_QUICK_PARTICLES
> bool
> default QT6_OPENGL
>
> +config QT6_MODULE_QTDECLARATIVE_QUICK_SVG
> + bool
> + default QT6_MODULE_QTSVG
> +
> if QT6_MODULE_QTQUICK3D
>
> config QT6_MODULE_QTDECLARATIVE_QTQUICK3D_DEBUG
> diff --git a/rules/qt6.make b/rules/qt6.make
> index 7d893bae9c90..1e9ba9a8aec5 100644
> --- a/rules/qt6.make
> +++ b/rules/qt6.make
> @@ -1035,8 +1035,8 @@ QT6_LIBS-$(PTXCONF_QT6_MODULE_QTDECLARATIVE_QUICK) += Qt6QuickControls2Material
> QT6_LIBS-$(PTXCONF_QT6_MODULE_QTDECLARATIVE_QUICK) += Qt6QuickControls2MaterialStyleImpl
> QT6_LIBS-$(PTXCONF_QT6_MODULE_QTDECLARATIVE_QUICK) += Qt6QuickShapes
> QT6_LIBS-$(PTXCONF_QT6_MODULE_QTDECLARATIVE_QUICK) += Qt6QuickTemplates2
> -QT6_LIBS-$(PTXCONF_QT6_MODULE_QTDECLARATIVE_QUICK_WIDGETS) += Qt6QuickVectorImage
> -QT6_LIBS-$(PTXCONF_QT6_MODULE_QTDECLARATIVE_QUICK_WIDGETS) += Qt6QuickVectorImageGenerator
> +QT6_LIBS-$(PTXCONF_QT6_MODULE_QTDECLARATIVE_QUICK_SVG) += Qt6QuickVectorImage
> +QT6_LIBS-$(PTXCONF_QT6_MODULE_QTDECLARATIVE_QUICK_SVG) += Qt6QuickVectorImageGenerator
> QT6_LIBS-$(PTXCONF_QT6_MODULE_QTDECLARATIVE_QUICK_WIDGETS) += Qt6QuickWidgets
> QT6_LIBS-$(PTXCONF_QT6_MODULE_QTDECLARATIVE_QUICK_PARTICLES) += Qt6QuickParticles
> ifdef PTXCONF_QT6_TEST
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-12-04 13:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-11-14 10:46 [ptxdist] [PATCH] qt6: correctly gate QtQuick vector image modules Lucas Stach
2025-12-04 13:14 ` [ptxdist] [APPLIED] " Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox