From 9e014ef321a334cd2fe87901f15737284c07ef26 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 15 Jun 2020 15:08:12 +0300 Subject: [PATCH] Update modules --- recipes-qt/qt6/qt5compat_git.bb | 2 +- recipes-qt/qt6/qtbase_git.bb | 2 +- ...ctNode-is-available-only-with-opengl.patch | 30 ---- ...CMake-Fix-failing-linux-static-build.patch | 38 +++++ recipes-qt/qt6/qtdeclarative_git.bb | 4 +- recipes-qt/qt6/qtgraphicaleffects_git.bb | 2 +- recipes-qt/qt6/qtimageformats_git.bb | 2 +- recipes-qt/qt6/qtnetworkauth_git.bb | 2 +- recipes-qt/qt6/qtquick3d_git.bb | 2 +- recipes-qt/qt6/qtquickcontrols2_git.bb | 2 +- recipes-qt/qt6/qtquicktimeline_git.bb | 2 +- recipes-qt/qt6/qtremoteobjects_git.bb | 2 +- recipes-qt/qt6/qtscxml_git.bb | 2 +- recipes-qt/qt6/qtserialbus_git.bb | 2 +- recipes-qt/qt6/qtserialport_git.bb | 2 +- recipes-qt/qt6/qtshadertools_git.bb | 2 +- recipes-qt/qt6/qtsvg_git.bb | 2 +- .../0001-DesktopWidget-is-no-more.patch | 108 -------------- .../qttools/0001-Regenerate-CMakeLists.patch | 141 ++++++------------ recipes-qt/qt6/qttools_git.bb | 3 +- recipes-qt/qt6/qttranslations_git.bb | 2 +- recipes-qt/qt6/qtvirtualkeyboard_git.bb | 2 +- recipes-qt/qt6/qtwayland_git.bb | 2 +- recipes-qt/qt6/qtwebchannel_git.bb | 2 +- recipes-qt/qt6/qtwebsockets_git.bb | 2 +- 25 files changed, 105 insertions(+), 257 deletions(-) delete mode 100644 recipes-qt/qt6/qtdeclarative/0001-QSGRhiShaderEffectNode-is-available-only-with-opengl.patch create mode 100644 recipes-qt/qt6/qtdeclarative/0001-Revert-CMake-Fix-failing-linux-static-build.patch delete mode 100644 recipes-qt/qt6/qttools/0001-DesktopWidget-is-no-more.patch diff --git a/recipes-qt/qt6/qt5compat_git.bb b/recipes-qt/qt6/qt5compat_git.bb index cc949ca..2c070f4 100644 --- a/recipes-qt/qt6/qt5compat_git.bb +++ b/recipes-qt/qt6/qt5compat_git.bb @@ -15,4 +15,4 @@ include recipes-qt/qt6/qt6-git.inc DEPENDS += "qtbase" -SRCREV = "9291b33c7569287c54acca000ecb1a8d13922365" +SRCREV = "b5e4d3afc4a76d386493affb38ad7abb433cb732" diff --git a/recipes-qt/qt6/qtbase_git.bb b/recipes-qt/qt6/qtbase_git.bb index 5672747..a138a11 100644 --- a/recipes-qt/qt6/qtbase_git.bb +++ b/recipes-qt/qt6/qtbase_git.bb @@ -137,4 +137,4 @@ FILES_${PN}-tools += "\ BBCLASSEXTEND =+ "native nativesdk" -SRCREV = "85c1009dbbb73fc9bee5911d70cdd96469ad8270" +SRCREV = "bd793d3c46ec08ff84dd67db467def8578922697" diff --git a/recipes-qt/qt6/qtdeclarative/0001-QSGRhiShaderEffectNode-is-available-only-with-opengl.patch b/recipes-qt/qt6/qtdeclarative/0001-QSGRhiShaderEffectNode-is-available-only-with-opengl.patch deleted file mode 100644 index 7bf7620..0000000 --- a/recipes-qt/qt6/qtdeclarative/0001-QSGRhiShaderEffectNode-is-available-only-with-opengl.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 83f44da23305ab563454e6fd7e9f83e09508a227 Mon Sep 17 00:00:00 2001 -From: Samuli Piippo -Date: Tue, 9 Jun 2020 10:15:07 +0300 -Subject: [PATCH] QSGRhiShaderEffectNode is available only with opengl - -Fixes build without opengl - -Change-Id: Ica5752c21567b730065ec6276a9016b3989f9d02 ---- - src/quick/items/qquickrendercontrol.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/quick/items/qquickrendercontrol.cpp b/src/quick/items/qquickrendercontrol.cpp -index f8d2d14fcb..972c4ce279 100644 ---- a/src/quick/items/qquickrendercontrol.cpp -+++ b/src/quick/items/qquickrendercontrol.cpp -@@ -200,8 +200,8 @@ void QQuickRenderControlPrivate::windowDestroyed() - rc->invalidate(); - - QQuickWindowPrivate::get(window)->animationController.reset(); --#if QT_CONFIG(quick_shadereffect) -- QSGRhiShaderEffectNode::cleanupMaterialTypeCache(); -+#if QT_CONFIG(quick_shadereffect) && QT_CONFIG(opengl) -+ QSGRhiShaderEffectNode::cleanupMaterialTypeCache(); - #endif - window = nullptr; - } --- -2.25.1 - diff --git a/recipes-qt/qt6/qtdeclarative/0001-Revert-CMake-Fix-failing-linux-static-build.patch b/recipes-qt/qt6/qtdeclarative/0001-Revert-CMake-Fix-failing-linux-static-build.patch new file mode 100644 index 0000000..ea0562e --- /dev/null +++ b/recipes-qt/qt6/qtdeclarative/0001-Revert-CMake-Fix-failing-linux-static-build.patch @@ -0,0 +1,38 @@ +From 5e36994cfdcaa65d3fbf8f37127aca47d8f489fc Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +Date: Mon, 15 Jun 2020 13:17:50 +0300 +Subject: [PATCH] Revert "CMake: Fix failing linux static build" + +This reverts commit 974c8da34d79cd8fc417ff5d69bc00c1e910e5ac. +--- + tools/qmleasing/CMakeLists.txt | 1 - + tools/qmltestrunner/CMakeLists.txt | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/tools/qmleasing/CMakeLists.txt b/tools/qmleasing/CMakeLists.txt +index 8d6359792e..a057e4c50c 100644 +--- a/tools/qmleasing/CMakeLists.txt ++++ b/tools/qmleasing/CMakeLists.txt +@@ -15,7 +15,6 @@ qt_add_executable(qmleasing + segmentproperties.cpp segmentproperties.h + splineeditor.cpp splineeditor.h + PUBLIC_LIBRARIES +- Qt::OpenGL # special case QTBUG-83498 + Qt::Gui + Qt::Qml + Qt::Quick +diff --git a/tools/qmltestrunner/CMakeLists.txt b/tools/qmltestrunner/CMakeLists.txt +index ab51d42a17..f1df677621 100644 +--- a/tools/qmltestrunner/CMakeLists.txt ++++ b/tools/qmltestrunner/CMakeLists.txt +@@ -10,7 +10,6 @@ qt_add_tool(qmltestrunner + SOURCES + main.cpp + PUBLIC_LIBRARIES +- Qt::OpenGL # special case QTBUG-83498 + Qt::Gui + Qt::Qml + Qt::QuickTest +-- +2.25.1 + diff --git a/recipes-qt/qt6/qtdeclarative_git.bb b/recipes-qt/qt6/qtdeclarative_git.bb index b05fb15..be0928e 100644 --- a/recipes-qt/qt6/qtdeclarative_git.bb +++ b/recipes-qt/qt6/qtdeclarative_git.bb @@ -14,11 +14,11 @@ include recipes-qt/qt6/qt6.inc SRC_URI += "\ file://0001-Regenerate-CMakeLists.patch \ - file://0001-QSGRhiShaderEffectNode-is-available-only-with-opengl.patch \ + file://0001-Revert-CMake-Fix-failing-linux-static-build.patch \ " DEPENDS += "qtbase qtdeclarative-native" BBCLASSEXTEND =+ "native nativesdk" -SRCREV = "6a48a81319b886c8a3f85e1eb024186b05d0f3af" +SRCREV = "1f3dd3f5db16892739963168c2a76df6354b178c" diff --git a/recipes-qt/qt6/qtgraphicaleffects_git.bb b/recipes-qt/qt6/qtgraphicaleffects_git.bb index 932dc1c..aa339a1 100644 --- a/recipes-qt/qt6/qtgraphicaleffects_git.bb +++ b/recipes-qt/qt6/qtgraphicaleffects_git.bb @@ -17,4 +17,4 @@ include recipes-qt/qt6/qt6.inc DEPENDS += "qtbase qtdeclarative" -SRCREV = "b7e24192352bee955d37a89fc061f1dafd32b73a" +SRCREV = "bf12c14bac21a5a21e45c72ea39a0c25b0e5214d" diff --git a/recipes-qt/qt6/qtimageformats_git.bb b/recipes-qt/qt6/qtimageformats_git.bb index 677388c..ca22f9c 100644 --- a/recipes-qt/qt6/qtimageformats_git.bb +++ b/recipes-qt/qt6/qtimageformats_git.bb @@ -18,4 +18,4 @@ include recipes-qt/qt6/qt6.inc DEPENDS += "qtbase" -SRCREV = "c64f19516dd2467bf5746eb24afe883bdbc15b25" +SRCREV = "75a5ecb71b1709d163b02992dd210245333f897a" diff --git a/recipes-qt/qt6/qtnetworkauth_git.bb b/recipes-qt/qt6/qtnetworkauth_git.bb index 0d7d87c..6bfba25 100644 --- a/recipes-qt/qt6/qtnetworkauth_git.bb +++ b/recipes-qt/qt6/qtnetworkauth_git.bb @@ -11,4 +11,4 @@ include recipes-qt/qt6/qt6.inc DEPENDS += "qtbase" -SRCREV = "d526ac37c55c5573f19a85580880b428d6fca510" +SRCREV = "9d99e32ada7b74abc357379a3d77dd43d79d23a3" diff --git a/recipes-qt/qt6/qtquick3d_git.bb b/recipes-qt/qt6/qtquick3d_git.bb index e998ccf..0f9de88 100644 --- a/recipes-qt/qt6/qtquick3d_git.bb +++ b/recipes-qt/qt6/qtquick3d_git.bb @@ -24,7 +24,7 @@ _FILES_${PN}-qmlplugins += " \ ${OE_QMAKE_PATH_QML}/QtQuick3D/Helpers/meshes/*.mesh \ " -SRCREV_qtquick3d = "837f84f17dbf76b1e24ba212c5e1abe34dffb2f1" +SRCREV_qtquick3d = "d56a64a046f6389ca242f28408bccec99e9fa802" SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df" SRCREV_FORMAT = "qtquick3d_assimp" diff --git a/recipes-qt/qt6/qtquickcontrols2_git.bb b/recipes-qt/qt6/qtquickcontrols2_git.bb index 34536ae..ae7326b 100644 --- a/recipes-qt/qt6/qtquickcontrols2_git.bb +++ b/recipes-qt/qt6/qtquickcontrols2_git.bb @@ -16,4 +16,4 @@ do_configure_prepend() { sed -i -e 's/QmlTools//' ${S}/CMakeLists.txt } -SRCREV = "135327c494b00bbc9d0c4deffba92d55c08ea93f" +SRCREV = "5fc8b4aa8ccab9e9a2a5d8891c1b9ef979f70f28" diff --git a/recipes-qt/qt6/qtquicktimeline_git.bb b/recipes-qt/qt6/qtquicktimeline_git.bb index 0554a4f..52ce852 100644 --- a/recipes-qt/qt6/qtquicktimeline_git.bb +++ b/recipes-qt/qt6/qtquicktimeline_git.bb @@ -11,4 +11,4 @@ include recipes-qt/qt6/qt6.inc DEPENDS = "qtbase qtdeclarative" -SRCREV = "d9ee20de4a42a7e0452e0476860869e112fcd928" +SRCREV = "22f83df73ce683612b0044cc1c5b30d14d0ebab5" diff --git a/recipes-qt/qt6/qtremoteobjects_git.bb b/recipes-qt/qt6/qtremoteobjects_git.bb index 3a5ee31..124495f 100644 --- a/recipes-qt/qt6/qtremoteobjects_git.bb +++ b/recipes-qt/qt6/qtremoteobjects_git.bb @@ -15,4 +15,4 @@ DEPENDS += "qtbase qtdeclarative qtremoteobjects-native" BBCLASSEXTEND += "native nativesdk" -SRCREV = "eb5b6193439cadf4d1dab5d1cbc918afbc656a5f" +SRCREV = "1c3eb63e32499da17a890a87c730c92ce02fcf45" diff --git a/recipes-qt/qt6/qtscxml_git.bb b/recipes-qt/qt6/qtscxml_git.bb index 4bff975..3a5d146 100644 --- a/recipes-qt/qt6/qtscxml_git.bb +++ b/recipes-qt/qt6/qtscxml_git.bb @@ -14,4 +14,4 @@ DEPENDS += "qtbase qtdeclarative qtscxml-native" BBCLASSEXTEND += "native nativesdk" -SRCREV = "3409281d09a5e6579a58fc785a5079cdcf6b6035" +SRCREV = "045234b0d9c3ab8d98ed59949dcb9dc6ba804b2c" diff --git a/recipes-qt/qt6/qtserialbus_git.bb b/recipes-qt/qt6/qtserialbus_git.bb index 150b7e8..f0ec4c7 100644 --- a/recipes-qt/qt6/qtserialbus_git.bb +++ b/recipes-qt/qt6/qtserialbus_git.bb @@ -15,4 +15,4 @@ DEPENDS += "qtbase qtserialport qtserialbus-native" BBCLASSEXTEND =+ "native nativesdk" -SRCREV = "5958aa3e8cdccbb6122a3f8ef34ca2261496d080" +SRCREV = "a733079f1e618ec4a3411e39ebdaeac10614b0ff" diff --git a/recipes-qt/qt6/qtserialport_git.bb b/recipes-qt/qt6/qtserialport_git.bb index bcac903..684aea7 100644 --- a/recipes-qt/qt6/qtserialport_git.bb +++ b/recipes-qt/qt6/qtserialport_git.bb @@ -16,4 +16,4 @@ DEPENDS += "qtbase" BBCLASSEXTEND =+ "native nativesdk" -SRCREV = "543e41db0f13f552c5bb36e58b39045b70f369b5" +SRCREV = "63f9461f69dc00ee26e476f754fa0a65e8c63263" diff --git a/recipes-qt/qt6/qtshadertools_git.bb b/recipes-qt/qt6/qtshadertools_git.bb index 5a32446..5f8d22f 100644 --- a/recipes-qt/qt6/qtshadertools_git.bb +++ b/recipes-qt/qt6/qtshadertools_git.bb @@ -16,4 +16,4 @@ DEPENDS = "qtbase qtshadertools-native" BBCLASSEXTEND =+ "native nativesdk" -SRCREV = "714331c8fe377d04ec43828fe03792609b8f006a" +SRCREV = "0c2a0a770ae9d1502bc817bb30106d4abd2026ca" diff --git a/recipes-qt/qt6/qtsvg_git.bb b/recipes-qt/qt6/qtsvg_git.bb index 4ef5e7e..de57f8d 100644 --- a/recipes-qt/qt6/qtsvg_git.bb +++ b/recipes-qt/qt6/qtsvg_git.bb @@ -13,4 +13,4 @@ include recipes-qt/qt6/qt6.inc DEPENDS += "qtbase" -SRCREV = "74cf1f940c2f21c5e1dc01f8b57ddd7ea022aec1" +SRCREV = "55cd0c4e3c23ab75ec20e152b24c6fe0e344b922" diff --git a/recipes-qt/qt6/qttools/0001-DesktopWidget-is-no-more.patch b/recipes-qt/qt6/qttools/0001-DesktopWidget-is-no-more.patch deleted file mode 100644 index 3612170..0000000 --- a/recipes-qt/qt6/qttools/0001-DesktopWidget-is-no-more.patch +++ /dev/null @@ -1,108 +0,0 @@ -From 0460bcf1b99ea640c2bb25e46c85c41f631c1dc6 Mon Sep 17 00:00:00 2001 -From: Samuli Piippo -Date: Tue, 9 Jun 2020 11:57:28 +0300 -Subject: [PATCH] DesktopWidget is no more - -Change-Id: Iaee232b831b46db43930b14e9b0dc9706e6d01eb ---- - src/designer/src/designer/qdesigner_actions.cpp | 1 - - src/designer/src/lib/shared/deviceprofile.cpp | 3 +-- - src/designer/src/lib/shared/newformwidget.cpp | 1 - - src/designer/src/lib/shared/selectsignaldialog.cpp | 1 - - src/linguist/linguist/mainwindow.cpp | 1 - - src/pixeltool/qpixeltool.cpp | 3 +-- - 6 files changed, 2 insertions(+), 8 deletions(-) - -diff --git a/src/designer/src/designer/qdesigner_actions.cpp b/src/designer/src/designer/qdesigner_actions.cpp -index cf404d51..e0a7d713 100644 ---- a/src/designer/src/designer/qdesigner_actions.cpp -+++ b/src/designer/src/designer/qdesigner_actions.cpp -@@ -67,7 +67,6 @@ - #include - #include - #include --#include - - #include - #include -diff --git a/src/designer/src/lib/shared/deviceprofile.cpp b/src/designer/src/lib/shared/deviceprofile.cpp -index c2df77ff..a8a28118 100644 ---- a/src/designer/src/lib/shared/deviceprofile.cpp -+++ b/src/designer/src/lib/shared/deviceprofile.cpp -@@ -34,7 +34,6 @@ - - #include - #include --#include - #include - #include - #include -@@ -202,7 +201,7 @@ void DeviceProfile::setName(const QString &n) - - void DeviceProfile::systemResolution(int *dpiX, int *dpiY) - { -- const QDesktopWidget *dw = qApp->desktop(); -+ const QWidget *dw = qApp->desktop(); - *dpiX = dw->logicalDpiX(); - *dpiY = dw->logicalDpiY(); - } -diff --git a/src/designer/src/lib/shared/newformwidget.cpp b/src/designer/src/lib/shared/newformwidget.cpp -index f5cae7fc..bef69726 100644 ---- a/src/designer/src/lib/shared/newformwidget.cpp -+++ b/src/designer/src/lib/shared/newformwidget.cpp -@@ -49,7 +49,6 @@ - #include - - #include --#include - #include - #include - #include -diff --git a/src/designer/src/lib/shared/selectsignaldialog.cpp b/src/designer/src/lib/shared/selectsignaldialog.cpp -index f7308f0f..f19f86cd 100644 ---- a/src/designer/src/lib/shared/selectsignaldialog.cpp -+++ b/src/designer/src/lib/shared/selectsignaldialog.cpp -@@ -38,7 +38,6 @@ - #include "widgetdatabase_p.h" - - #include --#include - #include - #include - #include -diff --git a/src/linguist/linguist/mainwindow.cpp b/src/linguist/linguist/mainwindow.cpp -index 5f455815..06b2da9f 100644 ---- a/src/linguist/linguist/mainwindow.cpp -+++ b/src/linguist/linguist/mainwindow.cpp -@@ -54,7 +54,6 @@ - #include - #include - #include --#include - #include - #include - #include -diff --git a/src/pixeltool/qpixeltool.cpp b/src/pixeltool/qpixeltool.cpp -index a52a828c..97fd3d4c 100644 ---- a/src/pixeltool/qpixeltool.cpp -+++ b/src/pixeltool/qpixeltool.cpp -@@ -29,7 +29,6 @@ - #include "qpixeltool.h" - - #include --#include - #include - #include - #include -@@ -534,7 +533,7 @@ void QPixelTool::grabScreen() - int y = mousePos.y() - h/2; - - const QBrush darkBrush = palette().color(QPalette::Dark); -- const QDesktopWidget *desktopWidget = QApplication::desktop(); -+ const QWidget *desktopWidget = QApplication::desktop(); - if (QScreen *screen = this->screen()) { - m_buffer = screen->grabWindow(desktopWidget->winId(), x, y, w, h); - } else { --- -2.25.1 - diff --git a/recipes-qt/qt6/qttools/0001-Regenerate-CMakeLists.patch b/recipes-qt/qt6/qttools/0001-Regenerate-CMakeLists.patch index bbf96ce..b0aa47f 100644 --- a/recipes-qt/qt6/qttools/0001-Regenerate-CMakeLists.patch +++ b/recipes-qt/qt6/qttools/0001-Regenerate-CMakeLists.patch @@ -1,36 +1,35 @@ -From 8bf14e84d21221c092fcd3234340a54692d47ec3 Mon Sep 17 00:00:00 2001 +From a4e4a1735c10e592cbffcf77ea847dbc690c4293 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 2 Jun 2020 07:20:46 +0300 Subject: [PATCH] Regenerate CMakeLists Change-Id: I914c1b4c12ad3dbcfade11466b83a632a43a778c --- - .../qcollectiongenerator/.prev_CMakeLists.txt | 4 +++- - src/assistant/qcollectiongenerator/CMakeLists.txt | 4 +++- - src/assistant/qhelpgenerator/.prev_CMakeLists.txt | 5 ++++- - src/assistant/qhelpgenerator/CMakeLists.txt | 5 ++++- - src/linguist/lconvert/.prev_CMakeLists.txt | 4 +++- - src/linguist/lconvert/CMakeLists.txt | 4 +++- - src/linguist/lprodump/.prev_CMakeLists.txt | 6 ++++-- - src/linguist/lprodump/CMakeLists.txt | 6 ++++-- - src/linguist/lrelease-pro/.prev_CMakeLists.txt | 4 +++- - src/linguist/lrelease-pro/CMakeLists.txt | 4 +++- - src/linguist/lrelease/.prev_CMakeLists.txt | 4 +++- - src/linguist/lrelease/CMakeLists.txt | 4 +++- - src/linguist/lupdate-pro/.prev_CMakeLists.txt | 6 ++++-- - src/linguist/lupdate-pro/CMakeLists.txt | 6 ++++-- - src/linguist/lupdate/.prev_CMakeLists.txt | 12 +++++++----- - src/linguist/lupdate/CMakeLists.txt | 12 +++++++----- - src/qdoc/CMakeLists.txt | 14 ++++++-------- - src/qtattributionsscanner/.prev_CMakeLists.txt | 6 +++++- - src/qtattributionsscanner/CMakeLists.txt | 6 +++++- - src/windeployqt/.prev_CMakeLists.txt | 10 +++++++--- - src/windeployqt/CMakeLists.txt | 12 ++++++++---- - src/winrtrunner/CMakeLists.txt | 6 +++++- - 22 files changed, 98 insertions(+), 46 deletions(-) + src/assistant/qcollectiongenerator/.prev_CMakeLists.txt | 4 +++- + src/assistant/qcollectiongenerator/CMakeLists.txt | 4 +++- + src/assistant/qhelpgenerator/.prev_CMakeLists.txt | 5 ++++- + src/assistant/qhelpgenerator/CMakeLists.txt | 5 ++++- + src/linguist/lconvert/.prev_CMakeLists.txt | 4 +++- + src/linguist/lconvert/CMakeLists.txt | 4 +++- + src/linguist/lprodump/.prev_CMakeLists.txt | 6 ++++-- + src/linguist/lprodump/CMakeLists.txt | 6 ++++-- + src/linguist/lrelease-pro/.prev_CMakeLists.txt | 4 +++- + src/linguist/lrelease-pro/CMakeLists.txt | 4 +++- + src/linguist/lrelease/.prev_CMakeLists.txt | 4 +++- + src/linguist/lrelease/CMakeLists.txt | 4 +++- + src/linguist/lupdate-pro/.prev_CMakeLists.txt | 6 ++++-- + src/linguist/lupdate-pro/CMakeLists.txt | 6 ++++-- + src/linguist/lupdate/.prev_CMakeLists.txt | 12 +++++++----- + src/linguist/lupdate/CMakeLists.txt | 12 +++++++----- + src/qtattributionsscanner/.prev_CMakeLists.txt | 6 +++++- + src/qtattributionsscanner/CMakeLists.txt | 6 +++++- + src/windeployqt/.prev_CMakeLists.txt | 10 +++++++--- + src/windeployqt/CMakeLists.txt | 12 ++++++++---- + src/winrtrunner/CMakeLists.txt | 6 +++++- + 21 files changed, 92 insertions(+), 38 deletions(-) diff --git a/src/assistant/qcollectiongenerator/.prev_CMakeLists.txt b/src/assistant/qcollectiongenerator/.prev_CMakeLists.txt -index ba927bd7..cfbcfc0a 100644 +index ba927bd..cfbcfc0 100644 --- a/src/assistant/qcollectiongenerator/.prev_CMakeLists.txt +++ b/src/assistant/qcollectiongenerator/.prev_CMakeLists.txt @@ -4,7 +4,9 @@ @@ -45,7 +44,7 @@ index ba927bd7..cfbcfc0a 100644 main.c PUBLIC_LIBRARIES diff --git a/src/assistant/qcollectiongenerator/CMakeLists.txt b/src/assistant/qcollectiongenerator/CMakeLists.txt -index cfd7cd92..97c8740d 100644 +index cfd7cd9..97c8740 100644 --- a/src/assistant/qcollectiongenerator/CMakeLists.txt +++ b/src/assistant/qcollectiongenerator/CMakeLists.txt @@ -4,7 +4,9 @@ @@ -60,7 +59,7 @@ index cfd7cd92..97c8740d 100644 SOURCES main.c diff --git a/src/assistant/qhelpgenerator/.prev_CMakeLists.txt b/src/assistant/qhelpgenerator/.prev_CMakeLists.txt -index a9653d99..cbf85063 100644 +index a9653d9..cbf8506 100644 --- a/src/assistant/qhelpgenerator/.prev_CMakeLists.txt +++ b/src/assistant/qhelpgenerator/.prev_CMakeLists.txt @@ -4,7 +4,9 @@ @@ -80,7 +79,7 @@ index a9653d99..cbf85063 100644 # QTPLUGIN.platforms = "qminimal" +# QTPLUGIN.sqldrivers = "qsqlite" diff --git a/src/assistant/qhelpgenerator/CMakeLists.txt b/src/assistant/qhelpgenerator/CMakeLists.txt -index 5f9afc5c..540bb762 100644 +index 5f9afc5..540bb76 100644 --- a/src/assistant/qhelpgenerator/CMakeLists.txt +++ b/src/assistant/qhelpgenerator/CMakeLists.txt @@ -4,7 +4,9 @@ @@ -100,7 +99,7 @@ index 5f9afc5c..540bb762 100644 # QTPLUGIN.platforms = "qminimal" +# QTPLUGIN.sqldrivers = "qsqlite" diff --git a/src/linguist/lconvert/.prev_CMakeLists.txt b/src/linguist/lconvert/.prev_CMakeLists.txt -index e65bc854..f01e77da 100644 +index e65bc85..f01e77d 100644 --- a/src/linguist/lconvert/.prev_CMakeLists.txt +++ b/src/linguist/lconvert/.prev_CMakeLists.txt @@ -4,7 +4,9 @@ @@ -115,7 +114,7 @@ index e65bc854..f01e77da 100644 ../shared/numerus.cpp ../shared/po.cpp diff --git a/src/linguist/lconvert/CMakeLists.txt b/src/linguist/lconvert/CMakeLists.txt -index a5dee94d..aba94640 100644 +index a5dee94..aba9464 100644 --- a/src/linguist/lconvert/CMakeLists.txt +++ b/src/linguist/lconvert/CMakeLists.txt @@ -4,7 +4,9 @@ @@ -130,7 +129,7 @@ index a5dee94d..aba94640 100644 SOURCES ../shared/numerus.cpp diff --git a/src/linguist/lprodump/.prev_CMakeLists.txt b/src/linguist/lprodump/.prev_CMakeLists.txt -index 2fb6df7f..705b3998 100644 +index 2fb6df7..705b399 100644 --- a/src/linguist/lprodump/.prev_CMakeLists.txt +++ b/src/linguist/lprodump/.prev_CMakeLists.txt @@ -4,7 +4,9 @@ @@ -154,7 +153,7 @@ index 2fb6df7f..705b3998 100644 "/qmake/override_features" BASE diff --git a/src/linguist/lprodump/CMakeLists.txt b/src/linguist/lprodump/CMakeLists.txt -index 350b4593..a2ed6ba9 100644 +index 350b459..a2ed6ba 100644 --- a/src/linguist/lprodump/CMakeLists.txt +++ b/src/linguist/lprodump/CMakeLists.txt @@ -4,7 +4,9 @@ @@ -178,7 +177,7 @@ index 350b4593..a2ed6ba9 100644 "/qmake/override_features" BASE diff --git a/src/linguist/lrelease-pro/.prev_CMakeLists.txt b/src/linguist/lrelease-pro/.prev_CMakeLists.txt -index c1961603..9669234a 100644 +index c196160..9669234 100644 --- a/src/linguist/lrelease-pro/.prev_CMakeLists.txt +++ b/src/linguist/lrelease-pro/.prev_CMakeLists.txt @@ -4,7 +4,9 @@ @@ -193,7 +192,7 @@ index c1961603..9669234a 100644 ../shared/runqttool.cpp ../shared/runqttool.h main.cpp diff --git a/src/linguist/lrelease-pro/CMakeLists.txt b/src/linguist/lrelease-pro/CMakeLists.txt -index 84db24fb..e77fdd3d 100644 +index 84db24f..e77fdd3 100644 --- a/src/linguist/lrelease-pro/CMakeLists.txt +++ b/src/linguist/lrelease-pro/CMakeLists.txt @@ -4,7 +4,9 @@ @@ -208,7 +207,7 @@ index 84db24fb..e77fdd3d 100644 SOURCES ../shared/runqttool.cpp ../shared/runqttool.h diff --git a/src/linguist/lrelease/.prev_CMakeLists.txt b/src/linguist/lrelease/.prev_CMakeLists.txt -index b0f636ed..238b0e43 100644 +index b0f636e..238b0e4 100644 --- a/src/linguist/lrelease/.prev_CMakeLists.txt +++ b/src/linguist/lrelease/.prev_CMakeLists.txt @@ -4,7 +4,9 @@ @@ -223,7 +222,7 @@ index b0f636ed..238b0e43 100644 ../shared/numerus.cpp ../shared/po.cpp diff --git a/src/linguist/lrelease/CMakeLists.txt b/src/linguist/lrelease/CMakeLists.txt -index 22e1dee2..6c3542ce 100644 +index 22e1dee..6c3542c 100644 --- a/src/linguist/lrelease/CMakeLists.txt +++ b/src/linguist/lrelease/CMakeLists.txt @@ -4,7 +4,9 @@ @@ -238,7 +237,7 @@ index 22e1dee2..6c3542ce 100644 SOURCES ../shared/numerus.cpp diff --git a/src/linguist/lupdate-pro/.prev_CMakeLists.txt b/src/linguist/lupdate-pro/.prev_CMakeLists.txt -index 07f7af6f..51f7b8c8 100644 +index 07f7af6..51f7b8c 100644 --- a/src/linguist/lupdate-pro/.prev_CMakeLists.txt +++ b/src/linguist/lupdate-pro/.prev_CMakeLists.txt @@ -4,7 +4,9 @@ @@ -260,7 +259,7 @@ index 07f7af6f..51f7b8c8 100644 +#### Keys ignored in scope 2:.:.:lupdate-pro.pro:MINGW: # RC_FILE = "lupdate-pro.rc" diff --git a/src/linguist/lupdate-pro/CMakeLists.txt b/src/linguist/lupdate-pro/CMakeLists.txt -index c366a2d6..8df52b7f 100644 +index c366a2d..8df52b7 100644 --- a/src/linguist/lupdate-pro/CMakeLists.txt +++ b/src/linguist/lupdate-pro/CMakeLists.txt @@ -4,7 +4,9 @@ @@ -282,7 +281,7 @@ index c366a2d6..8df52b7f 100644 +#### Keys ignored in scope 2:.:.:lupdate-pro.pro:MINGW: # RC_FILE = "lupdate-pro.rc" diff --git a/src/linguist/lupdate/.prev_CMakeLists.txt b/src/linguist/lupdate/.prev_CMakeLists.txt -index 61d7ad7f..4df4d389 100644 +index 61d7ad7..4df4d38 100644 --- a/src/linguist/lupdate/.prev_CMakeLists.txt +++ b/src/linguist/lupdate/.prev_CMakeLists.txt @@ -4,7 +4,9 @@ @@ -327,7 +326,7 @@ index 61d7ad7f..4df4d389 100644 +#### Keys ignored in scope 9:.:.:lupdate.pro:MINGW: # RC_FILE = "lupdate.rc" diff --git a/src/linguist/lupdate/CMakeLists.txt b/src/linguist/lupdate/CMakeLists.txt -index 04515bba..fe2e08a2 100644 +index 04515bb..fe2e08a 100644 --- a/src/linguist/lupdate/CMakeLists.txt +++ b/src/linguist/lupdate/CMakeLists.txt @@ -4,7 +4,9 @@ @@ -371,58 +370,8 @@ index 04515bba..fe2e08a2 100644 -#### Keys ignored in scope 9:.:.:lupdate.pro:mingw: +#### Keys ignored in scope 9:.:.:lupdate.pro:MINGW: # RC_FILE = "lupdate.rc" -diff --git a/src/qdoc/CMakeLists.txt b/src/qdoc/CMakeLists.txt -index 6ba6c127..ac6c0c3b 100644 ---- a/src/qdoc/CMakeLists.txt -+++ b/src/qdoc/CMakeLists.txt -@@ -4,7 +4,8 @@ - ## qdoc Tool: - ##################################################################### - --qt_add_tool(qdoc -+qt_get_tool_target_name(target_name qdoc) -+qt_add_tool(${target_name} - TARGET_DESCRIPTION "Qt Documentation Compiler" - TOOLS_TARGET Tools # special case - SOURCES -@@ -112,12 +113,12 @@ qt_add_tool(qdoc - #### Keys ignored in scope 2:.:.:qdoc.pro:NOT force_bootstrap: - # _REQUIREMENTS = "qtConfig(xmlstreamwriter)" - --qt_extend_target(qdoc CONDITION TARGET Qt::QmlDevToolsPrivate -+qt_extend_target(${target_name} CONDITION TARGET Qt::QmlDevToolsPrivate - PUBLIC_LIBRARIES - Qt::QmlDevToolsPrivate - ) - --qt_extend_target(qdoc CONDITION NOT TARGET Qt::QmlDevToolsPrivate -+qt_extend_target(${target_name} CONDITION NOT TARGET Qt::QmlDevToolsPrivate - DEFINES - QT_NO_DECLARATIVE - ) -@@ -125,7 +126,7 @@ qt_extend_target(qdoc CONDITION NOT TARGET Qt::QmlDevToolsPrivate - #### Keys ignored in scope 6:.:.:qdoc.pro:NOT QMAKE_DEFAULT_LIBDIRS___contains____ss_CLANG_LIBDIR AND NOT disable_external_rpath: - # QMAKE_RPATHDIR = "$$CLANG_LIBDIR" - --qt_extend_target(qdoc CONDITION win32-icc_x_ OR win32-msvc_x_ -+qt_extend_target(${target_name} CONDITION win32-icc_x_ OR win32-msvc_x_ - LINK_OPTIONS - "/STACK:4194304" - ) -@@ -143,10 +144,7 @@ qt_extend_target(qdoc CONDITION win32-icc_x_ OR win32-msvc_x_ - #### Keys ignored in scope 11:.:.:qdoc.pro:CMAKE_BIN_DIR___contains___^\\.\\./._x_: - # CMAKE_BIN_DIR = "$$[QT_HOST_BINS]/" - # CMAKE_BIN_DIR_IS_ABSOLUTE = "True" -- --#### Keys ignored in scope 12:.:.:qdoc.pro:QMAKE_HOST.os___equals___Windows: --# CMAKE_BIN_SUFFIX = ".exe" --qt_add_docs(qdoc -+qt_add_docs(${target_name} - doc/config/qdoc.qdocconf - ) - diff --git a/src/qtattributionsscanner/.prev_CMakeLists.txt b/src/qtattributionsscanner/.prev_CMakeLists.txt -index a7e7694e..17cd6482 100644 +index a7e7694..17cd648 100644 --- a/src/qtattributionsscanner/.prev_CMakeLists.txt +++ b/src/qtattributionsscanner/.prev_CMakeLists.txt @@ -4,7 +4,9 @@ @@ -447,7 +396,7 @@ index a7e7694e..17cd6482 100644 # cmake_qattributionsscanner_config_file.output = "$$MODULE_BASE_OUTDIR/lib/cmake/Qt5AttributionsScannerTools/Qt5AttributionsScannerToolsConfig.cmake" # cmake_qattributionsscanner_config_version_file.input = "$$[QT_HOST_DATA/src]/mkspecs/features/data/cmake/Qt5ConfigVersion.cmake.in" diff --git a/src/qtattributionsscanner/CMakeLists.txt b/src/qtattributionsscanner/CMakeLists.txt -index bee6df30..aef9be70 100644 +index bee6df3..aef9be7 100644 --- a/src/qtattributionsscanner/CMakeLists.txt +++ b/src/qtattributionsscanner/CMakeLists.txt @@ -4,7 +4,9 @@ @@ -472,7 +421,7 @@ index bee6df30..aef9be70 100644 # cmake_qattributionsscanner_config_file.output = "$$MODULE_BASE_OUTDIR/lib/cmake/Qt5AttributionsScannerTools/Qt5AttributionsScannerToolsConfig.cmake" # cmake_qattributionsscanner_config_version_file.input = "$$[QT_HOST_DATA/src]/mkspecs/features/data/cmake/Qt5ConfigVersion.cmake.in" diff --git a/src/windeployqt/.prev_CMakeLists.txt b/src/windeployqt/.prev_CMakeLists.txt -index b80096eb..e317a64e 100644 +index b80096e..e317a64 100644 --- a/src/windeployqt/.prev_CMakeLists.txt +++ b/src/windeployqt/.prev_CMakeLists.txt @@ -4,8 +4,10 @@ @@ -510,7 +459,7 @@ index b80096eb..e317a64e 100644 QT_RELOCATABLE ) diff --git a/src/windeployqt/CMakeLists.txt b/src/windeployqt/CMakeLists.txt -index f2ae3b51..25c7565b 100644 +index f2ae3b5..25c7565 100644 --- a/src/windeployqt/CMakeLists.txt +++ b/src/windeployqt/CMakeLists.txt @@ -4,8 +4,10 @@ @@ -549,7 +498,7 @@ index f2ae3b51..25c7565b 100644 QT_RELOCATABLE ) diff --git a/src/winrtrunner/CMakeLists.txt b/src/winrtrunner/CMakeLists.txt -index 736e4bba..304b67e2 100644 +index 736e4bb..304b67e 100644 --- a/src/winrtrunner/CMakeLists.txt +++ b/src/winrtrunner/CMakeLists.txt @@ -4,8 +4,10 @@ @@ -572,5 +521,5 @@ index 736e4bba..304b67e2 100644 # _OPTION = "host_build" +# _REQUIREMENTS = "qtConfig(winrtrunner)" -- -2.25.1 +2.7.4 diff --git a/recipes-qt/qt6/qttools_git.bb b/recipes-qt/qt6/qttools_git.bb index 5123682..6e13edb 100644 --- a/recipes-qt/qt6/qttools_git.bb +++ b/recipes-qt/qt6/qttools_git.bb @@ -16,9 +16,8 @@ DEPENDS += "qtbase qtdeclarative qttools-native" SRC_URI += "\ file://0001-Regenerate-CMakeLists.patch \ - file://0001-DesktopWidget-is-no-more.patch \ " BBCLASSEXTEND =+ "native nativesdk" -SRCREV = "58902fbd684d39191fbddf3ef5e917e709b38a68" +SRCREV = "df3c22b13f320900c50fb32829dece4f9989a002" diff --git a/recipes-qt/qt6/qttranslations_git.bb b/recipes-qt/qt6/qttranslations_git.bb index 2274a1b..fef8f32 100644 --- a/recipes-qt/qt6/qttranslations_git.bb +++ b/recipes-qt/qt6/qttranslations_git.bb @@ -18,4 +18,4 @@ python populate_packages_prepend () { 'Qt translations for %s', extra_depends='') } -SRCREV = "0a20667e2fc7957ba5d17d11e6f648709be6f94e" +SRCREV = "50df0f46202794496da1943b9e7d0e48a2782dc9" diff --git a/recipes-qt/qt6/qtvirtualkeyboard_git.bb b/recipes-qt/qt6/qtvirtualkeyboard_git.bb index 5e8c0d9..8ed7562 100644 --- a/recipes-qt/qt6/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt6/qtvirtualkeyboard_git.bb @@ -118,4 +118,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit" DEPENDS += "qtbase qtdeclarative qtsvg qtdeclarative-native" -SRCREV = "07fb3985aaa702c1bc72a4a724eef32041d68255" +SRCREV = "b5306fad3c1bf399f9f4d78b4dd42611e4370fde" diff --git a/recipes-qt/qt6/qtwayland_git.bb b/recipes-qt/qt6/qtwayland_git.bb index b1e249e..69c7f4b 100644 --- a/recipes-qt/qt6/qtwayland_git.bb +++ b/recipes-qt/qt6/qtwayland_git.bb @@ -38,4 +38,4 @@ DEPENDS += "qtbase qtdeclarative qtwayland-native wayland wayland-native" BBCLASSEXTEND =+ "native nativesdk" -SRCREV = "cab749b614d1f5485c1d00204f1a14c81212eda9" +SRCREV = "c684ef65082f9fa20f91f92e393393558f126de4" diff --git a/recipes-qt/qt6/qtwebchannel_git.bb b/recipes-qt/qt6/qtwebchannel_git.bb index 6f5555d..93b865a 100644 --- a/recipes-qt/qt6/qtwebchannel_git.bb +++ b/recipes-qt/qt6/qtwebchannel_git.bb @@ -14,4 +14,4 @@ include recipes-qt/qt6/qt6.inc DEPENDS += "qtbase qtdeclarative qtwebsockets" -SRCREV = "2398037151babcb817c94463fc240c7694f73d4c" +SRCREV = "74f34a994eb511383748a566c0fb0541264b3a85" diff --git a/recipes-qt/qt6/qtwebsockets_git.bb b/recipes-qt/qt6/qtwebsockets_git.bb index 66a54a5..0a6b3dd 100644 --- a/recipes-qt/qt6/qtwebsockets_git.bb +++ b/recipes-qt/qt6/qtwebsockets_git.bb @@ -13,4 +13,4 @@ include recipes-qt/qt6/qt6.inc DEPENDS += "qtbase qtdeclarative" -SRCREV = "891a007f6cb7c65f4c1b8087e99eefdcecd29eac" +SRCREV = "f8925984a6fbe67841dc48d45bb163def4246be4"