Merge tag 'v6.2.7-lts-lgpl' into 6.2

Qt 6.2.7-lts-lgpl release

Change-Id: I4203de9383e015e6d68494376134cb4089cb2c6c

6 files changed, 27 insertions, 20 deletions

diff --git a/.cmake.conf b/.cmake.conf
index b9c40d18..f6f7fed3 100644
--- a/.cmake.conf
+++ b/.cmake.conf
@@ -1 +1 @@
-set(QT_REPO_MODULE_VERSION "6.2.6")
+set(QT_REPO_MODULE_VERSION "6.2.7")
diff --git a/dependencies.yaml b/dependencies.yaml
index 21ab90e7..3021d8a4 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -1,13 +1,13 @@
 dependencies:
   ../tqtc-qtdeclarative:
-    ref: 4a6dfcd838a62ed7b3500326af6099c00a5cbf49
+    ref: 02277e3753613d9e19bbb36367c7d2b1d13d7545
     required: true
   ../tqtc-qtmultimedia:
-    ref: 6186737e9f3a6b4b3fcbc5840b80baeb91cf13fc
+    ref: 7d7a5a372afd1e1c9f6407f8fd90b5ee56723367
     required: true
   ../tqtc-qtremoteobjects:
-    ref: 7424e53dde422bfbed670479dbd9c68b6d481fd3
+    ref: 966fc136d40ec3553607d5993faccaf50ea523a7
     required: true
   ../tqtc-qttools:
-    ref: df27c1eff5abe66b11d529b2e74f2f98d71d2733
+    ref: 0f75d2b2e6c4a049682c2cc520cfc9184ef52454
     required: false
diff --git a/src/interfaceframework/Qt6InterfaceFrameworkMacros.cmake b/src/interfaceframework/Qt6InterfaceFrameworkMacros.cmake
index e4e32ce2..d1320dd3 100644
--- a/src/interfaceframework/Qt6InterfaceFrameworkMacros.cmake
+++ b/src/interfaceframework/Qt6InterfaceFrameworkMacros.cmake
@@ -343,12 +343,12 @@ function(qt6_ifcodegen_generate)
                     set(QT_IFCODEGEN_VIRTUALENV_PYTHON_VERSION ${CMAKE_MATCH_1} CACHE STRING "ifcodegen virtualenv python version")
                 endif()
                 set(PYTHON_EXECUTABLE ${QT_IFCODEGEN_VIRTUALENV_PATH}/bin/python)
-                set(ENV{LC_ALL} en_US.UTF-8)
-                set(ENV{LD_LIBRARY_PATH} ${QT_IFCODEGEN_VIRTUALENV_PATH}/bin)
+                list(APPEND CMD_ENV LC_ALL=en_US.UTF-8)
+                list(APPEND CMD_ENV LD_LIBRARY_PATH=${QT_IFCODEGEN_VIRTUALENV_PATH}/bin)
             endif()
-            set(ENV{VIRTUAL_ENV} ${QT_IFCODEGEN_VIRTUALENV_PATH})
-            set(ENV{PYTHONPATH} ${QT_IFCODEGEN_VIRTUALENV_PATH}/lib/python${QT_IFCODEGEN_VIRTUALENV_PYTHON_VERSION}/site-packages)
-            set(ENV{PYTHONHOME} ${QT_IFCODEGEN_VIRTUALENV_PATH})
+            list(APPEND CMD_ENV VIRTUAL_ENV=${QT_IFCODEGEN_VIRTUALENV_PATH})
+            list(APPEND CMD_ENV PYTHONPATH=${QT_IFCODEGEN_VIRTUALENV_PATH}/lib/python${QT_IFCODEGEN_VIRTUALENV_PYTHON_VERSION}/site-packages)
+            list(APPEND CMD_ENV PYTHONHOME=${QT_IFCODEGEN_VIRTUALENV_PATH})
         else()
             include(QtFindPackageHelpers)
             qt_find_package(Python3 PROVIDED_TARGETS Python3::Interpreter MODULE_NAME interfaceframework)
@@ -358,12 +358,13 @@ function(qt6_ifcodegen_generate)
             endif()
         endif()
         if (DEFINED QT_IFCODEGEN_IFGENERATOR_CONFIG)
-            set(ENV{IFGENERATOR_CONFIG} ${QT_IFCODEGEN_IFGENERATOR_CONFIG})
+            list(APPEND CMD_ENV IFGENERATOR_CONFIG=${QT_IFCODEGEN_IFGENERATOR_CONFIG})
         endif()
 
         message(STATUS "Running ifcodegen for ${IDL_FILES} with template ${TEMPLATE}")
         set(GENERATOR_CMD
-                ${PYTHON_EXECUTABLE}
+                ${CMAKE_COMMAND} -E env ${CMD_ENV}
+                ${PYTHON_EXECUTABLE} -B
                 ${QT_IFCODEGEN_GENERATOR_PATH}/generate.py
                 ${GENERATOR_ARGUMENTS}
                 ${IDL_FILES}
@@ -385,7 +386,11 @@ function(qt6_ifcodegen_generate)
             endif()
             execute_process(COMMAND ${CMAKE_COMMAND} -E touch ${OUTPUT_DIR}/.stamp-ifcodegen)
         else()
-            message(FATAL_ERROR "Error while running the ifcodegen:\n${GENERATOR_CMD_STR}\n${GENERATOR_LOG}")
+            # FATAL_ERROR doesn't print the message as is. Because of that the command cannot
+            # be copied into a terminal window anymore. To fix this we report the full
+            # command and log output and then exit with a fatal error
+            message("ifcodegen call failed:\n${GENERATOR_CMD_STR}\n${GENERATOR_LOG}")
+            message(FATAL_ERROR "Error while running ifcodegen")
         endif()
     endif()
 
diff --git a/src/interfaceframework/qifservicemanager.cpp b/src/interfaceframework/qifservicemanager.cpp
index 1666f0b0..f6b5a0f9 100644
--- a/src/interfaceframework/qifservicemanager.cpp
+++ b/src/interfaceframework/qifservicemanager.cpp
@@ -346,7 +346,7 @@ void QIfServiceManagerPrivate::addBackend(Backend *backend)
             if (interfaces == newInterfaces && b->name == backend->name) {
                 const QString fileName = b->metaData.value(fileNameLiteral).toString();
                 if (fileName == newBackendFile) {
-                    qCDebug(qLcIfServiceManagement, "SKIPPING %s: already in the list", qPrintable(newBackendFile));
+                    qCDebug(qLcIfServiceManagement, "Skipping backend %s: already in the list", qPrintable(newBackendFile));
                     return;
                 }
 
@@ -358,14 +358,14 @@ void QIfServiceManagerPrivate::addBackend(Backend *backend)
                                                     qtif_helper::loadDebug ? "debug" : "release",
                                                     qPrintable(b->debug == qtif_helper::loadDebug ? fileName : newBackendFile));
                     if (b->debug != qtif_helper::loadDebug) {
-                        qCDebug(qLcIfServiceManagement, "REPLACING %s with %s", qPrintable(fileName), qPrintable(newBackendFile));
+                        qCDebug(qLcIfServiceManagement, "Replacing backend %s with %s", qPrintable(fileName), qPrintable(newBackendFile));
                         addBackend = false;
                         m_backends[i] = backend;
                         emit q->dataChanged(q->index(i, 0), q->index(i, 0));
                         delete b;
                         break;
                     } else {
-                        qCDebug(qLcIfServiceManagement, "SKIPPING %s: wrong configuration", qPrintable(newBackendFile));
+                        qCDebug(qLcIfServiceManagement, "Skipping backend %s: wrong configuration", qPrintable(newBackendFile));
                         return;
                     }
                 }
@@ -373,7 +373,8 @@ void QIfServiceManagerPrivate::addBackend(Backend *backend)
         }
     }
     if (addBackend) {
-        qCDebug(qLcIfServiceManagement, "ADDING %s", qPrintable(newBackendFile.isEmpty() ? backend->name : newBackendFile));
+        qCDebug(qLcIfServiceManagement, "Adding %s %s", qPrintable(newBackendFile.isEmpty() ? backend->name : newBackendFile),
+                QIfServiceManagerPrivate::isSimulation(backend->metaData) ? "as simulation backend" : "as production backend");
         q->beginInsertRows(QModelIndex(), m_backends.count(), m_backends.count());
         m_backends.append(backend);
         q->endInsertRows();
diff --git a/src/interfaceframework/qifservicemanager.h b/src/interfaceframework/qifservicemanager.h
index 6377420a..ed4a2497 100644
--- a/src/interfaceframework/qifservicemanager.h
+++ b/src/interfaceframework/qifservicemanager.h
@@ -78,10 +78,10 @@ public:
 
     static QIfServiceManager *instance();
 
-    Q_INVOKABLE QList<QIfServiceObject*> findServiceByInterface(const QString &interface, SearchFlags searchFlags = IncludeAll);
+    Q_INVOKABLE QList<QIfServiceObject*> findServiceByInterface(const QString &interface, QIfServiceManager::SearchFlags searchFlags = IncludeAll);
     Q_INVOKABLE bool hasInterface(const QString &interface) const;
 
-    bool registerService(QObject *serviceBackendInterface, const QStringList &interfaces, BackendType backendType = ProductionBackend);
+    bool registerService(QObject *serviceBackendInterface, const QStringList &interfaces, QIfServiceManager::BackendType backendType = ProductionBackend);
     void unloadAllBackends();
 
     int rowCount(const QModelIndex &parent = QModelIndex()) const override;
diff --git a/src/tools/ifcodegen/templates/backend_simulator/plugin.json b/src/tools/ifcodegen/templates/backend_simulator/plugin.json
index 4871c3eb..3a73645a 100644
--- a/src/tools/ifcodegen/templates/backend_simulator/plugin.json
+++ b/src/tools/ifcodegen/templates/backend_simulator/plugin.json
@@ -39,5 +39,6 @@
 {%   endif %}
       "{{iid}}"{% if not loop.last %},{%endif%}
 {% endfor%}
-    ]
+    ],
+    "simulation" : true
 }