From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 31 Jul 2025 10:14:19 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1uhOQd-005XOf-2Z for lore@lore.pengutronix.de; Thu, 31 Jul 2025 10:14:19 +0200 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1uhOQd-0002Ld-KE; Thu, 31 Jul 2025 10:14:19 +0200 Received: from dude03.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::39]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1uhOQM-0002LP-3S; Thu, 31 Jul 2025 10:14:02 +0200 From: Holger Assmann To: ptxdist@pengutronix.de Date: Thu, 31 Jul 2025 10:13:46 +0200 Message-Id: <20250731081346.3601272-1-h.assmann@pengutronix.de> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [ptxdist] [PATCH] qt6: version bump 6.6.2 -> 6.8.3 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Holger Assmann Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Signed-off-by: Holger Assmann --- ...omplain-about-unnecessary-host-tools.patch | 59 ----------------- ...gn-fix-building-with-newer-compilers.patch | 4 +- ...e-workaround-for-too-long-file-names.patch | 4 +- ...omplain-about-unnecessary-host-tools.patch | 66 +++++++++++++++++++ ...ebengine-allow-building-with-ptxdist.patch | 4 +- ...ith-QT_FEATURE_qml_devtools-disabled.patch | 7 +- .../series | 3 +- rules/qt6.in | 19 +++++- rules/qt6.make | 29 +++++++- 9 files changed, 121 insertions(+), 74 deletions(-) delete mode 100644 patches/qt-everywhere-src-6.6.2/0201-HACK-don-t-complain-about-unnecessary-host-tools.patch rename patches/{qt-everywhere-src-6.6.2 => qt-everywhere-src-6.8.3}/0100-qtwebengine-gn-fix-building-with-newer-compilers.patch (98%) rename patches/{qt-everywhere-src-6.6.2 => qt-everywhere-src-6.8.3}/0200-HACK-qtwebengine-workaround-for-too-long-file-names.patch (94%) create mode 100644 patches/qt-everywhere-src-6.8.3/0201-HACK-don-t-complain-about-unnecessary-host-tools.patch rename patches/{qt-everywhere-src-6.6.2 => qt-everywhere-src-6.8.3}/0202-ptxdist-qtwebengine-allow-building-with-ptxdist.patch (91%) rename patches/{qt-everywhere-src-6.6.2 => qt-everywhere-src-6.8.3}/0203-fix-building-with-QT_FEATURE_qml_devtools-disabled.patch (88%) rename patches/{qt-everywhere-src-6.6.2 => qt-everywhere-src-6.8.3}/series (82%) diff --git a/patches/qt-everywhere-src-6.6.2/0201-HACK-don-t-complain-about-unnecessary-host-tools.patch b/patches/qt-everywhere-src-6.6.2/0201-HACK-don-t-complain-about-unnecessary-host-tools.patch deleted file mode 100644 index 3d7069104..000000000 --- a/patches/qt-everywhere-src-6.6.2/0201-HACK-don-t-complain-about-unnecessary-host-tools.patch +++ /dev/null @@ -1,59 +0,0 @@ -From: Michael Olbrich -Date: Fri, 8 Jul 2022 16:59:49 +0200 -Subject: [PATCH] HACK: don't complain about unnecessary host-tools - -The cross build will fail if those tools are not available, but they are -not actually needed at buildtime. - -This avoids building unnecessary stuff in host-qt6. - -Signed-off-by: Michael Olbrich ---- - qtdeclarative/tools/CMakeLists.txt | 7 +++++-- - qtquick3d/tools/CMakeLists.txt | 2 ++ - 2 files changed, 7 insertions(+), 2 deletions(-) - -diff --git a/qtdeclarative/tools/CMakeLists.txt b/qtdeclarative/tools/CMakeLists.txt -index b86d3251a3ad..2dbbdc1e0caf 100644 ---- a/qtdeclarative/tools/CMakeLists.txt -+++ b/qtdeclarative/tools/CMakeLists.txt -@@ -38,9 +38,12 @@ if(QT_FEATURE_qml_preview AND QT_FEATURE_thread AND NOT ANDROID AND NOT WASM AND - endif() - if(QT_BUILD_SHARED_LIBS AND QT_FEATURE_thread AND TARGET Qt::Quick AND NOT ANDROID AND NOT WASM AND NOT IOS AND NOT rtems) - add_subdirectory(qmlscene) -- add_subdirectory(qmltime) -+ if (NOT CMAKE_CROSSCOMPILING) -+ add_subdirectory(qmltime) -+ endif() - endif() - if(QT_BUILD_SHARED_LIBS -+ AND NOT CMAKE_CROSSCOMPILING - AND QT_FEATURE_process - AND QT_FEATURE_regularexpression - AND QT_FEATURE_thread -@@ -68,7 +71,7 @@ if(TARGET Qt::Quick - AND NOT rtems) - add_subdirectory(qmleasing) - endif() --if(QT_FEATURE_thread AND TARGET Qt::QuickTest AND NOT ANDROID AND NOT WASM AND NOT rtems) -+if(QT_FEATURE_thread AND TARGET Qt::QuickTest AND NOT ANDROID AND NOT WASM AND NOT rtems AND NOT CMAKE_CROSSCOMPILING) - add_subdirectory(qmltestrunner) - endif() - if(QT_FEATURE_private_tests AND QT_FEATURE_thread AND NOT ANDROID AND NOT WASM AND NOT IOS AND NOT rtems) -diff --git a/qtquick3d/tools/CMakeLists.txt b/qtquick3d/tools/CMakeLists.txt -index 144af64c1095..6a40010a4330 100644 ---- a/qtquick3d/tools/CMakeLists.txt -+++ b/qtquick3d/tools/CMakeLists.txt -@@ -1,6 +1,7 @@ - # Copyright (C) 2022 The Qt Company Ltd. - # SPDX-License-Identifier: BSD-3-Clause - -+if (NOT CMAKE_CROSSCOMPILING) - add_subdirectory(balsam) - if(TARGET Qt::Widgets) - if(TARGET Qt::Concurrent) -@@ -18,3 +19,4 @@ endif() - add_subdirectory(instancer) - add_subdirectory(shapegen) - add_subdirectory(materialeditor) -+endif() diff --git a/patches/qt-everywhere-src-6.6.2/0100-qtwebengine-gn-fix-building-with-newer-compilers.patch b/patches/qt-everywhere-src-6.8.3/0100-qtwebengine-gn-fix-building-with-newer-compilers.patch similarity index 98% rename from patches/qt-everywhere-src-6.6.2/0100-qtwebengine-gn-fix-building-with-newer-compilers.patch rename to patches/qt-everywhere-src-6.8.3/0100-qtwebengine-gn-fix-building-with-newer-compilers.patch index ea988d57e..cc2d95a59 100644 --- a/patches/qt-everywhere-src-6.6.2/0100-qtwebengine-gn-fix-building-with-newer-compilers.patch +++ b/patches/qt-everywhere-src-6.8.3/0100-qtwebengine-gn-fix-building-with-newer-compilers.patch @@ -34,10 +34,10 @@ Signed-off-by: Michael Olbrich 1 file changed, 1 insertion(+) diff --git a/qtwebengine/src/3rdparty/gn/src/base/containers/span.h b/qtwebengine/src/3rdparty/gn/src/base/containers/span.h -index 4af83b44bcb4..8fc90e189709 100644 +index de73fa18b479..7687576db47c 100644 --- a/qtwebengine/src/3rdparty/gn/src/base/containers/span.h +++ b/qtwebengine/src/3rdparty/gn/src/base/containers/span.h -@@ -9,6 +9,7 @@ +@@ -10,6 +10,7 @@ #include #include diff --git a/patches/qt-everywhere-src-6.6.2/0200-HACK-qtwebengine-workaround-for-too-long-file-names.patch b/patches/qt-everywhere-src-6.8.3/0200-HACK-qtwebengine-workaround-for-too-long-file-names.patch similarity index 94% rename from patches/qt-everywhere-src-6.6.2/0200-HACK-qtwebengine-workaround-for-too-long-file-names.patch rename to patches/qt-everywhere-src-6.8.3/0200-HACK-qtwebengine-workaround-for-too-long-file-names.patch index 944709e1f..0da9a2211 100644 --- a/patches/qt-everywhere-src-6.6.2/0200-HACK-qtwebengine-workaround-for-too-long-file-names.patch +++ b/patches/qt-everywhere-src-6.8.3/0200-HACK-qtwebengine-workaround-for-too-long-file-names.patch @@ -15,10 +15,10 @@ Signed-off-by: Philipp Zabel 1 file changed, 9 insertions(+) diff --git a/qtwebengine/src/3rdparty/gn/src/gn/ninja_action_target_writer.cc b/qtwebengine/src/3rdparty/gn/src/gn/ninja_action_target_writer.cc -index 6e1d2abf1dc1..5cb59e841f38 100644 +index 06da24477602..eff45404706c 100644 --- a/qtwebengine/src/3rdparty/gn/src/gn/ninja_action_target_writer.cc +++ b/qtwebengine/src/3rdparty/gn/src/gn/ninja_action_target_writer.cc -@@ -125,9 +125,18 @@ std::string NinjaActionTargetWriter::WriteRuleDefinition() { +@@ -151,9 +151,18 @@ std::string NinjaActionTargetWriter::WriteRuleDefinition() { // strictly necessary for regular one-shot actions, but it's easier to // just always define unique_name. std::string rspfile = custom_rule_name; diff --git a/patches/qt-everywhere-src-6.8.3/0201-HACK-don-t-complain-about-unnecessary-host-tools.patch b/patches/qt-everywhere-src-6.8.3/0201-HACK-don-t-complain-about-unnecessary-host-tools.patch new file mode 100644 index 000000000..9b1f40be5 --- /dev/null +++ b/patches/qt-everywhere-src-6.8.3/0201-HACK-don-t-complain-about-unnecessary-host-tools.patch @@ -0,0 +1,66 @@ +From: Michael Olbrich +Date: Fri, 8 Jul 2022 16:59:49 +0200 +Subject: [PATCH] HACK: don't complain about unnecessary host-tools + +The cross build will fail if those tools are not available, but they are +not actually needed at buildtime. + +This avoids building unnecessary stuff in host-qt6. + +Signed-off-by: Michael Olbrich +--- + qtdeclarative/tools/CMakeLists.txt | 9 ++++++--- + qtquick3d/tools/CMakeLists.txt | 2 ++ + 2 files changed, 8 insertions(+), 3 deletions(-) + +diff --git a/qtdeclarative/tools/CMakeLists.txt b/qtdeclarative/tools/CMakeLists.txt +index 0b89bea46ea2..2b4293b21293 100644 +--- a/qtdeclarative/tools/CMakeLists.txt ++++ b/qtdeclarative/tools/CMakeLists.txt +@@ -36,15 +36,18 @@ if(NOT (ANDROID OR WASM OR IOS OR VISIONOS OR rtems)) + endif() + if(QT_BUILD_SHARED_LIBS AND TARGET Qt::Quick) + add_subdirectory(qmlscene) +- add_subdirectory(qmltime) ++ if (NOT CMAKE_CROSSCOMPILING) ++ add_subdirectory(qmltime) ++ endif() + endif() + if(QT_BUILD_SHARED_LIBS ++ AND NOT CMAKE_CROSSCOMPILING + AND QT_FEATURE_process + AND QT_FEATURE_regularexpression + AND TARGET Qt::Quick) + add_subdirectory(qmlplugindump) + endif() +- if(TARGET Qt::QuickTest) ++ if(TARGET Qt::QuickTest AND NOT CMAKE_CROSSCOMPILING) + add_subdirectory(qmltestrunner) + endif() + if(QT_FEATURE_private_tests) +@@ -66,7 +69,7 @@ if(NOT (ANDROID OR WASM OR IOS OR VISIONOS OR rtems)) + add_subdirectory(qmleasing) + endif() + +- if(TARGET Qt::Quick AND TARGET Qt::Svg) ++ if(TARGET Qt::Quick AND TARGET Qt::Svg AND NOT CMAKE_CROSSCOMPILING) + add_subdirectory(svgtoqml) + endif() + endif() # NOT (ANDROID OR WASM OR IOS OR rtems) +diff --git a/qtquick3d/tools/CMakeLists.txt b/qtquick3d/tools/CMakeLists.txt +index 0adef6c8ba60..68400197a7d4 100644 +--- a/qtquick3d/tools/CMakeLists.txt ++++ b/qtquick3d/tools/CMakeLists.txt +@@ -1,6 +1,7 @@ + # Copyright (C) 2022 The Qt Company Ltd. + # SPDX-License-Identifier: BSD-3-Clause + ++if (NOT CMAKE_CROSSCOMPILING) + add_subdirectory(balsam) + if(TARGET Qt::Widgets) + if(TARGET Qt::Concurrent) +@@ -22,3 +23,4 @@ endif() + if(QT_FEATURE_localserver) + add_subdirectory(materialeditor) + endif() ++endif() diff --git a/patches/qt-everywhere-src-6.6.2/0202-ptxdist-qtwebengine-allow-building-with-ptxdist.patch b/patches/qt-everywhere-src-6.8.3/0202-ptxdist-qtwebengine-allow-building-with-ptxdist.patch similarity index 91% rename from patches/qt-everywhere-src-6.6.2/0202-ptxdist-qtwebengine-allow-building-with-ptxdist.patch rename to patches/qt-everywhere-src-6.8.3/0202-ptxdist-qtwebengine-allow-building-with-ptxdist.patch index 9136996d6..af2c4bb7b 100644 --- a/patches/qt-everywhere-src-6.6.2/0202-ptxdist-qtwebengine-allow-building-with-ptxdist.patch +++ b/patches/qt-everywhere-src-6.8.3/0202-ptxdist-qtwebengine-allow-building-with-ptxdist.patch @@ -12,10 +12,10 @@ Signed-off-by: Michael Olbrich 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtwebengine/cmake/Functions.cmake b/qtwebengine/cmake/Functions.cmake -index 923f78dbdfcb..33aefea614fd 100644 +index 8d5a977771de..81d5a3f55699 100644 --- a/qtwebengine/cmake/Functions.cmake +++ b/qtwebengine/cmake/Functions.cmake -@@ -725,7 +725,7 @@ function(extract_cflag result cflag) +@@ -738,7 +738,7 @@ function(extract_cflag result cflag) list(APPEND cflags ${CMAKE_CXX_COMPILER_ARG${i}}) math(EXPR i "${i} + 1") endwhile() diff --git a/patches/qt-everywhere-src-6.6.2/0203-fix-building-with-QT_FEATURE_qml_devtools-disabled.patch b/patches/qt-everywhere-src-6.8.3/0203-fix-building-with-QT_FEATURE_qml_devtools-disabled.patch similarity index 88% rename from patches/qt-everywhere-src-6.6.2/0203-fix-building-with-QT_FEATURE_qml_devtools-disabled.patch rename to patches/qt-everywhere-src-6.8.3/0203-fix-building-with-QT_FEATURE_qml_devtools-disabled.patch index 7f9925a5c..9324f568c 100644 --- a/patches/qt-everywhere-src-6.6.2/0203-fix-building-with-QT_FEATURE_qml_devtools-disabled.patch +++ b/patches/qt-everywhere-src-6.8.3/0203-fix-building-with-QT_FEATURE_qml_devtools-disabled.patch @@ -16,10 +16,10 @@ Signed-off-by: Michael Olbrich 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/qtdeclarative/src/plugins/CMakeLists.txt b/qtdeclarative/src/plugins/CMakeLists.txt -index 548ef486f014..54058d431934 100644 +index 42c7c2332bdb..176840544026 100644 --- a/qtdeclarative/src/plugins/CMakeLists.txt +++ b/qtdeclarative/src/plugins/CMakeLists.txt -@@ -10,4 +10,6 @@ if(TARGET Qt::Quick) +@@ -8,7 +8,9 @@ if(TARGET Qt::Quick) add_subdirectory(scenegraph) endif() @@ -27,3 +27,6 @@ index 548ef486f014..54058d431934 100644 +if(QT_FEATURE_qml_devtools) + add_subdirectory(qmllint) +endif() + + if(TARGET Qt::QmlLSPrivate) + add_subdirectory(qmlls) diff --git a/patches/qt-everywhere-src-6.6.2/series b/patches/qt-everywhere-src-6.8.3/series similarity index 82% rename from patches/qt-everywhere-src-6.6.2/series rename to patches/qt-everywhere-src-6.8.3/series index ca0365f45..a3f2fe07e 100644 --- a/patches/qt-everywhere-src-6.6.2/series +++ b/patches/qt-everywhere-src-6.8.3/series @@ -1,6 +1,5 @@ # generated by git-ptx-patches #tag:base --start-number 1 -#tag:upstream --start-number 1 #tag:build --start-number 100 0100-qtwebengine-gn-fix-building-with-newer-compilers.patch #tag:ptxdist --start-number 200 @@ -8,4 +7,4 @@ 0201-HACK-don-t-complain-about-unnecessary-host-tools.patch 0202-ptxdist-qtwebengine-allow-building-with-ptxdist.patch 0203-fix-building-with-QT_FEATURE_qml_devtools-disabled.patch -# e03d0404bad7decacab58c834de428aa - git-ptx-patches magic +# e24df14e25c5ed10633cf14d3a1570f6 - git-ptx-patches magic diff --git a/rules/qt6.in b/rules/qt6.in index ad7f5333c..2ddf013ce 100644 --- a/rules/qt6.in +++ b/rules/qt6.in @@ -47,6 +47,7 @@ menuconfig QT6 select FREETYPE if QT6_GUI || QT6_MODULE_QTWEBENGINE select GLIB if QT6_GLIB select GSTREAMER1 if QT6_MODULE_QTMULTIMEDIA_GST + select GST_PLUGINS_BAD1 if QT6_MODULE_QTMULTIMEDIA_GST select GST_PLUGINS_BASE1 if QT6_MODULE_QTMULTIMEDIA_GST select GST_PLUGINS_BASE1_APP if QT6_MODULE_QTMULTIMEDIA_GST select GST_PLUGINS_BASE1_GL if QT6_MODULE_QTMULTIMEDIA_GST && QT6_OPENGL @@ -333,7 +334,6 @@ config QT6_MODULE_QTDECLARATIVE bool # FIXME: fails to build without QT6_TEST select QT6_TEST - select QT6_OPENGL select QT6_MODULE_QTSHADERTOOLS prompt "QtDeclarative" @@ -371,6 +371,14 @@ config QT6_MODULE_QTDECLARATIVE_QUICK_PARTICLES bool default QT6_OPENGL +if QT6_MODULE_QTQUICK3D + +config QT6_MODULE_QTDECLARATIVE_QTQUICK3D_DEBUG + bool + default QT6_MODULE_QTDECLARATIVE_DEBUG + +endif + endif endif @@ -378,9 +386,16 @@ config QT6_MODULE_QTGRAPHS bool select QT6_GUI select QT6_MODULE_QTDECLARATIVE - select QT6_MODULE_QTQUICK3D prompt"QtGraphs" +if QT6_MODULE_QTGRAPHS + +config QT6_MODULE_QTGRAPHS_WIDGETS + bool + default QT6_WIDGETS + +endif + config QT6_MODULE_QTHTTPSERVER bool prompt"QtHttpServer" diff --git a/rules/qt6.make b/rules/qt6.make index b569d652f..aef6f7240 100644 --- a/rules/qt6.make +++ b/rules/qt6.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_QT6) += qt6 # # Paths and names # -QT6_VERSION := 6.6.2 -QT6_MD5 := b92112e12298f4b27050ef7060658191 +QT6_VERSION := 6.8.3 +QT6_MD5 := 10a39c4b4af4f465c4ff0352a6d18a0a QT6 := qt-everywhere-src-$(QT6_VERSION) QT6_SUFFIX := tar.xz QT6_URL := \ @@ -165,6 +165,7 @@ QT6_CONF_OPT += \ -DFEATURE_cross_compile=ON \ -DFEATURE_cssparser=ON \ -DFEATURE_cursor=ON \ + -DFEATURE_datatypecodegenerator=OFF \ -DFEATURE_datestring=ON \ -DFEATURE_datetimeparser=ON \ -DFEATURE_dbus=$(call ptx/onoff,PTXCONF_QT6_DBUS) \ @@ -928,7 +929,7 @@ QT6_QML-y := ### Qt3d ### QT6_LIBS-$(PTXCONF_QT6_MODULE_QT3D) += Qt63DAnimation Qt63DCore Qt63DExtras Qt63DInput Qt63DLogic Qt63DRender -QT6_LIBS-$(PTXCONF_QT6_MODULE_QT3D_QUICK) += Qt63DQuick Qt63DQuickAnimation Qt63DQuickExtras Qt63DQuickInput Qt63DQuickRender Qt63DQuickScene2D +QT6_LIBS-$(PTXCONF_QT6_MODULE_QT3D_QUICK) += Qt63DQuick Qt63DQuickAnimation Qt63DQuickExtras Qt63DQuickInput Qt63DQuickRender Qt63DQuickScene2D Qt63DQuickScene3D QT6_QML-$(PTXCONF_QT6_MODULE_QT3D_QUICK) += Qt3D QT6_PLUGINS-$(PTXCONF_QT6_MODULE_QT3D) += geometryloaders/libdefaultgeometryloader QT6_PLUGINS-$(PTXCONF_QT6_MODULE_QT3D) += geometryloaders/libgltfgeometryloader @@ -982,6 +983,7 @@ QT6_PLUGINS-$(PTXCONF_QT6_GLIB) += networkinformation/libqglib QT6_PLUGINS-$(PTXCONF_QT6_DBUS) += networkinformation/libqnetworkmanager QT6_PLUGINS-$(PTXCONF_QT6_MODULE_QTBASE) += tls/libqcertonlybackend QT6_PLUGINS-$(PTXCONF_QT6_OPENSSL) += tls/libqopensslbackend +QT6_QML-$(PTXCONF_QT6_MODULE_QTBASE) += QtNetwork ### QtCharts ### QT6_LIBS-$(PTXCONF_QT6_MODULE_QTCHARTS) += Qt6Charts @@ -1002,21 +1004,37 @@ QT6_QML-$(PTXCONF_QT6_MODULE_QTDATAVIS3D) += QtDataVisualization ### QtDeclarative ### QT6_LIBS-$(PTXCONF_QT6_MODULE_QTDECLARATIVE) += Qt6Qml +QT6_LIBS-$(PTXCONF_QT6_MODULE_QTDECLARATIVE) += Qt6QmlCompiler QT6_LIBS-$(PTXCONF_QT6_MODULE_QTDECLARATIVE) += Qt6QmlCore QT6_LIBS-$(PTXCONF_QT6_MODULE_QTDECLARATIVE) += Qt6QmlLocalStorage +QT6_LIBS-$(PTXCONF_QT6_MODULE_QTDECLARATIVE) += Qt6QmlMeta +QT6_LIBS-$(PTXCONF_QT6_MODULE_QTDECLARATIVE) += Qt6QmlNetwork QT6_LIBS-$(PTXCONF_QT6_MODULE_QTDECLARATIVE) += Qt6QmlXmlListModel QT6_LIBS-$(PTXCONF_QT6_MODULE_QTDECLARATIVE_QUICK) += Qt6QmlModels QT6_LIBS-$(PTXCONF_QT6_MODULE_QTDECLARATIVE_QUICK) += Qt6QmlWorkerScript QT6_LIBS-$(PTXCONF_QT6_MODULE_QTDECLARATIVE_QUICK) += Qt6Quick QT6_LIBS-$(PTXCONF_QT6_MODULE_QTDECLARATIVE_QUICK) += Qt6QuickControls2 +QT6_LIBS-$(PTXCONF_QT6_MODULE_QTDECLARATIVE_QUICK) += Qt6QuickControls2Basic +QT6_LIBS-$(PTXCONF_QT6_MODULE_QTDECLARATIVE_QUICK) += Qt6QuickControls2BasicStyleImpl QT6_LIBS-$(PTXCONF_QT6_MODULE_QTDECLARATIVE_QUICK) += Qt6QuickControls2Impl +QT6_LIBS-$(PTXCONF_QT6_MODULE_QTDECLARATIVE_QUICK) += Qt6QuickControls2Universal +QT6_LIBS-$(PTXCONF_QT6_MODULE_QTDECLARATIVE_QUICK) += Qt6QuickControls2UniversalStyleImpl QT6_LIBS-$(PTXCONF_QT6_MODULE_QTDECLARATIVE_QUICK) += Qt6QuickDialogs2 QT6_LIBS-$(PTXCONF_QT6_MODULE_QTDECLARATIVE_QUICK) += Qt6QuickDialogs2Utils QT6_LIBS-$(PTXCONF_QT6_MODULE_QTDECLARATIVE_QUICK) += Qt6QuickDialogs2QuickImpl QT6_LIBS-$(PTXCONF_QT6_MODULE_QTDECLARATIVE_QUICK) += Qt6QuickEffects +QT6_LIBS-$(PTXCONF_QT6_MODULE_QTDECLARATIVE_QUICK) += Qt6QuickControls2FluentWinUI3StyleImpl +QT6_LIBS-$(PTXCONF_QT6_MODULE_QTDECLARATIVE_QUICK) += Qt6QuickControls2Fusion +QT6_LIBS-$(PTXCONF_QT6_MODULE_QTDECLARATIVE_QUICK) += Qt6QuickControls2FusionStyleImpl +QT6_LIBS-$(PTXCONF_QT6_MODULE_QTDECLARATIVE_QUICK) += Qt6QuickControls2Imagine +QT6_LIBS-$(PTXCONF_QT6_MODULE_QTDECLARATIVE_QUICK) += Qt6QuickControls2ImagineStyleImpl QT6_LIBS-$(PTXCONF_QT6_MODULE_QTDECLARATIVE_QUICK) += Qt6QuickLayouts +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_WIDGETS) += Qt6QuickWidgets QT6_LIBS-$(PTXCONF_QT6_MODULE_QTDECLARATIVE_QUICK_PARTICLES) += Qt6QuickParticles ifdef PTXCONF_QT6_TEST @@ -1033,6 +1051,7 @@ QT6_PLUGINS-$(PTXCONF_QT6_MODULE_QTDECLARATIVE_QUICK_DEBUG) += qmltooling/libqml QT6_PLUGINS-$(PTXCONF_QT6_MODULE_QTDECLARATIVE_DEBUG) += qmltooling/libqmldbg_server QT6_PLUGINS-$(PTXCONF_QT6_MODULE_QTDECLARATIVE_DEBUG) += qmltooling/libqmldbg_tcp QT6_PLUGINS-$(PTXCONF_QT6_MODULE_QTDECLARATIVE_QUICK_DEBUG) += qmltooling/libqmldbg_inspector +QT6_PLUGINS-$(PTXCONF_QT6_MODULE_QTDECLARATIVE_QTQUICK3D_DEBUG) += qmltooling/libqmldbg_quick3dprofiler QT6_QML-$(PTXCONF_QT6_MODULE_QTDECLARATIVE) += Qt QT6_QML-$(PTXCONF_QT6_MODULE_QTDECLARATIVE) += QtCore QT6_QML-$(PTXCONF_QT6_MODULE_QTDECLARATIVE) += QtQml @@ -1043,6 +1062,7 @@ endif ### QtGraphs ### QT6_LIBS-$(PTXCONF_QT6_MODULE_QTGRAPHS) += Qt6Graphs +QT6_LIBS-$(PTXCONF_QT6_MODULE_QTGRAPHS_WIDGETS) += Qt6GraphsWidgets QT6_QML-$(PTXCONF_QT6_MODULE_QTGRAPHS) += QtGraphs ### QtHttpServer ### @@ -1095,6 +1115,7 @@ QT6_LIBS-$(PTXCONF_QT6_MODULE_QTQUICK3D) += Qt6Quick3DParticleEffects QT6_LIBS-$(PTXCONF_QT6_MODULE_QTQUICK3D) += Qt6Quick3DParticles QT6_LIBS-$(PTXCONF_QT6_MODULE_QTQUICK3D) += Qt6Quick3DRuntimeRender QT6_LIBS-$(PTXCONF_QT6_MODULE_QTQUICK3D) += Qt6Quick3DUtils +QT6_LIBS-$(PTXCONF_QT6_MODULE_QTQUICK3D) += Qt6Quick3DXr QT6_QML-$(PTXCONF_QT6_MODULE_QTQUICK3D) += QtQuick3D ### QtQuick3DPhysics ### @@ -1103,6 +1124,7 @@ QT6_LIBS-$(PTXCONF_QT6_MODULE_QTQUICK3DPHYSICS) += Qt6Quick3DPhysicsHelpers ### QtQuickTimeline ### QT6_LIBS-$(PTXCONF_QT6_MODULE_QTQUICKTIMELINE) += Qt6QuickTimeline +QT6_LIBS-$(PTXCONF_QT6_MODULE_QTQUICKTIMELINE) += Qt6QuickTimelineBlendTrees ### QtRemoteObjects ### QT6_LIBS-$(PTXCONF_QT6_MODULE_QTREMOTEOBJECTS) += Qt6RemoteObjects @@ -1144,6 +1166,7 @@ QT6_PLUGINS-$(PTXCONF_QT6_MODULE_QTSVG) += imageformats/libqsvg ### QtVirtualKeyboard ### QT6_LIBS-$(PTXCONF_QT6_MODULE_QTVIRTUALKEYBOARD) += Qt6VirtualKeyboard +QT6_LIBS-$(PTXCONF_QT6_MODULE_QTVIRTUALKEYBOARD) += Qt6VirtualKeyboardSettings QT6_PLUGINS-$(PTXCONF_QT6_MODULE_QTVIRTUALKEYBOARD) += platforminputcontexts/libqtvirtualkeyboardplugin ### QtWayland ### -- 2.39.5