| Message ID | 20240625211847.1419944-4-roykollensvendsen@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v9,01/14] package/qt6: bump version to 6.7.2 | expand |
On Tue, 25 Jun 2024 23:18:28 +0200 Roy Kollen Svendsen <roykollensvendsen@gmail.com> wrote: > We need host-qt6base with Testlib support when building host-qt6declarative > with QuickTest support. QuickTest support is further required for building the > qmltestrunner host tool. qt6declarative will fail to build if qmltestrunner is > not available. > > Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com> > --- > package/qt6/qt6base/Config.in.host | 5 +++++ > package/qt6/qt6base/qt6base.mk | 11 ++++++++++- > 2 files changed, 15 insertions(+), 1 deletion(-) Applied to master, thanks. Thomas
diff --git a/package/qt6/qt6base/Config.in.host b/package/qt6/qt6base/Config.in.host index 286da0ff03..80bc13c7dc 100644 --- a/package/qt6/qt6base/Config.in.host +++ b/package/qt6/qt6base/Config.in.host @@ -7,3 +7,8 @@ config BR2_PACKAGE_HOST_QT6BASE_GUI # (e.g. Qt Tools). config BR2_PACKAGE_HOST_QT6BASE_NETWORK bool + +# Select this if you need host qt6 tools that require the Qt::Test module +# (e.g. qmltestrunner). +config BR2_PACKAGE_HOST_QT6BASE_TEST + bool diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 509c6b0066..6b9f425255 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -86,7 +86,6 @@ HOST_QT6BASE_CONF_OPTS = \ -DFEATURE_concurrent=OFF \ -DFEATURE_xml=ON \ -DFEATURE_sql=OFF \ - -DFEATURE_testlib=OFF \ -DFEATURE_dbus=OFF \ -DFEATURE_icu=OFF \ -DFEATURE_glib=OFF \ @@ -111,6 +110,16 @@ else HOST_QT6BASE_CONF_OPTS += -DFEATURE_network=OFF endif +# We need host-qt6base with Testlib support when building host-qt6declarative +# with QuickTest support. QuickTest support is further required for building the +# qmltestrunner host tool. qt6declarative will fail to build if qmltestrunner is +# not available. +ifeq ($(BR2_PACKAGE_HOST_QT6BASE_TEST),y) +HOST_QT6BASE_CONF_OPTS += -DFEATURE_testlib=ON +else +HOST_QT6BASE_CONF_OPTS += -DFEATURE_testlib=OFF +endif + # Conditional blocks below are ordered by alphabetic ordering of the # BR2_PACKAGE_* option.
We need host-qt6base with Testlib support when building host-qt6declarative with QuickTest support. QuickTest support is further required for building the qmltestrunner host tool. qt6declarative will fail to build if qmltestrunner is not available. Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com> --- package/qt6/qt6base/Config.in.host | 5 +++++ package/qt6/qt6base/qt6base.mk | 11 ++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-)