Merge remote-tracking branch 'origin/tqtc/lts-6.2.8' into tqtc/lts-6.2-opensource

Conflicts solved in a file:
	dependencies.yaml

Change-Id: I2536b35d41b1549013c039d82b074bc41905e8b2

7 files changed, 58 insertions, 23 deletions

diff --git a/.cmake.conf b/.cmake.conf
index 07d90b8..e62fae5 100644
--- a/.cmake.conf
+++ b/.cmake.conf
@@ -1,2 +1,2 @@
-set(QT_REPO_MODULE_VERSION "6.2.7")
+set(QT_REPO_MODULE_VERSION "6.2.8")
 set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "")
diff --git a/.qmake.conf b/.qmake.conf
index 24e796f..a0cf48b 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -2,4 +2,4 @@ load(qt_build_config)
 
 DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS
 
-MODULE_VERSION = 6.2.7
+MODULE_VERSION = 6.2.8
diff --git a/dependencies.yaml b/dependencies.yaml
index fee29a4..f522f48 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -1,4 +1,4 @@
 dependencies:
   ../tqtc-qtbase:
-    ref: 694575a59b5370afc494fbf700eee8db1d1ec091
+    ref: 67934c103800bae50c2ec1977758d40fa8e4e507
     required: true
diff --git a/src/activeqt/container/qaxbase.cpp b/src/activeqt/container/qaxbase.cpp
index cec1142..0d4fae7 100644
--- a/src/activeqt/container/qaxbase.cpp
+++ b/src/activeqt/container/qaxbase.cpp
@@ -78,6 +78,7 @@
 #include <private/qobject_p.h>
 #include <private/qmetaobject_p.h>
 #include <private/qmetaobjectbuilder_p.h>
+#include <private/qtools_p.h>
 
 #include <qt_windows.h>
 #include <ocidl.h>
@@ -2288,7 +2289,7 @@ void MetaObjectGenerator::addSetterSlot(const QByteArray &property)
     if (isupper(prototype.at(0))) {
         prototype.insert(0, "Set");
     } else {
-        prototype[0] = char(toupper(prototype[0]));
+        prototype[0] = QtMiscUtils::toAsciiUpper(prototype[0]);
         prototype.insert(0, "set");
     }
     const QByteArray type = propertyType(property);
@@ -2486,7 +2487,7 @@ void MetaObjectGenerator::readFuncsInfo(ITypeInfo *typeinfo, ushort nFuncs)
                     set = "Set";
                 } else {
                     set = "set";
-                    prototype[0] = char(toupper(prototype[0]));
+                    prototype[0] = QtMiscUtils::toAsciiUpper(prototype[0]);
                 }
 
                 prototype = set + prototype;
diff --git a/src/activeqt/container/qaxdump.cpp b/src/activeqt/container/qaxdump.cpp
index 5ae4f79..7b6a872 100644
--- a/src/activeqt/container/qaxdump.cpp
+++ b/src/activeqt/container/qaxdump.cpp
@@ -57,6 +57,7 @@
 #include <qt_windows.h>
 #include <qtextstream.h>
 #include <qiodevicebase.h>
+#include <private/qtools_p.h>
 
 #include <ctype.h>
 
@@ -125,7 +126,7 @@ static QByteArray toType(const QByteArray &t)
 
     if (type.at(0) == 'Q')
         type.remove(0, 1);
-    type[0] = toupper(type.at(0));
+    type[0] = QtMiscUtils::toAsciiLower(type.at(0));
     if (type == "VariantList")
         type = "List";
     else if (type == "Map<QVariant,QVariant>")
@@ -363,7 +364,7 @@ QString qax_generateDocumentation(QAxBase *that)
                     setterSlot = "Set" + name;
                 } else {
                     QByteArray nameUp = name;
-                    nameUp[0] = char(toupper(nameUp.at(0)));
+                    nameUp[0] = QtMiscUtils::toAsciiUpper(nameUp.at(0));
                     setterSlot = "set" + nameUp;
                 }
                 detail += QLatin1String("<a href=\"#") + QString::fromLatin1(setterSlot) + QLatin1String("\">") +
diff --git a/src/activeqt/control/Qt6AxServerMacros.cmake b/src/activeqt/control/Qt6AxServerMacros.cmake
index 0e6bcad..24cbaab 100644
--- a/src/activeqt/control/Qt6AxServerMacros.cmake
+++ b/src/activeqt/control/Qt6AxServerMacros.cmake
@@ -52,36 +52,67 @@ function(qt6_target_idl target)
     set(output_idl "${CMAKE_CURRENT_BINARY_DIR}/${target}$<CONFIG>.idl")
     set(output_tlb "${CMAKE_CURRENT_BINARY_DIR}/${target}$<CONFIG>.tlb")
 
+    _qt_internal_get_tool_wrapper_script_path(tool_wrapper)
     set(tlb_command_list "")
-    _qt_internal_wrap_tool_command(tlb_command_list APPEND
-        "$<TARGET_FILE:${QT_CMAKE_EXPORT_NAMESPACE}::idc>" "$<TARGET_FILE:${target}>"
-        /idl "${output_idl}" -version 1.0
+
+    # Wrap tool paths in $<COMMAND_CONFIG> to ensure we use the release tool when building debug
+    # targets in a multi-config build, because the debug tool is usually not built by default.
+    if(CMAKE_GENERATOR STREQUAL "Ninja Multi-Config" AND CMAKE_VERSION VERSION_GREATER_EQUAL "3.20")
+        set(cmb "$<COMMAND_CONFIG:")
+        set(cme ">")
+    else()
+        set(cmb "")
+        set(cme "")
+    endif()
+
+    set(idc_target "${QT_CMAKE_EXPORT_NAMESPACE}::idc")
+    set(idc_target_file "$<TARGET_FILE:${idc_target}>")
+    set(idc_target_file_command_config_wrapped "${cmb}${idc_target_file}${cme}")
+
+    list(APPEND tlb_command_list
+        COMMAND
+            "${tool_wrapper}"
+            "${idc_target_file_command_config_wrapped}"
+            "$<TARGET_FILE:${target}>"
+            /idl "${output_idl}" -version 1.0
     )
 
-    _qt_internal_wrap_tool_command(tlb_command_list APPEND
-        midl "${output_idl}" /nologo /tlb "${output_tlb}"
+    list(APPEND tlb_command_list
+        COMMAND
+            "${tool_wrapper}" midl "${output_idl}" /nologo /tlb "${output_tlb}"
     )
 
     set(rc_files "$<FILTER:$<TARGET_PROPERTY:${target},SOURCES>,INCLUDE,\\.rc$>")
     set(have_rc_files "$<NOT:$<BOOL:$<STREQUAL:${rc_files},>>>")
-    set(rc_cmd "$<TARGET_FILE:${QT_CMAKE_EXPORT_NAMESPACE}::idc>$<SEMICOLON>\
-$<TARGET_FILE:${target}>$<SEMICOLON>/tlb$<SEMICOLON>${output_tlb}")
-    set(no_rc_cmd "echo \"No rc-file linked into project. The type library of the ${target} \
-target will be a separate file.\"")
-    _qt_internal_wrap_tool_command(tlb_command_list APPEND
-        "$<IF:${have_rc_files},${rc_cmd},${no_rc_cmd}>"
+
+    set(no_rc_cmd "echo$<SEMICOLON>No rc-file linked into project. The type library of the \
+${target} target will be a separate file.")
+
+    set(idc_args
+        "$<SEMICOLON>$<TARGET_FILE:${target}>$<SEMICOLON>/tlb$<SEMICOLON>${output_tlb}")
+
+    # Split command into two parts, so that COMMAND_CONFIG can be applied only to the idc tool path,
+    # but not the target and tlb files.
+    set(cmd_part1 "${cmb}$<IF:${have_rc_files},${idc_target_file},${no_rc_cmd}>${cme}")
+    set(cmd_part2 "$<${have_rc_files}:${idc_args}>")
+
+    list(APPEND tlb_command_list
+        COMMAND
+            "${tool_wrapper}" "${cmd_part1}" "${cmd_part2}"
     )
 
     if(NOT arg_NO_AX_SERVER_REGISTRATION AND NOT QT_NO_AX_SERVER_REGISTRATION)
-        _qt_internal_wrap_tool_command(tlb_command_list APPEND
-            "$<TARGET_FILE:${QT_CMAKE_EXPORT_NAMESPACE}::idc>"
-             "$<TARGET_FILE:${target}>" /regserver
+        list(APPEND tlb_command_list
+            COMMAND
+                "${tool_wrapper}"
+                "${idc_target_file_command_config_wrapped}"
+                "$<TARGET_FILE:${target}>" /regserver
         )
     endif()
     add_custom_command(TARGET ${target} POST_BUILD
         ${tlb_command_list}
         DEPENDS
-            ${QT_CMAKE_EXPORT_NAMESPACE}::idc
+            "${idc_target}"
         VERBATIM
         COMMAND_EXPAND_LISTS
     )
diff --git a/tools/dumpcpp/moc.cpp b/tools/dumpcpp/moc.cpp
index f4747f3..a594837 100644
--- a/tools/dumpcpp/moc.cpp
+++ b/tools/dumpcpp/moc.cpp
@@ -35,6 +35,8 @@
 #include <QTemporaryFile>
 #include <QTextStream>
 
+#include <private/qtools_p.h>
+
 QT_BEGIN_NAMESPACE
 
 QByteArray setterName(const QByteArray &propertyName)
@@ -43,7 +45,7 @@ QByteArray setterName(const QByteArray &propertyName)
     if (isupper(setter.at(0))) {
         setter = "Set" + setter;
     } else {
-        setter[0] = char(toupper(setter[0]));
+        setter[0] = QtMiscUtils::toAsciiUpper(setter[0]);
         setter = "set" + setter;
     }
     return setter;