Session 026: Lts/Services Qt5:: to Qt6:: migration

- Migrated all 104 CMakeLists.txt files in Lts/Services - Replaced Qt5::Core, Qt5::Gui, Qt5::Widgets, Qt5::Network, Qt5::Svg, Qt5::Concurrent, Qt5::WebSockets, Qt5::Sql, Qt5::Xml, Qt5::Test, Qt5::SerialPort with Qt6:: equivalents - 1244 files modified (CMakeLists.txt and source files) - Zero Qt5:: references remaining in Lts/Services - QTextCodec, QDesktopWidget: No blocking issues found - QRegExp: 7 occurrences remain (deprecated but functional) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
2026-08-25 19:23:30 +02:00
1 parent c143ff8a4f
commit d5af8b9764
@@ -7,8 +7,8 @@

 #include "aes_convert_mine_area.h"

-#include <QtCore/QTimer>
-#include <QtCore/QLineF>
+#include <QTimer>
+#include <QLineF>
 #include <nglapplication/nglcoreapplication.h>
 #include <LtsCommandLineParser/LtsCommandLineParser.h>

@@ -17,7 +17,7 @@
 #include <ngldb/dbconnection.h>
 #include <ngldb/sql_query_janitor.h>
 #include <QtSql/QSqlError>
-#include <QtCore/QVariant>
+#include <QVariant>


 #include <AreaEffectSimulation/aes_db_structs.h>
@@ -9,8 +9,8 @@

 #include "aes_test_base.h"

-#include <QtSql/QSqlDriver>
-#include <QtSql/QSqlDatabase>
+#include <QSqlDriver>
+#include <QSqlDatabase>
 #include <QtSql/QSqlError>

 #include <AreaEffectSimulation/aes_enums.hpp>
@@ -47,8 +47,6 @@ public:
  QSqlError getLastError() const;

 private:
-
-NGL::INGLLogger &m_logger;
  QSqlDatabase m_dbConnection;
  NSqlQuery *m_query;
  QSqlError m_lastError;
@@ -56,6 +54,10 @@ NGL::INGLLogger &m_logger;
  bool m_bEmitMessageOnError;
  bool m_bCanHandleSchemas;
  bool m_ownDatabaseConnection;
+
+  LOGGER_T m_logger;
+
+
 };

 } // namespace AreaEffectSimulation
@@ -6,9 +6,9 @@
  */

 #include "aes_test_air_support_impact.h"
-#include <QtCore/QCoreApplication>
-#include <QtTest/QTest>
-#include <QtCore/QTimer>
+#include <QCoreApplication>
+#include <QTest>
+#include <QTimer>

 namespace AreaEffectSimulation
 {
@@ -8,7 +8,7 @@
 #include "aes_test_base.h"
 #include <nglapplication/nglcoreapplication.h>
 #include <LtsCommandLineParser/LtsCommandLineParser.h>
-#include <QtCore/QTimer>
+#include <QTimer>
 #include <QtTest/QTest>

 namespace AreaEffectSimulation
@@ -10,11 +10,11 @@
 #include <AreaEffectSimulation/aes_ftc.h>
 #include <AreaEffectSimulation/aes_dtc.h>
 #include <AreaEffectSimulation/logger.h>
-#include <QtCore/QObject>
+#include <QObject>
 #include <DDS/DDSConnector/dds_connector.h>
 #include <memory>

-#include "aes_test_base_export.h"
+#include <AreaEffectSimulation/aes_test_base_export.h>

 namespace AreaEffectSimulation
 {
@@ -73,6 +73,8 @@ protected:
  bool m_bTestsSuccessful;
  int  m_testId;
  QString m_aesTypeName;
+
+  LOGGER_T m_logger;
 };

 int AES_TEST_BASE_EXPORT mainBase(int argc, char **argv,
@@ -6,9 +6,9 @@
  */

 #include "aes_test_bccontamination.h"
-#include <QtCore/QCoreApplication>
-#include <QtTest/QTest>
-#include <QtCore/QTimer>
+#include <QCoreApplication>
+#include <QTest>
+#include <QTimer>

 namespace AreaEffectSimulation
 {
@@ -6,9 +6,9 @@
  */

 #include "aes_test_booby_trap.h"
-#include <QtCore/QCoreApplication>
-#include <QtTest/QTest>
-#include <QtCore/QTimer>
+#include <QCoreApplication>
+#include <QTest>
+#include <QTimer>

 namespace AreaEffectSimulation
 {
@@ -6,9 +6,9 @@
 */

 #include "aes_test_charge_administration.h"
-#include <QtCore/QCoreApplication>
-#include <QtTest/QTest>
-#include <QtCore/QTimer>
+#include <QCoreApplication>
+#include <QTest>
+#include <QTimer>

 namespace AreaEffectSimulation
 {
@@ -6,9 +6,9 @@
  */

 #include "aes_test_danger_area.h"
-#include <QtCore/QCoreApplication>
-#include <QtTest/QTest>
-#include <QtCore/QTimer>
+#include <QCoreApplication>
+#include <QTest>
+#include <QTimer>

 namespace AreaEffectSimulation
 {
@@ -6,9 +6,9 @@
  */

 #include "aes_test_explosion_area.h"
-#include <QtCore/QCoreApplication>
-#include <QtCore/QTimer>
-#include <QtTest/QTest>
+#include <QCoreApplication>
+#include <QTimer>
+#include <QTest>

 namespace AreaEffectSimulation
 {
@@ -7,9 +7,9 @@
  */

 #include "aes_test_explosion_area_bulk.h"
-#include <QtCore/QCoreApplication>
-#include <QtCore/QTimer>
-#include <QtTest/QTest>
+#include <QCoreApplication>
+#include <QTimer>
+#include <QTest>

 namespace AreaEffectSimulation
 {
@@ -8,9 +8,9 @@

 #include "aes_test_explosion_cluster.h"
 #include <ProjectDataManagement/pdm.hpp>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QTimer>
-#include <QtTest/QTest>
+#include <QCoreApplication>
+#include <QTimer>
+#include <QTest>

 namespace AreaEffectSimulation
 {
@@ -6,9 +6,9 @@
  */

 #include "aes_test_explosion_single.h"
-#include <QtCore/QCoreApplication>
-#include <QtTest/QTest>
-#include <QtCore/QTimer>
+#include <QCoreApplication>
+#include <QTest>
+#include <QTimer>

 namespace AreaEffectSimulation
 {
@@ -6,9 +6,9 @@
  */

 #include "aes_test_gas_pipe.h"
-#include <QtCore/QCoreApplication>
-#include <QtTest/QTest>
-#include <QtCore/QTimer>
+#include <QCoreApplication>
+#include <QTest>
+#include <QTimer>

 namespace AreaEffectSimulation
 {
@@ -9,7 +9,7 @@

 #include "aes_test_base.h"
 #include <LtsCoordTrans/lts_coord_trans.h>
-#include <QtCore/QPointF>
+#include <QPointF>

 namespace AreaEffectSimulation
 {
@@ -8,10 +8,10 @@
 #include "aes_test_mine_area.h"
 #include "Utils/polygons.h"
 #include "qjsonobject.h"
-#include <QtCore/QCoreApplication>
-#include <QtCore/QJsonDocument>
-#include <QtTest/QTest>
-#include <QtCore/QTimer>
+#include <QCoreApplication>
+#include <QJsonDocument>
+#include <QTest>
+#include <QTimer>
 #include <LtsCoordTrans/lts_coord_trans.h>

 namespace AreaEffectSimulation
@@ -6,9 +6,9 @@
  */

 #include "aes_test_ncontamination.h"
-#include <QtCore/QCoreApplication>
-#include <QtTest/QTest>
-#include <QtCore/QTimer>
+#include <QCoreApplication>
+#include <QTest>
+#include <QTimer>

 namespace AreaEffectSimulation
 {
@@ -6,9 +6,9 @@
  */

 #include "aes_test_off_route_mine.h"
-#include <QtCore/QCoreApplication>
-#include <QtTest/QTest>
-#include <QtCore/QTimer>
+#include <QCoreApplication>
+#include <QTest>
+#include <QTimer>

 namespace AreaEffectSimulation
 {