Update submodules

recipes-qt/packagegroups/packagegroup-qt6-modules.bb

@@ -11,7 +11,6 @@ RDEPENDS_${PN} += " \
     ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland', '', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'qtx11extras', '', d)} \
     qtbase \
-    qtconnectivity \
     qtdeclarative \
     qtdeclarative-tools \
     qtgraphicaleffects \

recipes-qt/packagegroups/packagegroup-qt6-toolchain-target.bb

@@ -12,7 +12,6 @@ RDEPENDS_${PN} += "\
     ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland-dev', '', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'qtx11extras-dev', '', d)} \
     qtbase-dev \
-    qtconnectivity-dev \
     qtdeclarative-dev \
     qtgraphicaleffects-dev \
     qtimageformats-dev \

recipes-qt/qt6/qtbase/0001-QtGui-fix-a-few-more-char-int-uint-QChar-conversions.patch

@@ -0,0 +1,104 @@
+From 7a8b277d5bcfd3597b6634e0402ac5f7202d9b71 Mon Sep 17 00:00:00 2001
+From: Marc Mutz <marc.mutz@kdab.com>
+Date: Mon, 27 Apr 2020 11:17:31 +0200
+Subject: [PATCH] QtGui: fix a few more char/int/uint -> QChar conversions
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+They were masked by all QChar ctors being made explicit, except the
+char16_t one, which was left as the only viable choice.
+
+Change-Id: I343269b61d555c259b5780011e99f85f5375ef78
+Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
+---
+ src/gui/kernel/qplatformtheme.cpp     | 2 +-
+ src/gui/painting/qrangecollection.cpp | 4 ++--
+ src/gui/text/qfontengine.cpp          | 4 ++--
+ src/gui/text/qtexthtmlparser.cpp      | 2 +-
+ src/gui/util/qhexstring_p.h           | 2 +-
+ 5 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/gui/kernel/qplatformtheme.cpp b/src/gui/kernel/qplatformtheme.cpp
+index 93fd59e53f..04eaddd6df 100644
+--- a/src/gui/kernel/qplatformtheme.cpp
++++ b/src/gui/kernel/qplatformtheme.cpp
+@@ -750,7 +750,7 @@ QString QPlatformTheme::defaultStandardButtonText(int button)
+ 
+ QString QPlatformTheme::removeMnemonics(const QString &original)
+ {
+-    QString returnText(original.size(), 0);
++    QString returnText(original.size(), u'\0');
+     int finalDest = 0;
+     int currPos = 0;
+     int l = original.length();
+diff --git a/src/gui/painting/qrangecollection.cpp b/src/gui/painting/qrangecollection.cpp
+index 9acb36a000..5fd4ebaa4b 100644
+--- a/src/gui/painting/qrangecollection.cpp
++++ b/src/gui/painting/qrangecollection.cpp
+@@ -156,7 +156,7 @@ void QRangeCollection::clear()
+ bool QRangeCollection::parse(const QString &ranges)
+ {
+     Q_D(QRangeCollection);
+-    const QStringList items = ranges.split(',');
++    const QStringList items = ranges.split(u',');
+     for (const QString &item : items) {
+         if (item.isEmpty()) {
+             d->intervals.clear();
+@@ -164,7 +164,7 @@ bool QRangeCollection::parse(const QString &ranges)
+         }
+ 
+         if (item.contains(QLatin1Char('-'))) {
+-            const QStringList rangeItems = item.split('-');
++            const QStringList rangeItems = item.split(u'-');
+             if (rangeItems.count() != 2) {
+                 d->intervals.clear();
+                 return false;
+diff --git a/src/gui/text/qfontengine.cpp b/src/gui/text/qfontengine.cpp
+index 1269aefbf2..c260c06fe4 100644
+--- a/src/gui/text/qfontengine.cpp
++++ b/src/gui/text/qfontengine.cpp
+@@ -1834,12 +1834,12 @@ bool QFontEngineMulti::stringToCMap(const QChar *str, int len,
+ 
+     int lastFallback = -1;
+     while (it.hasNext()) {
+-        const uint ucs4 = it.peekNext();
++        const char32_t ucs4 = it.peekNext();
+ 
+         // If we applied a fallback font to previous glyph, and the current is either
+         // ZWJ or ZWNJ, we should also try applying the same fallback font to that, in order
+         // to get the correct shaping rules applied.
+-        if (lastFallback >= 0 && (ucs4 == QChar(0x200d) || ucs4 == QChar(0x200c))) {
++        if (lastFallback >= 0 && (ucs4 == 0x200d || ucs4 == 0x200c)) {
+             QFontEngine *engine = m_engines.at(lastFallback);
+             glyph_t glyph = engine->glyphIndex(ucs4);
+             if (glyph != 0) {
+diff --git a/src/gui/text/qtexthtmlparser.cpp b/src/gui/text/qtexthtmlparser.cpp
+index 76ff99aae0..0c8a29c6be 100644
+--- a/src/gui/text/qtexthtmlparser.cpp
++++ b/src/gui/text/qtexthtmlparser.cpp
+@@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE
+ 
+ // see also tst_qtextdocumentfragment.cpp
+ #define MAX_ENTITY 258
+-static const struct QTextHtmlEntity { const char name[9]; quint16 code; } entities[]= {
++static const struct QTextHtmlEntity { const char name[9]; char16_t code; } entities[]= {
+     { "AElig", 0x00c6 },
+     { "AMP", 38 },
+     { "Aacute", 0x00c1 },
+diff --git a/src/gui/util/qhexstring_p.h b/src/gui/util/qhexstring_p.h
+index d30a8eeee8..2afbf3a42b 100644
+--- a/src/gui/util/qhexstring_p.h
++++ b/src/gui/util/qhexstring_p.h
+@@ -69,7 +69,7 @@ template <typename T>
+ 
+     inline void write(QChar *&dest) const
+     {
+-        const ushort hexChars[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
++        const char16_t hexChars[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
+         const char *c = reinterpret_cast<const char *>(&val);
+         for (uint i = 0; i < sizeof(T); ++i) {
+             *dest++ = hexChars[*c & 0xf];
+-- 
+2.17.1
+

recipes-qt/qt6/qtbase/0001-WIP-Build-Tools-when-cross-compiling.patch

@@ -1,4 +1,4 @@
-From 8d796a200863e5825aca28c526cfe55f25a27b5d Mon Sep 17 00:00:00 2001
+From f8f501483f75ef26de06092b09d2f3d9aa2995e9 Mon Sep 17 00:00:00 2001
 From: Leander Beernaert <leander.beernaert@qt.io>
 Date: Mon, 27 Apr 2020 15:04:57 +0200
 Subject: [PATCH] WIP: Build Tools when cross compiling
@@ -21,13 +21,14 @@ Fixes: QTBUG-81901
 Change-Id: If4efbc1fae07a4a3a044dd09c9c06be6d517825e
 ---
  cmake/QtBaseGlobalTargets.cmake     |  5 +++
- cmake/QtBuild.cmake                 | 65 +++++++++++++++++++++++------
+ cmake/QtBuild.cmake                 | 67 +++++++++++++++++++++++------
  cmake/QtModuleDependencies.cmake.in | 16 +++++++
+ cmake/QtSetup.cmake                 |  2 +-
  qmake/CMakeLists.txt                |  9 ++--
- 4 files changed, 79 insertions(+), 16 deletions(-)
+ 5 files changed, 81 insertions(+), 18 deletions(-)
 
 diff --git a/cmake/QtBaseGlobalTargets.cmake b/cmake/QtBaseGlobalTargets.cmake
-index ac1472bb3c..4167eb7a3f 100644
+index a64a91a193..e151ffbbdd 100644
 --- a/cmake/QtBaseGlobalTargets.cmake
 +++ b/cmake/QtBaseGlobalTargets.cmake
 @@ -106,6 +106,10 @@ if(QT_HOST_PATH)
@@ -50,10 +51,10 @@ index ac1472bb3c..4167eb7a3f 100644
  configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/qt.toolchain.cmake.in" "${__GlobalConfig_build_dir}/qt.toolchain.cmake" @ONLY)
  qt_install(FILES "${__GlobalConfig_build_dir}/qt.toolchain.cmake" DESTINATION "${__GlobalConfig_install_dir}" COMPONENT Devel)
 diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake
-index 96b8458e54..8fe18de953 100644
+index 025000c977..2227a739df 100644
 --- a/cmake/QtBuild.cmake
 +++ b/cmake/QtBuild.cmake
-@@ -1108,9 +1108,20 @@ function(qt_extend_target target)
+@@ -1302,9 +1302,20 @@ function(qt_extend_target target)
      # Don't try to extend_target when cross compiling an imported host target (like a tool).
      qt_is_imported_target("${target}" is_imported)
      if(is_imported)
@@ -75,7 +76,7 @@ index 96b8458e54..8fe18de953 100644
      if (NOT TARGET "${target}")
          message(FATAL_ERROR "Trying to extend non-existing target \"${target}\".")
      endif()
-@@ -2059,7 +2070,7 @@ function(qt_export_tools module_name)
+@@ -2507,7 +2518,7 @@ function(qt_export_tools module_name)
      # If no tools were defined belonging to this module, don't create a config and targets file.
      # Guards against the case when doing a cross-build.
  
@@ -84,7 +85,7 @@ index 96b8458e54..8fe18de953 100644
          return()
      endif()
  
-@@ -2088,6 +2099,9 @@ function(qt_export_tools module_name)
+@@ -2536,6 +2547,9 @@ function(qt_export_tools module_name)
              list(APPEND package_deps "${extra_packages}")
          endif()
  
@@ -94,7 +95,7 @@ index 96b8458e54..8fe18de953 100644
          set(extra_cmake_statements "${extra_cmake_statements}
  if (NOT QT_NO_CREATE_TARGETS)
      get_property(is_global TARGET ${INSTALL_CMAKE_NAMESPACE}::${tool_name} PROPERTY IMPORTED_GLOBAL)
-@@ -2571,7 +2585,7 @@ function(qt_add_executable name)
+@@ -3022,7 +3036,7 @@ function(qt_add_executable name)
          set(arg_INSTALL_DIRECTORY "${INSTALL_BINDIR}")
      endif()
  
@@ -103,7 +104,7 @@ index 96b8458e54..8fe18de953 100644
          add_library("${name}" MODULE)
          qt_android_apply_arch_suffix("${name}")
          qt_android_generate_deployment_settings("${name}")
-@@ -2968,7 +2982,7 @@ endfunction()
+@@ -3420,7 +3434,7 @@ endfunction()
  
  # Sets QT_WILL_BUILD_TOOLS if tools will be built.
  function(qt_check_if_tools_will_be_built)
@@ -112,7 +113,7 @@ index 96b8458e54..8fe18de953 100644
          set(will_build_tools TRUE)
      else()
          set(will_build_tools FALSE)
-@@ -3237,6 +3251,16 @@ function(qt_get_main_cmake_configuration out_var)
+@@ -3695,6 +3709,16 @@ function(qt_get_main_cmake_configuration out_var)
      set("${out_var}" "${config}" PARENT_SCOPE)
  endfunction()
  
@@ -129,7 +130,7 @@ index 96b8458e54..8fe18de953 100644
  # This function is used to define a "Qt tool", such as moc, uic or rcc.
  # The BOOTSTRAP option allows building it as standalone program, otherwise
  # it will be linked against QtCore.
-@@ -3256,10 +3280,14 @@ function(qt_add_tool name)
+@@ -3714,10 +3738,14 @@ function(qt_add_tool name)
      if(TARGET ${full_name})
          get_property(path TARGET ${full_name} PROPERTY LOCATION)
          message(STATUS "Tool '${full_name}' was found at ${path}.")
@@ -146,7 +147,7 @@ index 96b8458e54..8fe18de953 100644
          set(tools_package_name "Qt6${arg_TOOLS_TARGET}Tools")
          message(STATUS "Searching for tool '${full_name}' in package ${tools_package_name}.")
  
-@@ -3295,7 +3323,9 @@ function(qt_add_tool name)
+@@ -3753,7 +3781,9 @@ function(qt_add_tool name)
              qt_internal_append_known_modules_with_tools("${arg_TOOLS_TARGET}")
              get_property(path TARGET ${full_name} PROPERTY LOCATION)
              message(STATUS "${full_name} was found at ${path} using package ${tools_package_name}.")
@@ -157,7 +158,7 @@ index 96b8458e54..8fe18de953 100644
          endif()
      endif()
  
-@@ -3338,7 +3368,7 @@ function(qt_add_tool name)
+@@ -3796,7 +3826,7 @@ function(qt_add_tool name)
          set(no_install NO_INSTALL)
      endif()
  
@@ -166,7 +167,7 @@ index 96b8458e54..8fe18de953 100644
          ${bootstrap}
          ${no_qt}
          ${no_install}
-@@ -3353,12 +3383,21 @@ function(qt_add_tool name)
+@@ -3811,12 +3841,21 @@ function(qt_add_tool name)
          MOC_OPTIONS ${arg_MOC_OPTIONS}
          DISABLE_AUTOGEN_TOOLS ${disable_autogen_tools}
      )
@@ -190,7 +191,7 @@ index 96b8458e54..8fe18de953 100644
          RUNTIME_OUTPUT_DIRECTORY_${tool_cmake_configuration} "${QT_BUILD_DIR}/${INSTALL_BINDIR}"
      )
  
-@@ -3367,15 +3406,15 @@ function(qt_add_tool name)
+@@ -3825,17 +3864,17 @@ function(qt_add_tool name)
          qt_internal_append_known_modules_with_tools("${arg_TOOLS_TARGET}")
  
          # Also append the tool to the module list.
@@ -201,6 +202,9 @@ index 96b8458e54..8fe18de953 100644
 +        qt_install(TARGETS "${target_name}"
                     EXPORT "${INSTALL_CMAKE_NAMESPACE}${arg_TOOLS_TARGET}ToolsTargets"
                     DESTINATION ${INSTALL_TARGETS_DEFAULT_ARGS})
+-        qt_apply_rpaths(TARGET "${name}" INSTALL_PATH "${INSTALL_BINDIR}" RELATIVE_RPATH)
++        qt_apply_rpaths(TARGET "${target_name}" INSTALL_PATH "${INSTALL_BINDIR}" RELATIVE_RPATH)
+ 
      endif()
  
      if(QT_FEATURE_separate_debug_info AND (UNIX OR MINGW))
@@ -246,6 +250,19 @@ index ffb9e8a5d3..4cc8308ff2 100644
  set(CMAKE_SIZEOF_VOID_P "${BACKUP_CMAKE_SIZEOF_VOID_P}")
  
  # note: target_deps example: "Qt6Core\;5.12.0;Qt6Gui\;5.12.0"
+diff --git a/cmake/QtSetup.cmake b/cmake/QtSetup.cmake
+index 6bc3c74f69..8503f316b2 100644
+--- a/cmake/QtSetup.cmake
++++ b/cmake/QtSetup.cmake
+@@ -126,7 +126,7 @@ option(QT_NO_MAKE_TESTS "Should tests be built as part of the default 'all' targ
+ # Like in qttools/assistant/assistant.pro, load(qt_app), which is guarded by a qtNomakeTools() call.
+ 
+ option(QT_NO_MAKE_TOOLS "Should tools be built as part of the default 'all' target."
+-       "${CMAKE_CROSSCOMPILING}")
++       "${CMAKE_CROSSCOMPILING} AND NOT ${QT_BUILD_TOOLS_WHEN_CROSSCOMPILING}")
+ 
+ include(CTest)
+ enable_testing()
 diff --git a/qmake/CMakeLists.txt b/qmake/CMakeLists.txt
 index 4f8a37a36c..81158c05d3 100644
 --- a/qmake/CMakeLists.txt
@@ -271,6 +288,3 @@ index 4f8a37a36c..81158c05d3 100644
 +qt_enable_msvc_cplusplus_define(${target_name} PUBLIC) # special case
  
 +# special case end
--- 
-2.17.1
-

recipes-qt/qt6/qtbase/0001-cmake-use-configured-mkspec-path-for-qmodule.pri.patch

@@ -0,0 +1,32 @@
+From 3d8300313d0a7bb90524f117cb66bdb5de1eaeb0 Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <samuli.piippo@qt.io>
+Date: Tue, 5 May 2020 13:50:39 +0300
+Subject: [PATCH] cmake: use configured mkspec path for qmodule.pri
+
+Change-Id: I92d4fb65e9ad583fc7c545e3a48e4f39ed505369
+---
+ cmake/QtBuild.cmake | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake
+index 1937e1a2ff..025000c977 100644
+--- a/cmake/QtBuild.cmake
++++ b/cmake/QtBuild.cmake
+@@ -793,7 +793,7 @@ endfunction()
+ 
+ # Creates mkspecs/qmodule.pri which contains private global features among other things.
+ function(qt_generate_global_module_pri_file)
+-    qt_path_join(qmodule_pri_target_path ${PROJECT_BINARY_DIR} mkspecs)
++    qt_path_join(qmodule_pri_target_path ${PROJECT_BINARY_DIR} ${INSTALL_MKSPECSDIR})
+     qt_path_join(qmodule_pri_target_path "${qmodule_pri_target_path}" "qmodule.pri")
+ 
+     get_target_property(enabled_features GlobalConfig INTERFACE_QT_ENABLED_PRIVATE_FEATURES)
+@@ -828,7 +828,7 @@ CONFIG += ${private_config_joined}
+         OUTPUT "${qmodule_pri_target_path}"
+         CONTENT "${content}"
+     )
+-    qt_install(FILES "${qmodule_pri_target_path}" DESTINATION mkspecs)
++    qt_install(FILES "${qmodule_pri_target_path}" DESTINATION ${INSTALL_MKSPECSDIR})
+ endfunction()
+ 
+ function(qt_generate_qt_conf)

recipes-qt/qt6/qtbase_git.bb

@@ -21,9 +21,10 @@ SRC_URI += "\
     file://0005-Allow-build-without-opengl.patch \
     file://0006-qmake-use-syncqt-from-libexec-dir.patch \
     file://0001-WIP-Build-Tools-when-cross-compiling.patch \
+    file://0001-QtGui-fix-a-few-more-char-int-uint-QChar-conversions.patch \
+    file://0001-cmake-use-configured-mkspec-path-for-qmodule.pri.patch \
 "
 
-
 DEPENDS += "\
     freetype \
     pcre2 \
@@ -147,4 +148,4 @@ FILES_${PN}-tools += "\
 
 BBCLASSEXTEND =+ "native nativesdk"
 
-SRCREV = "5422fb79486a1818d6355d75f019fe63120a43d0"
+SRCREV = "4ba25a092065a6422510a9f4afa4fbbabeda686c"

recipes-qt/qt6/qtdeclarative_git.bb

@@ -13,6 +13,8 @@ include recipes-qt/qt6/qt6-git.inc
 include recipes-qt/qt6/qt6.inc
 
 SRC_URI += "\
+    file://0001-Add-forward-declaration-for-QSurface.patch \
+    file://0001-Fix-build-without-opengl.patch  \
 "
 
 PACKAGECONFIG ?= "translations"
@@ -25,7 +27,7 @@ DEPENDS += "qtbase qtdeclarative-native"
 
 BBCLASSEXTEND =+ "native nativesdk"
 
-SRCREV = "399ebb5635efc897d29efba90f92f931843b266a"
+SRCREV = "a135f3d6c3202b37eda0f1e94292f795f9e575ca"
 
 do_install_append() {
     # broken installation of plugins.qmltypes

recipes-qt/qt6/qtgraphicaleffects_git.bb

@@ -17,4 +17,4 @@ include recipes-qt/qt6/qt6.inc
 
 DEPENDS += "qtbase qtdeclarative"
 
-SRCREV = "403342641c4872eac378052a174523a1966553cb"
+SRCREV = "74c81763391f1292482d46d87ea76f39c9064ee3"

recipes-qt/qt6/qtimageformats_git.bb

@@ -18,4 +18,4 @@ include recipes-qt/qt6/qt6.inc
 
 DEPENDS += "qtbase"
 
-SRCREV = "7d02c1718dc89435950aae76abe5dc09b82e66f4"
+SRCREV = "c1f396c7cfe848604ef7c738111e33db7829ed6f"

recipes-qt/qt6/qtnetworkauth_git.bb

@@ -11,4 +11,4 @@ include recipes-qt/qt6/qt6.inc
 
 DEPENDS += "qtbase"
 
-SRCREV = "867e0f4318693ece4d52791ce99c4bb85737c097"
+SRCREV = "20a907375e08e44e114ccd9daec37be466a1c8f2"

recipes-qt/qt6/qtquick3d_git.bb

@@ -23,7 +23,7 @@ _FILES_${PN}-qmlplugins += " \
   ${OE_QMAKE_PATH_QML}/QtQuick3D/Helpers/meshes/*.mesh \
 "
 
-SRCREV_qtquick3d = "7b5e5df5fbb2163e4b18daff383f7420f33bb9fd"
+SRCREV_qtquick3d = "00582106a2d286bf9df52a1d795d176833791e83"
 SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df"
 
 SRCREV_FORMAT = "qtquick3d_assimp"

recipes-qt/qt6/qtquickcontrols2_git.bb

@@ -19,4 +19,4 @@ do_configure_prepend() {
     sed -i -e 's/QmlTools//' ${S}/CMakeLists.txt
 }
 
-SRCREV = "b60edab10cd5e5cffde22382eccf3d1c21e258c9"
+SRCREV = "885d065902422f82d474e6a8cae43e1b3e4d94d0"

recipes-qt/qt6/qtshadertools_git.bb

@@ -12,4 +12,4 @@ DEPENDS = "qtbase qtshadertools-native"
 
 BBCLASSEXTEND =+ "native nativesdk"
 
-SRCREV = "ca11f0a4a6f499fdad7f667bd23db064653e4ffc"
+SRCREV = "7305d0c82df5af38e4a4f26731391b923e281d38"

recipes-qt/qt6/qtsvg_git.bb

@@ -13,4 +13,4 @@ include recipes-qt/qt6/qt6.inc
 
 DEPENDS += "qtbase"
 
-SRCREV = "f1aae3f2ec16075f02331fe3c7dc6eda1300b46f"
+SRCREV = "f759ab4905879c19ae094d702d5e66ab3ef06479"

recipes-qt/qt6/qttools_git.bb

@@ -19,6 +19,6 @@ SRC_URI += "\
 
 BBCLASSEXTEND =+ "native nativesdk"
 
-SRCREV = "ae93fab03d3192f1ed32471a58f58e34f757c1cd"
+SRCREV = "e633ec59893e2f4a25330be8a9ece4a943cfcef9"
 
 #PNBLACKLIST[qttools] = "broken"

recipes-qt/qt6/qtwayland_git.bb

@@ -37,4 +37,4 @@ DEPENDS += "qtbase qtdeclarative qtwayland-native wayland wayland-native"
 
 BBCLASSEXTEND =+ "native nativesdk"
 
-SRCREV = "e026ae41e2aea618b6f6dae94c5e260fb4e90ce8"
+SRCREV = "5d25a0c233b1e47cf53d05e90fc7156f8c65d170"

recipes-qt/qt6/qtwebsockets_git.bb

@@ -16,4 +16,4 @@ PACKAGECONFIG[translations] = ",,,qttranslations-${BPN}"
 
 DEPENDS += "qtbase qtdeclarative"
 
-SRCREV = "87ed789eeabaded6af1380182bf078bd516f656c"
+SRCREV = "d6790a4330256fbef578274fe3e5b0547b55c9d0"