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>
This commit is contained in:
1 parent
c143ff8a4f
commit
d5af8b9764
1244 files changed
+4266
-4633
No files matched your search
-2
@@ -9,7 +9,6 @@ SET(SRCS_IMPORT_BUILDINGS
|
||||
ism_import_buildings.h
|
||||
)
|
||||
NGL_ADD_EXECUTABLE(AAR SV WS ismImportBuildings ${SRCS_IMPORT_BUILDINGS})
|
||||
IF(BUILD_RTI)
|
||||
NGL_TARGET_LINK_LIBRARIES(ismImportBuildings
|
||||
Qt6::Core
|
||||
RTI::nddscpp2
|
||||
@@ -20,6 +19,5 @@ NGL_TARGET_LINK_LIBRARIES(ismImportBuildings
|
||||
LtsUtilsCoreHeaderOnly
|
||||
Qt6::WebSockets
|
||||
)
|
||||
ENDIF(BUILD_RTI)
|
||||
NGL_INSTALL_TARGET(ismImportBuildings)
|
||||
|
||||
+9
-8
@@ -13,16 +13,16 @@
|
||||
#include <nglapplication/nglcoreapplication.h>
|
||||
#include <LtsCommandLineParser/LtsCommandLineParser.h>
|
||||
|
||||
#include <QtCore/QFile>
|
||||
#include <QtCore/QTextStream>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtCore/QJsonArray>
|
||||
#include <QFile>
|
||||
#include <QTextStream>
|
||||
#include <QTimer>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QJsonArray>
|
||||
#include <QtWebSockets/QWebSocket>
|
||||
#include <QtCore/QUrl>
|
||||
#include <QUrl>
|
||||
|
||||
#include <QtCore/QThread>
|
||||
#include <QThread>
|
||||
|
||||
#include <InfrastructureManagement/ism_ftc.h>
|
||||
#include <InfrastructureManagement/ism_dtc.h>
|
||||
@@ -34,6 +34,7 @@ using namespace InfrastructureManagement;
|
||||
// ------------------------------------------------------------------------------
|
||||
IsmImportBuildings::IsmImportBuildings(QObject *parent)
|
||||
: QObject(parent)
|
||||
, m_logger(getLogger("ImportXml"))
|
||||
{
|
||||
qRegisterMetaType<Core::FunctionReply>("Core::FunctionReply");
|
||||
connect(this, &IsmImportBuildings::importDone, this, &IsmImportBuildings::importNext);
|
||||
|
||||
+1
-1
@@ -13,7 +13,7 @@
|
||||
#include <InfrastructureManagement/ism_dtc.h>
|
||||
#include <DDS/DDSConnector/dds_connector.h>
|
||||
#include <InfrastructureManagement/logger.h>
|
||||
#include <QtCore/QVector>
|
||||
#include <QVector>
|
||||
|
||||
//----------------------------------------------------------------------------------------------
|
||||
namespace InfrastructureManagement
|
||||
|
||||
Reference in new issue
Block a user