* [ptxdist] [PATCH 1/2] qt6: allow selecting linuxfb platform
@ 2024-06-05 20:41 Roland Hieber
2024-06-05 20:41 ` [ptxdist] [PATCH 2/2] qt6: install examples if selected Roland Hieber
2024-06-15 14:58 ` [ptxdist] [APPLIED] qt6: allow selecting linuxfb platform Michael Olbrich
0 siblings, 2 replies; 3+ messages in thread
From: Roland Hieber @ 2024-06-05 20:41 UTC (permalink / raw)
To: ptxdist; +Cc: Rouven Czerwinski, Roland Hieber
The linuxfb platform is useful for systems without wayland or graphics
acceleration hardware.
Co-developed-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
rules/qt6.in | 11 +++++++++++
rules/qt6.make | 3 ++-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/rules/qt6.in b/rules/qt6.in
index 36c2bddf160d..d50115f42b01 100644
--- a/rules/qt6.in
+++ b/rules/qt6.in
@@ -166,6 +166,7 @@ comment "supported plugins"
config QT6_PLATFORM_DEFAULT
string
default "eglfs" if QT6_PLATFORM_DEFAULT_EGLFS
+ default "linuxfb" if QT6_PLATFORM_DEFAULT_LINUXFB
default "wayland" if QT6_PLATFORM_DEFAULT_WAYLAND
config QT6_PLATFORM_EGLFS
@@ -173,6 +174,10 @@ config QT6_PLATFORM_EGLFS
prompt "eglfs"
select QT6_OPENGL
+config QT6_PLATFORM_LINUXFB
+ bool
+ prompt "linuxfb"
+
comment "default plugin"
choice
@@ -185,6 +190,7 @@ config QT6_PLATFORM_DEFAULT_MISSING
bool
prompt "--nothing--"
depends on !QT6_PLATFORM_EGLFS
+ depends on !QT6_PLATFORM_LINUXFB
depends on !QT6_MODULE_QTWAYLAND
config QT6_PLATFORM_DEFAULT_EGLFS
@@ -192,6 +198,11 @@ config QT6_PLATFORM_DEFAULT_EGLFS
depends on QT6_PLATFORM_EGLFS
prompt "eglfs"
+config QT6_PLATFORM_DEFAULT_LINUXFB
+ bool
+ depends on QT6_PLATFORM_LINUXFB
+ prompt "linuxfb"
+
config QT6_PLATFORM_DEFAULT_WAYLAND
bool
depends on QT6_MODULE_QTWAYLAND
diff --git a/rules/qt6.make b/rules/qt6.make
index fa1f4996925b..3ebd2fef15d5 100644
--- a/rules/qt6.make
+++ b/rules/qt6.make
@@ -251,7 +251,7 @@ QT6_CONF_OPT += \
-DFEATURE_library=ON \
-DFEATURE_libudev=$(call ptx/onoff,PTXCONF_QT6_LIBUDEV) \
-DFEATURE_linux_netlink=ON \
- -DFEATURE_linuxfb=OFF \
+ -DFEATURE_linuxfb=$(call ptx/onoff,PTXCONF_QT6_PLATFORM_LINUXFB) \
-DFEATURE_localserver=ON \
-DFEATURE_lttng=OFF \
-DFEATURE_macdeployqt=OFF \
@@ -973,6 +973,7 @@ QT6_PLUGINS-$(PTXCONF_QT6_PLATFORM_EGLFS) += platforms/libqeglfs
QT6_PLUGINS-$(PTXCONF_QT6_MODULE_QTBASE_GUI) += platforms/libqminimal
QT6_PLUGINS-$(PTXCONF_QT6_PLATFORM_EGLFS) += platforms/libqminimalegl
QT6_PLUGINS-$(PTXCONF_QT6_MODULE_QTBASE_GUI) += platforms/libqoffscreen
+QT6_PLUGINS-$(PTXCONF_QT6_PLATFORM_LINUXFB) += platforms/libqlinuxfb
QT6_PLUGINS-$(PTXCONF_QT6_PLATFORM_EGLFS) += egldeviceintegrations/libqeglfs-kms-integration
QT6_PLUGINS-$(PTXCONF_QT6_MODULE_QTBASE_SQL_MYSQL) += sqldrivers/libqsqlmysql
QT6_PLUGINS-$(PTXCONF_QT6_MODULE_QTBASE_SQL_SQLITE) += sqldrivers/libqsqlite
--
2.39.2
^ permalink raw reply [flat|nested] 3+ messages in thread
* [ptxdist] [PATCH 2/2] qt6: install examples if selected
2024-06-05 20:41 [ptxdist] [PATCH 1/2] qt6: allow selecting linuxfb platform Roland Hieber
@ 2024-06-05 20:41 ` Roland Hieber
2024-06-15 14:58 ` [ptxdist] [APPLIED] qt6: allow selecting linuxfb platform Michael Olbrich
1 sibling, 0 replies; 3+ messages in thread
From: Roland Hieber @ 2024-06-05 20:41 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
The examples are currently not selectable through the menu, but if they
are enabled, they should also be installed.
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
rules/qt6.make | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/rules/qt6.make b/rules/qt6.make
index 3ebd2fef15d5..4ed34c3e12d0 100644
--- a/rules/qt6.make
+++ b/rules/qt6.make
@@ -1229,6 +1229,10 @@ ifdef PTXCONF_QT6_MODULE_QTDECLARATIVE_QMLSCENE
@$(call install_copy, qt6, 0, 0, 0755, -, /usr/bin/qmlscene)
endif
+ifdef PTXCONF_QT6_PREPARE_EXAMPLES
+ @$(call install_tree, qt6, 0, 0, -, /usr/lib/qt6/examples)
+endif
+
@$(call install_finish, qt6)
@$(call touch)
--
2.39.2
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [ptxdist] [APPLIED] qt6: allow selecting linuxfb platform
2024-06-05 20:41 [ptxdist] [PATCH 1/2] qt6: allow selecting linuxfb platform Roland Hieber
2024-06-05 20:41 ` [ptxdist] [PATCH 2/2] qt6: install examples if selected Roland Hieber
@ 2024-06-15 14:58 ` Michael Olbrich
1 sibling, 0 replies; 3+ messages in thread
From: Michael Olbrich @ 2024-06-15 14:58 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
Thanks, applied as da3db0e0e43af5a21a451129a89dd1e3bb78d383.
Michael
[sent from post-receive hook]
On Sat, 15 Jun 2024 16:58:41 +0200, Roland Hieber <rhi@pengutronix.de> wrote:
> The linuxfb platform is useful for systems without wayland or graphics
> acceleration hardware.
>
> Co-developed-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
> Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20240605204135.270043-1-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/qt6.in b/rules/qt6.in
> index 36c2bddf160d..d50115f42b01 100644
> --- a/rules/qt6.in
> +++ b/rules/qt6.in
> @@ -166,6 +166,7 @@ comment "supported plugins"
> config QT6_PLATFORM_DEFAULT
> string
> default "eglfs" if QT6_PLATFORM_DEFAULT_EGLFS
> + default "linuxfb" if QT6_PLATFORM_DEFAULT_LINUXFB
> default "wayland" if QT6_PLATFORM_DEFAULT_WAYLAND
>
> config QT6_PLATFORM_EGLFS
> @@ -173,6 +174,10 @@ config QT6_PLATFORM_EGLFS
> prompt "eglfs"
> select QT6_OPENGL
>
> +config QT6_PLATFORM_LINUXFB
> + bool
> + prompt "linuxfb"
> +
> comment "default plugin"
>
> choice
> @@ -185,6 +190,7 @@ config QT6_PLATFORM_DEFAULT_MISSING
> bool
> prompt "--nothing--"
> depends on !QT6_PLATFORM_EGLFS
> + depends on !QT6_PLATFORM_LINUXFB
> depends on !QT6_MODULE_QTWAYLAND
>
> config QT6_PLATFORM_DEFAULT_EGLFS
> @@ -192,6 +198,11 @@ config QT6_PLATFORM_DEFAULT_EGLFS
> depends on QT6_PLATFORM_EGLFS
> prompt "eglfs"
>
> +config QT6_PLATFORM_DEFAULT_LINUXFB
> + bool
> + depends on QT6_PLATFORM_LINUXFB
> + prompt "linuxfb"
> +
> config QT6_PLATFORM_DEFAULT_WAYLAND
> bool
> depends on QT6_MODULE_QTWAYLAND
> diff --git a/rules/qt6.make b/rules/qt6.make
> index fa1f4996925b..3ebd2fef15d5 100644
> --- a/rules/qt6.make
> +++ b/rules/qt6.make
> @@ -251,7 +251,7 @@ QT6_CONF_OPT += \
> -DFEATURE_library=ON \
> -DFEATURE_libudev=$(call ptx/onoff,PTXCONF_QT6_LIBUDEV) \
> -DFEATURE_linux_netlink=ON \
> - -DFEATURE_linuxfb=OFF \
> + -DFEATURE_linuxfb=$(call ptx/onoff,PTXCONF_QT6_PLATFORM_LINUXFB) \
> -DFEATURE_localserver=ON \
> -DFEATURE_lttng=OFF \
> -DFEATURE_macdeployqt=OFF \
> @@ -973,6 +973,7 @@ QT6_PLUGINS-$(PTXCONF_QT6_PLATFORM_EGLFS) += platforms/libqeglfs
> QT6_PLUGINS-$(PTXCONF_QT6_MODULE_QTBASE_GUI) += platforms/libqminimal
> QT6_PLUGINS-$(PTXCONF_QT6_PLATFORM_EGLFS) += platforms/libqminimalegl
> QT6_PLUGINS-$(PTXCONF_QT6_MODULE_QTBASE_GUI) += platforms/libqoffscreen
> +QT6_PLUGINS-$(PTXCONF_QT6_PLATFORM_LINUXFB) += platforms/libqlinuxfb
> QT6_PLUGINS-$(PTXCONF_QT6_PLATFORM_EGLFS) += egldeviceintegrations/libqeglfs-kms-integration
> QT6_PLUGINS-$(PTXCONF_QT6_MODULE_QTBASE_SQL_MYSQL) += sqldrivers/libqsqlmysql
> QT6_PLUGINS-$(PTXCONF_QT6_MODULE_QTBASE_SQL_SQLITE) += sqldrivers/libqsqlite
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-06-15 14:59 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-06-05 20:41 [ptxdist] [PATCH 1/2] qt6: allow selecting linuxfb platform Roland Hieber
2024-06-05 20:41 ` [ptxdist] [PATCH 2/2] qt6: install examples if selected Roland Hieber
2024-06-15 14:58 ` [ptxdist] [APPLIED] qt6: allow selecting linuxfb platform Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox