Merge tag 'v6.2.8-lts-lgpl' into 6.26.2

Qt 6.2.8-lts-lgpl release

Change-Id: I1cc51394970218a4ac2accf66fae60670e62cd5b

16 files changed, 54 insertions, 39 deletions

diff --git a/.cmake.conf b/.cmake.conf
index f6f7fed3..55ff681c 100644
--- a/.cmake.conf
+++ b/.cmake.conf
@@ -1 +1 @@
-set(QT_REPO_MODULE_VERSION "6.2.7")
+set(QT_REPO_MODULE_VERSION "6.2.8")
diff --git a/dependencies.yaml b/dependencies.yaml
index 3021d8a4..7fa8040e 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -1,13 +1,13 @@
 dependencies:
   ../tqtc-qtdeclarative:
-    ref: 02277e3753613d9e19bbb36367c7d2b1d13d7545
+    ref: 9919f58fce6329a233ca885188d0aba5f484e546
     required: true
   ../tqtc-qtmultimedia:
-    ref: 7d7a5a372afd1e1c9f6407f8fd90b5ee56723367
+    ref: 34dc084899419ab704703a888dbffe119566eaca
     required: true
   ../tqtc-qtremoteobjects:
-    ref: 966fc136d40ec3553607d5993faccaf50ea523a7
+    ref: 62e9b83d59deb21f57f11eba755a45e0555b0df8
     required: true
   ../tqtc-qttools:
-    ref: 0f75d2b2e6c4a049682c2cc520cfc9184ef52454
+    ref: 2819de71fc973e79aa9b1e44716636ab194108b1
     required: false
diff --git a/mkspecs/features/ifcodegen.prf b/mkspecs/features/ifcodegen.prf
index bccdef9b..474340ff 100644
--- a/mkspecs/features/ifcodegen.prf
+++ b/mkspecs/features/ifcodegen.prf
@@ -59,7 +59,8 @@ IF_TEMPLATE_PATH = $$[QT_INSTALL_DATA]/ifcodegen-templates
 exists($$VIRTUALENV_PATH) {
     equals(QMAKE_HOST.os, Windows) {
         PYTHON = $$VIRTUALENV_PATH/Scripts/python.exe
-        _LIB_FOLDER = $$files($$VIRTUALENV_PATH/lib/python*)
+        _LIB_FOLDERS = $$files($$VIRTUALENV_PATH/lib/python*)
+        _LIB_FOLDER = $$first(_LIB_FOLDERS)
         SITE_PACKAGES = $${_LIB_FOLDER}/site-packages
 
         # No space between the path and && otherwise python3 adds the space to the path
@@ -68,7 +69,8 @@ exists($$VIRTUALENV_PATH) {
         ENV += set VIRTUAL_ENV=%PYTHONHOME%&&
     } else {
         PYTHON = $$VIRTUALENV_PATH/bin/python
-        _LIB_FOLDER = $$files($$VIRTUALENV_PATH/lib/python*)
+        _LIB_FOLDERS = $$files($$VIRTUALENV_PATH/lib/python*)
+        _LIB_FOLDER = $$first(_LIB_FOLDERS)
         SITE_PACKAGES = $${_LIB_FOLDER}/site-packages
 
         ENV += LD_LIBRARY_PATH="$$system_path($$VIRTUALENV_PATH/bin)"
diff --git a/src/3rdparty/qt_attribution.json b/src/3rdparty/qt_attribution.json
index 4d516cc2..72aed084 100644
--- a/src/3rdparty/qt_attribution.json
+++ b/src/3rdparty/qt_attribution.json
@@ -3,7 +3,7 @@
     "Name": "QFace",
     "QDocModule": "qtinterfaceframework",
     "QtUsage": "Used for qtivi autogeneration of interfaces.",
-    "Files": "qface ../doc/interfaceframework/src/template-syntax.qdoc ../doc/interfaceframework/src/idl-syntax.qdoc",
+    "Files": "qface ../interfaceframework/doc/src/ifcodegen/template-syntax.qdoc ../interfaceframework/doc/src/ifcodegen/idl-syntax.qdoc",
 
     "Description": "QFace is a generator framework based on a modern IDL.",
     "Homepage": "https://pelagicore.github.io/qface",
diff --git a/src/3rdparty/virtualenv/qt_attribution.json b/src/3rdparty/virtualenv/qt_attribution.json
index 55c39185..f51d3bd3 100644
--- a/src/3rdparty/virtualenv/qt_attribution.json
+++ b/src/3rdparty/virtualenv/qt_attribution.json
@@ -1,9 +1,9 @@
 {
-    "Id": "relocate-virtualenv",
-    "Name": "relocate-virtualenv",
+    "Id": "relocate_virtualenv",
+    "Name": "relocate_virtualenv",
     "QDocModule": "qtinterfaceframework",
     "QtUsage": "Used to make the python3 virtualen relocatable, needed for the ivigenerator",
-    "Path": "relocate-virtualenv.py",
+    "Files": "relocate_virtualenv.py",
 
     "Description": "A tool for creating isolated virtual python environments.",
     "Homepage": "https://virtualenv.pypa.io/en/stable/",
diff --git a/src/ifmedia/qifmediadevicediscoverymodel.cpp b/src/ifmedia/qifmediadevicediscoverymodel.cpp
index 0db317ec..7cd5bb8e 100644
--- a/src/ifmedia/qifmediadevicediscoverymodel.cpp
+++ b/src/ifmedia/qifmediadevicediscoverymodel.cpp
@@ -77,7 +77,6 @@ void QIfMediaDeviceDiscoveryModelPrivate::resetModel(const QList<QIfServiceObjec
 {
     Q_Q(QIfMediaDeviceDiscoveryModel);
     q->beginResetModel();
-    qDeleteAll(m_deviceList);
     m_deviceList.clear();
     m_deviceList = deviceList;
     q->endResetModel();
@@ -318,8 +317,6 @@ void QIfMediaDeviceDiscoveryModel::connectToServiceObject(QIfServiceObject *serv
                             d, &QIfMediaDeviceDiscoveryModelPrivate::onDeviceRemoved);
 
     QIfAbstractFeatureListModel::connectToServiceObject(serviceObject);
-
-    backend->initialize();
 }
 
 /*!
diff --git a/src/interfaceframework/doc/src/qt_attribution.json b/src/interfaceframework/doc/src/qt_attribution.json
index dfd776bf..99f02b62 100644
--- a/src/interfaceframework/doc/src/qt_attribution.json
+++ b/src/interfaceframework/doc/src/qt_attribution.json
@@ -3,7 +3,7 @@
     "Name": "Jinja Documentation",
     "QDocModule": "interfaceframework",
     "QtUsage": "Used in the Documentation of the Jinja template language",
-    "Path": "template-syntax.qdoc",
+    "Files": "ifcodegen/template-syntax.qdoc",
 
     "Description": "Full featured template engine for python.",
     "Homepage": "http://jinja.pocoo.org/",
diff --git a/src/tools/ifcodegen/deploy-virtualenv-files.txt b/src/tools/ifcodegen/deploy-virtualenv-files.txt
index 97fec4cc..a5cf0f66 100644
--- a/src/tools/ifcodegen/deploy-virtualenv-files.txt
+++ b/src/tools/ifcodegen/deploy-virtualenv-files.txt
@@ -6,6 +6,7 @@ stat.py
 tarfile.py
 ntpath.py
 genericpath.py
+re
 re.py
 types.py
 sre_*.py
diff --git a/src/tools/ifcodegen/deploy-virtualenv.bat b/src/tools/ifcodegen/deploy-virtualenv.bat
index 816978e0..9219b6a7 100644..100755
--- a/src/tools/ifcodegen/deploy-virtualenv.bat
+++ b/src/tools/ifcodegen/deploy-virtualenv.bat
@@ -53,40 +53,31 @@ FOR %%F in (%VIRTUALENV_LIB%\python*) DO (
     )
 )
 
-IF EXIST %LIB_FOLDER%\orig-prefix.txt (
-    SET /p ORIG_PREFIX=<%LIB_FOLDER%\orig-prefix.txt
-) else (
-    IF EXIST "%VIRTUALENV%\pyvenv.cfg" (
-        FOR /f "tokens=1,2 delims==" %%a in (%VIRTUALENV%\pyvenv.cfg) DO (
-            SET NAME=%%a
-            SET NAME=!NAME:~0,-1!
-            IF !NAME!==base-prefix (
-                SET ORIG_PREFIX=%%b
-                SET ORIG_PREFIX=!ORIG_PREFIX:~1!
-            )
-        )
-    ) ELSE (
-        echo "Neither %LIB_FOLDER%\orig-prefix.txt nor %VIRTUALENV%\pyvenv.cfg exists"
-        exit 1
-    )
+START /b /wait %VIRTUALENV%\Scripts\python.exe -c "import sys; print(sys.base_prefix)" > sys_path.txt
+FOR /f "delims= usebackq" %%i in ("sys_path.txt") DO (
+    SET ORIG_PREFIX=%%i
 )
 
 SET ORIG_LIB=%ORIG_PREFIX%\lib\%PYTHON_VERSION%
 IF NOT EXIST "%ORIG_LIB%" (
-    echo "%ORIG_LIB% doesn't exist"
+    echo "Couldn't find python prefix folder. The virtualenv will not be fully functional."
     exit 1
 )
 
 echo "copying files from %ORIG_LIB% to %VIRTUALENV_LIB%"
-FOR /f %%i in (%SCRIPT%\deploy-virtualenv-files.txt) DO (
+FOR /f "usebackq" %%i in ("%SCRIPT%\deploy-virtualenv-files.txt") DO (
     IF EXIST "%ORIG_LIB%%%i\" (
-        IF NOT EXIST %VIRTUALENV_LIB%\%%i mkdir %VIRTUALENV_LIB%\%%i
+        IF NOT EXIST "%VIRTUALENV_LIB%\%%i" mkdir "%VIRTUALENV_LIB%\%%i"
         xcopy "%ORIG_LIB%%%i" "%VIRTUALENV_LIB%\%%i" /E /Q /H /Y >NUL 2>&1
     ) else (
         xcopy "%ORIG_LIB%%%i" "%VIRTUALENV_LIB%" /H /Q /Y >NUL 2>&1
     )
 )
 
+FOR %%F in ("%ORIG_PREFIX%\python*") DO (
+    copy "%%F" "%VIRTUALENV%\Scripts\" /Y >NUL 2>&1
+)
+
 IF EXIST %ORIG_PREFIX%\DLLs\ (
     IF NOT EXIST %VIRTUALENV%\DLLs mkdir %VIRTUALENV%\DLLs
     xcopy "%ORIG_PREFIX%\DLLs" "%VIRTUALENV%\DLLs" /E /Q /H /Y >NUL 2>&1
diff --git a/src/tools/ifcodegen/deploy-virtualenv.sh b/src/tools/ifcodegen/deploy-virtualenv.sh
index a785eb69..d1bb2f1f 100755
--- a/src/tools/ifcodegen/deploy-virtualenv.sh
+++ b/src/tools/ifcodegen/deploy-virtualenv.sh
@@ -115,8 +115,10 @@ if [ "$PLATFORM" == "linux" ]; then
         echo "copying $LIBCRYPTO"
         cp -Lf "$LIBCRYPTO" "$VIRTUALENV/bin"
         LIBSSL=`ldd $HASHLIB | awk '{print $3}' | grep libssl`
-        echo "copying $LIBSSL"
-        cp -Lf "$LIBSSL" "$VIRTUALENV/bin"
+        if [ -e "$LIBSSL" ]; then
+            echo "copying $LIBSSL"
+            cp -Lf "$LIBSSL" "$VIRTUALENV/bin"
+        fi
     fi
     CTYPESLIB=`find $LIB_FOLDER/lib-dynload -iname '_ctypes.*'`
     if [[ -e "$CTYPESLIB" ]] ; then
@@ -145,9 +147,15 @@ fi
 # some files might have wrong permissions, e.g. readonly
 chmod -R ug+rw $VIRTUALENV
 
-if [ "$(readlink -- "$VIRTUALENV/lib64")" != "lib" ] ; then
-    cp -a "$VIRTUALENV/lib64"/* "$VIRTUALENV/lib/"
-    rm -rf "$VIRTUALENV/lib64"
+if [ -e "$VIRTUALENV/lib64" ] ; then
+    if [ "$(readlink -- "$VIRTUALENV/lib64")" != "lib" ] ; then
+        cp -a "$VIRTUALENV/lib64"/* "$VIRTUALENV/lib/"
+        rm -rf "$VIRTUALENV/lib64"
+        cd "$VIRTUALENV"
+        ln -s lib lib64
+        cd -
+    fi
+else
     cd "$VIRTUALENV"
     ln -s lib lib64
     cd -
diff --git a/src/tools/ifcodegen/templates/backend_qtro/CMakeLists.txt.tpl b/src/tools/ifcodegen/templates/backend_qtro/CMakeLists.txt.tpl
index e7a4cf4b..08e14f92 100644
--- a/src/tools/ifcodegen/templates/backend_qtro/CMakeLists.txt.tpl
+++ b/src/tools/ifcodegen/templates/backend_qtro/CMakeLists.txt.tpl
@@ -35,8 +35,10 @@ endif()
 
 qt6_set_ifcodegen_variable(${VAR_PREFIX}_SOURCES
 {% for interface in module.interfaces %}
+    ${CMAKE_CURRENT_LIST_DIR}/{{interface|lower}}robackend.h
     ${CMAKE_CURRENT_LIST_DIR}/{{interface|lower}}robackend.cpp
 {% endfor %}
+    ${CMAKE_CURRENT_LIST_DIR}/{{module.module_name|lower}}roplugin.h
     ${CMAKE_CURRENT_LIST_DIR}/{{module.module_name|lower}}roplugin.cpp
 )
 
diff --git a/src/tools/ifcodegen/templates/backend_simulator/CMakeLists.txt.tpl b/src/tools/ifcodegen/templates/backend_simulator/CMakeLists.txt.tpl
index 7ca70637..0cb84a78 100644
--- a/src/tools/ifcodegen/templates/backend_simulator/CMakeLists.txt.tpl
+++ b/src/tools/ifcodegen/templates/backend_simulator/CMakeLists.txt.tpl
@@ -31,8 +31,10 @@
 
 qt6_set_ifcodegen_variable(${VAR_PREFIX}_SOURCES
 {% for interface in module.interfaces %}
+    ${CMAKE_CURRENT_LIST_DIR}/{{interface|lower}}backend.h
     ${CMAKE_CURRENT_LIST_DIR}/{{interface|lower}}backend.cpp
 {% endfor %}
+    ${CMAKE_CURRENT_LIST_DIR}/{{module.module_name|lower}}simulatorplugin.h
     ${CMAKE_CURRENT_LIST_DIR}/{{module.module_name|lower}}simulatorplugin.cpp
 )
 
diff --git a/src/tools/ifcodegen/templates/frontend/CMakeLists.txt.tpl b/src/tools/ifcodegen/templates/frontend/CMakeLists.txt.tpl
index 368d56a6..8106faab 100644
--- a/src/tools/ifcodegen/templates/frontend/CMakeLists.txt.tpl
+++ b/src/tools/ifcodegen/templates/frontend/CMakeLists.txt.tpl
@@ -31,13 +31,20 @@
 
 qt6_set_ifcodegen_variable(${VAR_PREFIX}_SOURCES
 {% for interface in module.interfaces %}
+    ${CMAKE_CURRENT_LIST_DIR}/{{interface|lower}}.h
+    ${CMAKE_CURRENT_LIST_DIR}/{{interface|lower}}_p.h
     ${CMAKE_CURRENT_LIST_DIR}/{{interface|lower}}.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/{{interface|lower}}backendinterface.h
     ${CMAKE_CURRENT_LIST_DIR}/{{interface|lower}}backendinterface.cpp
 {% endfor %}
 {% for struct in module.structs %}
+    ${CMAKE_CURRENT_LIST_DIR}/{{struct|lower}}.h
     ${CMAKE_CURRENT_LIST_DIR}/{{struct|lower}}.cpp
 {% endfor %}
+    ${CMAKE_CURRENT_LIST_DIR}/{{module.module_name|lower}}global.h
+    ${CMAKE_CURRENT_LIST_DIR}/{{module.module_name|lower}}.h
     ${CMAKE_CURRENT_LIST_DIR}/{{module.module_name|lower}}.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/{{module.module_name|lower}}factory.h
     ${CMAKE_CURRENT_LIST_DIR}/{{module.module_name|lower}}factory.cpp
 )
 
diff --git a/src/tools/ifcodegen/templates/server_qtro/CMakeLists.txt.tpl b/src/tools/ifcodegen/templates/server_qtro/CMakeLists.txt.tpl
index 150a2d7a..f9e5957c 100644
--- a/src/tools/ifcodegen/templates/server_qtro/CMakeLists.txt.tpl
+++ b/src/tools/ifcodegen/templates/server_qtro/CMakeLists.txt.tpl
@@ -34,6 +34,7 @@ if (NOT TARGET Qt6::RemoteObjects OR NOT TARGET Qt6::IfRemoteObjectsHelperPrivat
 endif()
 
 qt6_set_ifcodegen_variable(${VAR_PREFIX}_SOURCES
+    ${CMAKE_CURRENT_LIST_DIR}/core.h
     ${CMAKE_CURRENT_LIST_DIR}/core.cpp
 )
 
diff --git a/src/tools/ifcodegen/templates/server_qtro_simulator/CMakeLists.txt.tpl b/src/tools/ifcodegen/templates/server_qtro_simulator/CMakeLists.txt.tpl
index 6a817351..70f49e5f 100644
--- a/src/tools/ifcodegen/templates/server_qtro_simulator/CMakeLists.txt.tpl
+++ b/src/tools/ifcodegen/templates/server_qtro_simulator/CMakeLists.txt.tpl
@@ -35,9 +35,12 @@ endif()
 
 qt6_set_ifcodegen_variable(${VAR_PREFIX}_SOURCES
 {% for interface in module.interfaces %}
+    ${CMAKE_CURRENT_LIST_DIR}/{{interface|lower}}backend.h
     ${CMAKE_CURRENT_LIST_DIR}/{{interface|lower}}backend.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/{{interface|lower}}adapter.h
     ${CMAKE_CURRENT_LIST_DIR}/{{interface|lower}}adapter.cpp
 {% endfor %}
+    ${CMAKE_CURRENT_LIST_DIR}/core.h
     ${CMAKE_CURRENT_LIST_DIR}/core.cpp
     ${CMAKE_CURRENT_LIST_DIR}/main.cpp
 )
diff --git a/src/tools/ifcodegen/templates/test/CMakeLists.txt.tpl b/src/tools/ifcodegen/templates/test/CMakeLists.txt.tpl
index ca664305..fbf8b9f5 100644
--- a/src/tools/ifcodegen/templates/test/CMakeLists.txt.tpl
+++ b/src/tools/ifcodegen/templates/test/CMakeLists.txt.tpl
@@ -31,6 +31,7 @@
 
 qt6_set_ifcodegen_variable(${VAR_PREFIX}_SOURCES
 {% for interface in module.interfaces %}
+    ${CMAKE_CURRENT_LIST_DIR}/tst_{{interface|lower}}.h
     ${CMAKE_CURRENT_LIST_DIR}/tst_{{interface|lower}}.cpp
 {% endfor %}
     ${CMAKE_CURRENT_LIST_DIR}/main.cpp