Thanks, applied as 2032910173c11b2406fb5a882266487af2894314. Michael
[sent from post-receive hook] On Sat, 20 Jun 2020 00:04:11 +0200, Marco Felsch <[email protected]> wrote: > This patch ports qt5 from version 5.12.6 to 5.14.1. > > Patch "0107-HACK-don-t-resolv-library-paths.patch" is dropped due to > upstream revert fix [1]. > > QtDeclarative: > - The qtdeclarative qml core got refactored > - new modules: Qt5QmlModels and Qt5QmlWorkerScript > > QtWebengine: > - Adds widgets support > > QtSpeech & Qt3DQuick: > - both got new options which are disabled for now till they are needed. > > [1] > https://github.com/qt/qtbase/commit/9864d2c6f3b628ca9f07a56b197e77bd43931cca#diff-ed4563d8a1bafa2ed47afdccc9035d72 > > Signed-off-by: Marco Felsch <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git > a/patches/qt-everywhere-src-5.12.6/0107-HACK-don-t-resolv-library-paths.patch > b/patches/qt-everywhere-src-5.12.6/0107-HACK-don-t-resolv-library-paths.patch > deleted file mode 100644 > index 594fb684ec4f..000000000000 > --- > a/patches/qt-everywhere-src-5.12.6/0107-HACK-don-t-resolv-library-paths.patch > +++ /dev/null > @@ -1,30 +0,0 @@ > -From: Michael Olbrich <[email protected]> > -Date: Fri, 8 Feb 2019 15:56:46 +0100 > -Subject: [PATCH] HACK: don't resolv library paths > - > -qtConfResolveLibs turns '-lfoo' into the full path for libfoo.so and fails > -if the library is not found. > - > -This break when the library is a ld scripts in a relocatable toolchain. > -For example libm.so may contain 'GROUP ( /lib/libm.so.6 ...)' and this path > -is not prefixed with the toolchain sysroot when the absolute path for > -libm.so is used. > - > -Signed-off-by: Michael Olbrich <[email protected]> > ---- > - qtbase/mkspecs/features/qt_configure.prf | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/qtbase/mkspecs/features/qt_configure.prf > b/qtbase/mkspecs/features/qt_configure.prf > -index 95e54d72c9b0..3250187ba774 100644 > ---- a/qtbase/mkspecs/features/qt_configure.prf > -+++ b/qtbase/mkspecs/features/qt_configure.prf > -@@ -593,7 +593,7 @@ defineTest(qtConfResolveLibs) { > - out += $$l > - } > - } > -- $$1 = $$out > -+ $$1 = $$2 > - export($$1) > - !isEmpty(4) { > - $$4 = $$paths > diff --git > a/patches/qt-everywhere-src-5.12.6/0100-qtwayland-use-QT_EGL_NO_X11-and-qt_egl_p.h-everywher.patch > > b/patches/qt-everywhere-src-5.14.1/0100-qtwayland-use-QT_EGL_NO_X11-and-qt_egl_p.h-everywher.patch > similarity index 97% > rename from > patches/qt-everywhere-src-5.12.6/0100-qtwayland-use-QT_EGL_NO_X11-and-qt_egl_p.h-everywher.patch > rename to > patches/qt-everywhere-src-5.14.1/0100-qtwayland-use-QT_EGL_NO_X11-and-qt_egl_p.h-everywher.patch > index 1872c83adcda..218dc7e791b8 100644 > --- > a/patches/qt-everywhere-src-5.12.6/0100-qtwayland-use-QT_EGL_NO_X11-and-qt_egl_p.h-everywher.patch > +++ > b/patches/qt-everywhere-src-5.14.1/0100-qtwayland-use-QT_EGL_NO_X11-and-qt_egl_p.h-everywher.patch > @@ -29,7 +29,7 @@ index 700e95e32df5..7667b5418261 100644 > $$PWD/drmeglserverbufferintegration.cpp > > diff --git > a/qtwayland/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.h > > b/qtwayland/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.h > -index 2c65969f8488..e6387c37158b 100644 > +index 64201476da10..a0a44611b476 100644 > --- > a/qtwayland/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.h > +++ > b/qtwayland/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.h > @@ -48,8 +48,8 @@ > @@ -58,10 +58,10 @@ index 7d6841748c5a..553b49f3fe38 100644 > HEADERS += \ > $$PWD/drmeglserverbufferintegration.h > diff --git > a/qtwayland/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h > > b/qtwayland/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h > -index ff329c1a17fc..3d4f23d9404f 100644 > +index eab5f0c567f2..0342ed19f7ba 100644 > --- > a/qtwayland/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h > +++ > b/qtwayland/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h > -@@ -52,8 +52,8 @@ > +@@ -42,8 +42,8 @@ > #include > <QtWaylandCompositor/private/qwayland-server-server-buffer-extension.h> > > #include <QtCore/QDebug> > diff --git > a/patches/qt-everywhere-src-5.12.6/0101-videonode-egl-use-QT_EGL_NO_X11-and-qt_egl_p.h.patch > > b/patches/qt-everywhere-src-5.14.1/0101-videonode-egl-use-QT_EGL_NO_X11-and-qt_egl_p.h.patch > similarity index 97% > rename from > patches/qt-everywhere-src-5.12.6/0101-videonode-egl-use-QT_EGL_NO_X11-and-qt_egl_p.h.patch > rename to > patches/qt-everywhere-src-5.14.1/0101-videonode-egl-use-QT_EGL_NO_X11-and-qt_egl_p.h.patch > index c3935b41335a..f17db71aaead 100644 > --- > a/patches/qt-everywhere-src-5.12.6/0101-videonode-egl-use-QT_EGL_NO_X11-and-qt_egl_p.h.patch > +++ > b/patches/qt-everywhere-src-5.14.1/0101-videonode-egl-use-QT_EGL_NO_X11-and-qt_egl_p.h.patch > @@ -32,7 +32,7 @@ index 7151123ea7a3..106f982e5ec0 100644 > PLUGIN_EXTENDS = quick > PLUGIN_CLASS_NAME = QSGVideoNodeFactory_EGL > diff --git a/qtmultimedia/src/plugins/videonode/egl/qsgvideonode_egl.h > b/qtmultimedia/src/plugins/videonode/egl/qsgvideonode_egl.h > -index 0ec63eac1798..1a753463a5b7 100644 > +index f83231e538db..5890a7994079 100644 > --- a/qtmultimedia/src/plugins/videonode/egl/qsgvideonode_egl.h > +++ b/qtmultimedia/src/plugins/videonode/egl/qsgvideonode_egl.h > @@ -45,8 +45,7 @@ > diff --git > a/patches/qt-everywhere-src-5.12.6/0102-qt3d-link-with-latomic-if-necessary.patch > > b/patches/qt-everywhere-src-5.14.1/0102-qt3d-link-with-latomic-if-necessary.patch > similarity index 100% > rename from > patches/qt-everywhere-src-5.12.6/0102-qt3d-link-with-latomic-if-necessary.patch > rename to > patches/qt-everywhere-src-5.14.1/0102-qt3d-link-with-latomic-if-necessary.patch > diff --git > a/patches/qt-everywhere-src-5.12.6/0103-eglfs_kms-device-ordering-robustness.patch > > b/patches/qt-everywhere-src-5.14.1/0103-eglfs_kms-device-ordering-robustness.patch > similarity index 100% > rename from > patches/qt-everywhere-src-5.12.6/0103-eglfs_kms-device-ordering-robustness.patch > rename to > patches/qt-everywhere-src-5.14.1/0103-eglfs_kms-device-ordering-robustness.patch > diff --git > a/patches/qt-everywhere-src-5.12.6/0104-ptxdist-qtwebengine-allow-building-with-ptxdist.patch > > b/patches/qt-everywhere-src-5.14.1/0104-ptxdist-qtwebengine-allow-building-with-ptxdist.patch > similarity index 62% > rename from > patches/qt-everywhere-src-5.12.6/0104-ptxdist-qtwebengine-allow-building-with-ptxdist.patch > rename to > patches/qt-everywhere-src-5.14.1/0104-ptxdist-qtwebengine-allow-building-with-ptxdist.patch > index 0a33b37a5df0..ce0652dc75ea 100644 > --- > a/patches/qt-everywhere-src-5.12.6/0104-ptxdist-qtwebengine-allow-building-with-ptxdist.patch > +++ > b/patches/qt-everywhere-src-5.14.1/0104-ptxdist-qtwebengine-allow-building-with-ptxdist.patch > @@ -3,14 +3,16 @@ Date: Tue, 12 May 2015 11:38:35 +0200 > Subject: [PATCH] ptxdist: qtwebengine: allow building with ptxdist > > Signed-off-by: Michael Olbrich <[email protected]> > +[[email protected]: port to 5.14.1] > +Signed-off-by: Marco Felsch <[email protected]> > --- > - qtwebengine/src/core/config/functions.pri | 3 ++- > + qtwebengine/src/buildtools/config/functions.pri | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > -diff --git a/qtwebengine/src/core/config/functions.pri > b/qtwebengine/src/core/config/functions.pri > +diff --git a/qtwebengine/src/buildtools/config/functions.pri > b/qtwebengine/src/buildtools/config/functions.pri > index 8c11faa16ad2..876da9bcfb9e 100644 > ---- a/qtwebengine/src/core/config/functions.pri > -+++ b/qtwebengine/src/core/config/functions.pri > +--- a/qtwebengine/src/buildtools/config/functions.pri > ++++ b/qtwebengine/src/buildtools/config/functions.pri > @@ -1,5 +1,6 @@ > defineReplace(qtwebengine_extractCFlag) { > - CFLAGS = $$QMAKE_CC $$QMAKE_CFLAGS > diff --git > a/patches/qt-everywhere-src-5.12.6/0105-ptxdist-qtwebengine-let-ninja-use-the-jobserver.patch > > b/patches/qt-everywhere-src-5.14.1/0105-ptxdist-qtwebengine-let-ninja-use-the-jobserver.patch > similarity index 62% > rename from > patches/qt-everywhere-src-5.12.6/0105-ptxdist-qtwebengine-let-ninja-use-the-jobserver.patch > rename to > patches/qt-everywhere-src-5.14.1/0105-ptxdist-qtwebengine-let-ninja-use-the-jobserver.patch > index 58de4fe7813d..8ebb457247a1 100644 > --- > a/patches/qt-everywhere-src-5.12.6/0105-ptxdist-qtwebengine-let-ninja-use-the-jobserver.patch > +++ > b/patches/qt-everywhere-src-5.14.1/0105-ptxdist-qtwebengine-let-ninja-use-the-jobserver.patch > @@ -3,20 +3,22 @@ Date: Tue, 14 Nov 2017 21:52:24 +0100 > Subject: [PATCH] ptxdist: qtwebengine: let ninja use the jobserver > > Signed-off-by: Michael Olbrich <[email protected]> > +[[email protected]: port to 5.14.1] > +Signed-off-by: Marco Felsch <[email protected]> > --- > qtwebengine/src/core/gn_run.pro | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/qtwebengine/src/core/gn_run.pro > b/qtwebengine/src/core/gn_run.pro > -index 9860c4541882..777625f96ec0 100644 > +index 377d8363ce51..237f4f308b89 100644 > --- a/qtwebengine/src/core/gn_run.pro > +++ b/qtwebengine/src/core/gn_run.pro > -@@ -49,7 +49,7 @@ build_pass|!debug_and_release { > +@@ -50,7 +50,7 @@ build_pass|!debug_and_release { > ninjaflags = $$(NINJAFLAGS) > isEmpty(ninjaflags):!silent: ninjaflags = "-v" > > -- runninja.commands = $$NINJA $$ninjaflags -C $$gn_build_root > QtWebEngineCore > -+ runninja.commands = +$$NINJA $$ninjaflags -C $$gn_build_root > QtWebEngineCore > +- runninja.commands = $$NINJA $$ninjaflags \$\(NINJAJOBS\) -C > $$gn_build_root QtWebEngineCore > ++ runninja.commands = +$$NINJA $$ninjaflags \$\(NINJAJOBS\) -C > $$gn_build_root QtWebEngineCore > QMAKE_EXTRA_TARGETS += runninja > > build_pass:build_all: default_target.target = all > diff --git > a/patches/qt-everywhere-src-5.12.6/0106-HACK-qtwebengine-workaround-for-too-long-file-names.patch > > b/patches/qt-everywhere-src-5.14.1/0106-HACK-qtwebengine-workaround-for-too-long-file-names.patch > similarity index 94% > rename from > patches/qt-everywhere-src-5.12.6/0106-HACK-qtwebengine-workaround-for-too-long-file-names.patch > rename to > patches/qt-everywhere-src-5.14.1/0106-HACK-qtwebengine-workaround-for-too-long-file-names.patch > index bef3dfc2f62d..be6f6378df69 100644 > --- > a/patches/qt-everywhere-src-5.12.6/0106-HACK-qtwebengine-workaround-for-too-long-file-names.patch > +++ > b/patches/qt-everywhere-src-5.14.1/0106-HACK-qtwebengine-workaround-for-too-long-file-names.patch > @@ -15,10 +15,10 @@ Signed-off-by: Philipp Zabel <[email protected]> > 1 file changed, 9 insertions(+) > > diff --git > a/qtwebengine/src/3rdparty/gn/tools/gn/ninja_action_target_writer.cc > b/qtwebengine/src/3rdparty/gn/tools/gn/ninja_action_target_writer.cc > -index 7e945c0de0ed..cd98df3c5657 100644 > +index 5f4fbaad8827..d579072e3d27 100644 > --- a/qtwebengine/src/3rdparty/gn/tools/gn/ninja_action_target_writer.cc > +++ b/qtwebengine/src/3rdparty/gn/tools/gn/ninja_action_target_writer.cc > -@@ -118,9 +118,18 @@ std::string > NinjaActionTargetWriter::WriteRuleDefinition() { > +@@ -119,9 +119,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-5.12.6/series > b/patches/qt-everywhere-src-5.14.1/series > similarity index 83% > rename from patches/qt-everywhere-src-5.12.6/series > rename to patches/qt-everywhere-src-5.14.1/series > index 9373b8a61c0f..be91a56ca62d 100644 > --- a/patches/qt-everywhere-src-5.12.6/series > +++ b/patches/qt-everywhere-src-5.14.1/series > @@ -9,5 +9,4 @@ > 0104-ptxdist-qtwebengine-allow-building-with-ptxdist.patch > 0105-ptxdist-qtwebengine-let-ninja-use-the-jobserver.patch > 0106-HACK-qtwebengine-workaround-for-too-long-file-names.patch > -0107-HACK-don-t-resolv-library-paths.patch > -# 8c228241c0d280cb7a529289095cb611 - git-ptx-patches magic > +# 696c560ef74cce8b155152065aa1f46e - git-ptx-patches magic > diff --git a/rules/host-qt5.make b/rules/host-qt5.make > index 28c33de88545..f7e8de1c5219 100644 > --- a/rules/host-qt5.make > +++ b/rules/host-qt5.make > @@ -45,6 +45,7 @@ HOST_QT5_CONF_OPT := \ > --enable-shared \ > --disable-trace \ > --disable-rpath \ > + -reduce-exports \ > --disable-pch \ > --disable-ltcg \ > $(if $(filter 0,$(PTXDIST_VERBOSE)),-silent) \ > @@ -54,7 +55,6 @@ HOST_QT5_CONF_OPT := \ > -skip qt3d \ > -skip qtactiveqt \ > -skip qtandroidextras \ > - -skip qtcanvas3d \ > -skip qtcharts \ > -skip qtconnectivity \ > -skip qtdatavis3d \ > @@ -64,10 +64,12 @@ HOST_QT5_CONF_OPT := \ > -skip qtgraphicaleffects \ > -skip qtimageformats \ > -skip qtlocation \ > + -skip qtlottie \ > -skip qtmacextras \ > -skip qtmultimedia \ > -skip qtnetworkauth \ > -skip qtpurchasing \ > + -skip qtquick3d \ > -skip qtquickcontrols \ > -skip qtquickcontrols2 \ > -skip qtremoteobjects \ > @@ -92,6 +94,7 @@ HOST_QT5_CONF_OPT := \ > -skip qtxmlpatterns \ > -make libs \ > -make tools \ > + -nomake examples \ > --disable-compile-examples \ > --disable-gui \ > --disable-widgets \ > @@ -118,6 +121,8 @@ HOST_QT5_CONF_OPT := \ > -qt-harfbuzz \ > --disable-gtk \ > --opengl=no \ > + --disable-opengles3 \ > + --disable-egl \ > --disable-xcb-xlib \ > \ > --disable-directfb \ > @@ -125,7 +130,6 @@ HOST_QT5_CONF_OPT := \ > --disable-gbm \ > --disable-kms \ > --disable-linuxfb \ > - --disable-mirclient \ > --disable-xcb \ > \ > --disable-libudev \ > @@ -153,8 +157,7 @@ HOST_QT5_CONF_OPT := \ > > # Note: these options are not listed in '--help' but they exist > HOST_QT5_CONF_OPT += \ > - --disable-sm \ > - --disable-egl > + --disable-sm > > HOST_QT5_QT_CONF := $(PTXDIST_SYSROOT_HOST)/bin/qt5/qt.conf > > diff --git a/rules/qt5.in b/rules/qt5.in > index 162ea8b9beba..5590b623792d 100644 > --- a/rules/qt5.in > +++ b/rules/qt5.in > @@ -377,16 +377,6 @@ endif > > endif > > -config QT5_MODULE_QTCANVAS3D > - bool > - select QT5_MODULE_QTDECLARATIVE > - prompt "QtCanvas3D" > - > -config QT5_MODULE_QTCANVAS3D_QUICK > - bool > - depends on QT5_MODULE_QTCANVAS3D > - default QT5_MODULE_QTDECLARATIVE > - > config QT5_MODULE_QTCHARTS > bool > prompt "QtCharts" > @@ -477,6 +467,10 @@ config QT5_MODULE_QTLOCATION > bool > prompt "QtLocation" > > +config QT5_MODULE_QTLOTTIE > + bool > + prompt "QtLottie" > + > config QT5_MODULE_QTLOCATION_QUICK > bool > depends on QT5_MODULE_QTLOCATION > @@ -513,6 +507,11 @@ config QT5_MODULE_QTPURCHASING > select QT5_MODULE_QTDECLARATIVE > prompt "QtPurchasing" > > +config QT5_MODULE_QTQUICK3D > + bool > + select QT5_MODULE_QTDECLARATIVE > + prompt "QtQuick3D" > + > config QT5_MODULE_QTQUICKCONTROLS > bool > select QT5_ACCESSIBILITY > diff --git a/rules/qt5.make b/rules/qt5.make > index 09165890e0cd..4f7ada8ad87d 100644 > --- a/rules/qt5.make > +++ b/rules/qt5.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_QT5) += qt5 > # > # Paths and names > # > -QT5_VERSION := 5.12.6 > -QT5_MD5 := 287d71e71ebd97f77220873e7b131b1a > +QT5_VERSION := 5.14.1 > +QT5_MD5 := 781c3179410aff7ef84607214e1e91b4 > QT5 := qt-everywhere-src-$(QT5_VERSION) > QT5_SUFFIX := tar.xz > QT5_URL := \ > @@ -120,11 +120,13 @@ QT5_CONF_OPT := \ > --disable-gc-binaries \ > --enable-shared \ > -xplatform linux-ptx-g++ \ > + --disable-qtlibinfix-plugins \ > --disable-trace \ > --disable-rpath \ > -reduce-exports \ > --disable-pch \ > --$(call ptx/endis, PTXCONF_ARCH_X86)-ltcg \ > + -linker bfd \ > $(if $(filter 0,$(PTXDIST_VERBOSE)),-silent) \ > \ > -pkg-config \ > @@ -132,7 +134,6 @@ QT5_CONF_OPT := \ > $(call ptx/qt5-module, QT3D, qt3d) \ > -skip qtactiveqt \ > -skip qtandroidextras \ > - $(call ptx/qt5-module, QTCANVAS3D, qtcanvas3d) \ > $(call ptx/qt5-module, QTCHARTS, qtcharts) \ > $(call ptx/qt5-module, QTCONNECTIVITY, qtconnectivity) \ > $(call ptx/qt5-module, QTDATAVIS3D, qtdatavis3d) \ > @@ -142,10 +143,12 @@ QT5_CONF_OPT := \ > $(call ptx/qt5-module, QTGRAPHICALEFFECTS, qtgraphicaleffects) \ > $(call ptx/qt5-module, QTIMAGEFORMATS, qtimageformats) \ > $(call ptx/qt5-module, QTLOCATION, qtlocation) \ > + $(call ptx/qt5-module, QTLOTTIE, qtlottie) \ > -skip qtmacextras \ > $(call ptx/qt5-module, QTMULTIMEDIA, qtmultimedia) \ > $(call ptx/qt5-module, QTNETWORKAUTH, qtnetworkauth) \ > $(call ptx/qt5-module, QTPURCHASING, qtpurchasing) \ > + $(call ptx/qt5-module, QTQUICK3D, qtquick3d) \ > $(call ptx/qt5-module, QTQUICKCONTROLS, qtquickcontrols) \ > $(call ptx/qt5-module, QTQUICKCONTROLS2, qtquickcontrols2) \ > $(call ptx/qt5-module, QTREMOTEOBJECTS, qtremoteobjects) \ > @@ -207,7 +210,6 @@ QT5_CONF_OPT := \ > --$(call ptx/endis, PTXCONF_QT5_PLATFORM_EGLFS_KMS)-gbm \ > --$(call ptx/endis, PTXCONF_QT5_PLATFORM_BACKEND_KMS)-kms \ > --$(call ptx/endis, PTXCONF_QT5_PLATFORM_LINUXFB)-linuxfb \ > - --disable-mirclient \ > $(call ptx/qt5-system, QT5_PLATFORM_XCB)-xcb \ > \ > --$(call ptx/endis, PTXCONF_QT5_LIBUDEV)-libudev \ > @@ -233,6 +235,10 @@ QT5_CONF_OPT := \ > --$(call ptx/endis, PTXCONF_QT5_MODULE_QTBASE_SQL_SQLITE)-sql-sqlite \ > $(call ptx/qt5-system, PTXCONF_QT5_MODULE_QTBASE_SQL_SQLITE)-sqlite > > +ifdef PTXCONF_QT5_MODULE_QT3D_QUICK > +QT5_CONF_OPT += \ > + -qt-assimp > +endif > ifdef PTXCONF_QT5_MODULE_QTQUICKCONTROLS2 > QT5_CONF_OPT += \ > --$(call ptx/endis, > PTXCONF_QT5_MODULE_QTQUICKCONTROLS2_STYLE_FUSION)-style-fusion \ > @@ -247,6 +253,16 @@ QT5_CONF_OPT += \ > --enable-alsa \ > $(call ptx/ifdef, PTXCONF_QT5_MODULE_QTMULTIMEDIA_GST,-gstreamer > 1.0,-no-gstreamer) > endif > +ifdef PTXCONF_QT5_MODULE_QTQUICK3D > +QT5_CONF_OPT += \ > + -qt-assimp > +endif > +ifdef PTXCONF_QT5_MODULE_QTSPEECH > +QT5_CONF_OPT += \ > + --disable-flite \ > + --disable-flite-alsa \ > + --disable-speechd > +endif > ifdef PTXCONF_QT5_MODULE_QTWEBENGINE > QT5_CONF_OPT += \ > --$(call ptx/endis, > PTXCONF_QT5_MODULE_QTWEBENGINE_MEDIA)-webengine-alsa \ > @@ -259,7 +275,8 @@ QT5_CONF_OPT += \ > --disable-webengine-printing-and-pdf \ > --disable-webengine-proprietary-codecs \ > --disable-webengine-spellchecker \ > - --disable-webengine-webrtc > + --disable-webengine-webrtc \ > + --$(call ptx/endis, PTXCONF_QT5_WIDGETS)-webengine-widgets > endif > > ifdef PTXCONF_QT5_GUI > @@ -270,7 +287,9 @@ endif > > # Note: these options are not listed in '--help' but they exist > QT5_CONF_OPT += \ > - --disable-sm > + --disable-sm \ > + --disable-vulkan \ > + -no-feature-wayland-vulkan-server-buffer > > ifdef PTXCONF_QT5_MODULE_QTDECLARATIVE > QT5_CONF_OPT += \ > @@ -326,24 +345,26 @@ $(STATEDIR)/qt5.install: > xargs sed -i 's;$(PTXDIST_WORKSPACE);@WORKSPACE@;g' > @$(call touch) > > -QT5_QT_CONF := $(PTXDIST_SYSROOT_CROSS)/bin/qt5/qt.conf > +QT5_QT_CONF := $(PTXDIST_SYSROOT_TARGET)/usr/bin/qt5/qt.conf > > $(STATEDIR)/qt5.install.post: > @$(call targetinfo) > @find $(QT5_PKGDIR) -name '*.pri' -o -name '*.cmake' | \ > xargs sed -i 's;@WORKSPACE@;$(PTXDIST_WORKSPACE);g' > @$(call world/install.post, QT5) > - @rm -rf $(PTXDIST_SYSROOT_CROSS)/bin/qt5 > - @cp -a $(SYSROOT)/usr/bin/qt5 $(PTXDIST_SYSROOT_CROSS)/bin/qt5 > @echo "[Paths]" > > $(QT5_QT_CONF) > @echo "HostPrefix=$(SYSROOT)/usr" >> > $(QT5_QT_CONF) > @echo "HostData=$(SYSROOT)/usr/lib/qt5" >> > $(QT5_QT_CONF) > @echo "HostBinaries=$(PTXDIST_SYSROOT_CROSS)/bin/qt5" >> > $(QT5_QT_CONF) > - @echo "Prefix=$(SYSROOT)/usr" >> > $(QT5_QT_CONF) > + @echo "Prefix=/usr" >> > $(QT5_QT_CONF) > @echo "Headers=$(SYSROOT)/usr/include/qt5" >> > $(QT5_QT_CONF) > + @echo "Libraries=$(SYSROOT)/usr/lib" >> > $(QT5_QT_CONF) > @echo "Imports=/usr/lib/qt5/imports" >> > $(QT5_QT_CONF) > @echo "Qml2Imports=/usr/lib/qt5/qml" >> > $(QT5_QT_CONF) > @echo "" >> > $(QT5_QT_CONF) > +# # qmake is found in sysroot-cross (via PATH) and sysroot target (via > cmake) > + @rm -rf $(PTXDIST_SYSROOT_CROSS)/bin/qt5 > + @cp -a $(SYSROOT)/usr/bin/qt5 $(PTXDIST_SYSROOT_CROSS)/bin/qt5 > @$(call touch) > > > @@ -360,6 +381,7 @@ QT5_LIBS-$(PTXCONF_QT5_MODULE_QT3D_QUICK) > += Qt53DQuick Qt53DQuickAnimation Qt > QT5_QML-$(PTXCONF_QT5_MODULE_QT3D_QUICK) += Qt3D > QT5_PLUGINS-$(PTXCONF_QT5_MODULE_QT3D) += > geometryloaders/libdefaultgeometryloader > QT5_PLUGINS-$(PTXCONF_QT5_MODULE_QT3D) += > geometryloaders/libgltfgeometryloader > +QT5_PLUGINS-$(PTXCONF_QT5_MODULE_QT3D) += > sceneparsers/libassimpsceneimport > QT5_PLUGINS-$(PTXCONF_QT5_MODULE_QT3D) += > sceneparsers/libgltfsceneexport > QT5_PLUGINS-$(PTXCONF_QT5_MODULE_QT3D) += > sceneparsers/libgltfsceneimport > QT5_PLUGINS-$(PTXCONF_QT5_MODULE_QT3D_QUICK) += > renderplugins/libscene2d > @@ -410,9 +432,6 @@ QT5_PLUGINS-$(PTXCONF_QT5_PLATFORM_XCB) > += xcbglintegrations/libqxcb-egl-inte > QT5_PLUGINS-$(PTXCONF_QT5_MODULE_QTBASE_SQL_MYSQL) += > sqldrivers/libqsqlmysql > QT5_PLUGINS-$(PTXCONF_QT5_MODULE_QTBASE_SQL_SQLITE) += > sqldrivers/libqsqlite > > -### QtCanvas3d ### > -QT5_QML-$(PTXCONF_QT5_MODULE_QTCANVAS3D_QUICK) += > QtCanvas3D > - > ### QtCharts ### > QT5_LIBS-$(PTXCONF_QT5_MODULE_QTCHARTS) += > Qt5Charts > QT5_QML-$(PTXCONF_QT5_MODULE_QTCHARTS_QUICK) += QtCharts > @@ -429,6 +448,8 @@ QT5_QML-$(PTXCONF_QT5_MODULE_QTDATAVIS3D_QUICK) > += QtDataVisualization > > ### QtDeclarative ### > QT5_LIBS-$(PTXCONF_QT5_MODULE_QTDECLARATIVE) += Qt5Qml > +QT5_LIBS-$(PTXCONF_QT5_MODULE_QTDECLARATIVE_QUICK) += Qt5QmlModels > +QT5_LIBS-$(PTXCONF_QT5_MODULE_QTDECLARATIVE_QUICK) += > Qt5QmlWorkerScript > QT5_LIBS-$(PTXCONF_QT5_MODULE_QTDECLARATIVE_QUICK) += Qt5Quick > QT5_LIBS-$(PTXCONF_QT5_MODULE_QTDECLARATIVE_QUICK) += > Qt5QuickShapes > QT5_LIBS-$(PTXCONF_QT5_MODULE_QTDECLARATIVE_QUICK_WIDGETS) += > Qt5QuickWidgets > @@ -481,6 +502,9 @@ QT5_PLUGINS-$(PTXCONF_QT5_MODULE_QTLOCATION_QUICK) > += geoservices/libqtgeoservi > QT5_QML-$(PTXCONF_QT5_MODULE_QTLOCATION_QUICK) += > QtLocation > QT5_QML-$(PTXCONF_QT5_MODULE_QTLOCATION_QUICK) += > QtPositioning > > +### QtLottie ### > +QT5_LIBS-$(PTXCONF_QT5_MODULE_QTLOTTIE) += > Qt5Bodymovin > + > ### QtMultimedia ### > QT5_LIBS-$(PTXCONF_QT5_MODULE_QTMULTIMEDIA) += Qt5Multimedia > QT5_LIBS-$(PTXCONF_QT5_MODULE_QTMULTIMEDIA_QUICK) += > Qt5MultimediaQuick > @@ -507,6 +531,14 @@ QT5_LIBS-$(PTXCONF_QT5_MODULE_QTNETWORKAUTH) > += Qt5NetworkAuth > QT5_LIBS-$(PTXCONF_QT5_MODULE_QTPURCHASING) += Qt5Purchasing > QT5_QML-$(PTXCONF_QT5_MODULE_QTPURCHASING) += QtPurchasing > > +### QtQuick3D ### > +QT5_LIBS-$(PTXCONF_QT5_MODULE_QTQUICK3D) += Qt5Quick3D > +QT5_LIBS-$(PTXCONF_QT5_MODULE_QTQUICK3D) += > Qt5Quick3DAssetImport > +QT5_LIBS-$(PTXCONF_QT5_MODULE_QTQUICK3D) += > Qt5Quick3DRender > +QT5_LIBS-$(PTXCONF_QT5_MODULE_QTQUICK3D) += > Qt5Quick3DRuntimeRender > +QT5_LIBS-$(PTXCONF_QT5_MODULE_QTQUICK3D) += > Qt5Quick3DUtils > +QT5_QML-$(PTXCONF_QT5_MODULE_QTQUICK3D) += > QtQuick3D > + > ### QtQuickControls ### > # all in QT5_QML- added by QtDeclarative > > @@ -528,6 +560,7 @@ QT5_QML-$(PTXCONF_QT5_MODULE_QTSCXML_QUICK) > += QtScxml > > ### QtSensors ### > QT5_LIBS-$(PTXCONF_QT5_MODULE_QTSENSORS) += Qt5Sensors > +QT5_PLUGINS-$(PTXCONF_QT5_MODULE_QTSENSORS) += > sensorgestures/libqtsensorgestures_counterplugin > QT5_PLUGINS-$(PTXCONF_QT5_MODULE_QTSENSORS) += > sensorgestures/libqtsensorgestures_plugin > QT5_PLUGINS-$(PTXCONF_QT5_MODULE_QTSENSORS) += > sensorgestures/libqtsensorgestures_shakeplugin > QT5_PLUGINS-$(PTXCONF_QT5_MODULE_QTSENSORS) += > sensors/libqtsensors_generic _______________________________________________ ptxdist mailing list [email protected] To unsubscribe, send a mail with subject "unsubscribe" to [email protected]
