diff --git a/qt6-after/qt6-migrated-legatus/Lts/Application/THP/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Application/THP/CMakeLists.txt index b7a50f1b6..a1fa02a8d 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Application/THP/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Application/THP/CMakeLists.txt @@ -75,14 +75,14 @@ NGL_TARGET_LINK_LIBRARIES(thp_viewer ArcGISQt5Hack # make sure it's loaded *before* libEsriCommonQt.so ${VLC_LIBRARIES} - Qt5::Core - Qt5::Gui - Qt5::PrintSupport - Qt5::Svg - Qt5::WebEngineCore - Qt5::WebEngineWidgets - Qt5::Widgets - Qt5::Xml + Qt6::Core + Qt6::Gui + Qt6::PrintSupport + Qt6::Svg + Qt6::WebEngineCore + Qt6::WebEngineWidgets + Qt6::Widgets + Qt6::Xml RmeLightStyleQrc diff --git a/qt6-after/qt6-migrated-legatus/Lts/Application/THP/SitMapReplayTest/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Application/THP/SitMapReplayTest/CMakeLists.txt index db06b8b34..4af2ca45a 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Application/THP/SitMapReplayTest/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Application/THP/SitMapReplayTest/CMakeLists.txt @@ -18,7 +18,7 @@ NGL_TARGET_LINK_LIBRARIES(SitMapReplayTest SituationReplaySqlite ddsconnector - Qt5::Core + Qt6::Core nglapplication SitmapDds diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsRestClient/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsRestClient/CMakeLists.txt index c7834baf2..b91347b24 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsRestClient/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsRestClient/CMakeLists.txt @@ -22,6 +22,6 @@ NGL_TARGET_INCLUDE_DIRECTORIES(LtsRestClient NGL_TARGET_LINK_LIBRARIES(LtsRestClient PUBLIC - Qt5::Core - Qt5::Network + Qt6::Core + Qt6::Network ) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/CMakeLists.txt index b899cdce6..bf7186f50 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/CMakeLists.txt @@ -158,8 +158,8 @@ NGL_TARGET_INCLUDE_DIRECTORIES(LtsWidgets NGL_TARGET_LINK_LIBRARIES(LtsWidgets PRIVATE - Qt5::Network # for QHostInfo - for portability - Qt5::Svg + Qt6::Network # for QHostInfo - for portability + Qt6::Svg ngltools ngltranslator TabBarTabStyle @@ -167,9 +167,9 @@ NGL_TARGET_LINK_LIBRARIES(LtsWidgets LtsUtilsSettings PUBLIC LtsUtilsCore - Qt5::Core - Qt5::Widgets - Qt5::Gui + Qt6::Core + Qt6::Widgets + Qt6::Gui ) NGL_INSTALL_TARGET(LtsWidgets) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/CMakeLists.txt index 6073a3a12..ccc9903c6 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/CMakeLists.txt @@ -107,5 +107,5 @@ ADD_INTERFACE_LIBRARY( GuiElementInterface ${CMAKE_CURRENT_SOURCE_DIR}/participant_info_gui_element_interface.h ${CMAKE_CURRENT_SOURCE_DIR}/.. - Qt5::Core LtsWidgets + Qt6::Core LtsWidgets ) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/CMakeLists.txt index 07e52932e..dadc17ddf 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/CMakeLists.txt @@ -88,7 +88,7 @@ NGL_TARGET_LINK_LIBRARIES(PpmParticipantInfoGuiPlugin PdmDataPluginInterface svcTgtClient PdmGuiPluginInterface - Qt5::Widgets + Qt6::Widgets LtsWidgets LtsSession LtsSessionData diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceManagement/Data/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceManagement/Data/CMakeLists.txt index bdd043caa..5e6f093d1 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceManagement/Data/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceManagement/Data/CMakeLists.txt @@ -10,7 +10,7 @@ # NGL_ADD_LIBRARY(WS ScmDataPlugin MODULE scm_data_plugin.cpp scm_data_plugin.h) NGL_TARGET_LINK_LIBRARIES(ScmDataPlugin - Qt5::Core + Qt6::Core ScmDataPluginInterface svcScmClient NGLLogger diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceManagement/Gui/ServiceEdit/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceManagement/Gui/ServiceEdit/CMakeLists.txt index 11a8ef001..cbc0cbee4 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceManagement/Gui/ServiceEdit/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceManagement/Gui/ServiceEdit/CMakeLists.txt @@ -28,7 +28,7 @@ NGL_TARGET_LINK_LIBRARIES(ScmEditGuiPlugin ScmGuiPluginInterface ScmDataPluginInterface LtsSession - Qt5::Widgets + Qt6::Widgets LtsWidgets LtsUtilsGuiDds svcScmCommon diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/CMakeLists.txt index 247b346fa..ba2879d1e 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/CMakeLists.txt @@ -34,8 +34,8 @@ CODEGEN_HANDLE_SVC_XML(SRCS_exe ${xml_FILE}) NGL_ADD_SVC_ICON(SRCS_exe) NGL_ADD_EXECUTABLE(AAR SV svcVideoOverlayManagement ${SRCS_exe}) NGL_TARGET_LINK_LIBRARIES(svcVideoOverlayManagement - Qt5::Core - Qt5::Network + Qt6::Core + Qt6::Network ddsconnector ddsQoS svcCoreClient diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/CnrProxyTester/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Tools/CnrProxyTester/CMakeLists.txt index 35e398ff8..71b090517 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/CnrProxyTester/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/CnrProxyTester/CMakeLists.txt @@ -19,9 +19,9 @@ NGL_WRAP_UI(SRCS ui/mainwindow.ui) NGL_ADD_EXECUTABLE(WS NO_TRANSLATION CnrProxyTester ${SRCS}) NGL_TARGET_LINK_LIBRARIES(CnrProxyTester - Qt5::Widgets - Qt5::Core - Qt5::WebSockets + Qt6::Widgets + Qt6::Core + Qt6::WebSockets nglapplication LtsDataView LtsWidgets diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/ConfigX/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Tools/ConfigX/CMakeLists.txt index ceb8e8f7b..2f90214ba 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/ConfigX/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/ConfigX/CMakeLists.txt @@ -27,7 +27,7 @@ IF(NOT WIN32) NGL_ADD_EXECUTABLE(WS ConfigX NO_TRANSLATION ${ConfigX_SRCS} ${ConfigX_UICS}) NGL_TARGET_LINK_LIBRARIES(ConfigX - Qt5::Widgets + Qt6::Widgets ) NGL_INSTALL_TARGET(ConfigX) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/DBOperatorSettingsRemover/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Tools/DBOperatorSettingsRemover/CMakeLists.txt index 861e1201e..9a358c54e 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/DBOperatorSettingsRemover/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/DBOperatorSettingsRemover/CMakeLists.txt @@ -15,8 +15,8 @@ SET(SettingsRemover_SRCS NGL_ADD_EXECUTABLE(TOOLSWS SettingsRemover ${SettingsRemover_SRCS}) NGL_TARGET_LINK_LIBRARIES(SettingsRemover - Qt5::Core - Qt5::Sql + Qt6::Core + Qt6::Sql ) NGL_INSTALL_TARGET(SettingsRemover) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/DBUpdate/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Tools/DBUpdate/CMakeLists.txt index e2c976182..884e1436a 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/DBUpdate/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/DBUpdate/CMakeLists.txt @@ -294,8 +294,8 @@ NGL_WRAP_UI(SRCS ui/db_update.ui ui/show_history.ui) NGL_ADD_EXECUTABLE(SV dbUpdate ${SRCS}) NGL_TARGET_LINK_LIBRARIES(dbUpdate - Qt5::Widgets - Qt5::Core + Qt6::Widgets + Qt6::Core nglapplication ngldb nglcoreapplication diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/DataSampleGenerator/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Tools/DataSampleGenerator/CMakeLists.txt index 970930cfc..31306f18b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/DataSampleGenerator/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/DataSampleGenerator/CMakeLists.txt @@ -15,7 +15,7 @@ SET(HDRS NGL_ADD_EXECUTABLE(AAR SV NO_TRANSLATION tDataSampleGenerator ${SRCS} ${HDRS}) NGL_TARGET_LINK_LIBRARIES(tDataSampleGenerator - Qt5::Core + Qt6::Core ddsdts ddsgen ddsconnector diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/DataSampleReceiver/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Tools/DataSampleReceiver/CMakeLists.txt index 83d5691e9..a4519a104 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/DataSampleReceiver/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/DataSampleReceiver/CMakeLists.txt @@ -17,7 +17,7 @@ SET(HDRS NGL_ADD_EXECUTABLE(AAR SV NO_TRANSLATION tDataSampleReceiver ${SRCS} ${HDRS}) NGL_TARGET_LINK_LIBRARIES(tDataSampleReceiver - Qt5::Core + Qt6::Core ddsdtc ddsgen ddsconnector diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/DotMatrixDisplay/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Tools/DotMatrixDisplay/CMakeLists.txt index bb5e9ca96..d2155b5d7 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/DotMatrixDisplay/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/DotMatrixDisplay/CMakeLists.txt @@ -42,10 +42,10 @@ NGL_TARGET_LINK_LIBRARIES(displayPanelSimulator nglwidgets NGLLogger nglsettings - Qt5::Core - Qt5::Gui - Qt5::Widgets - Qt5::Network + Qt6::Core + Qt6::Gui + Qt6::Widgets + Qt6::Network ) CONFIGURE_FILE(rheinmetall.jpg ${CMAKE_BINARY_DIR}/rheinmetall.jpg COPYONLY) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/EEMFakeServer/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Tools/EEMFakeServer/CMakeLists.txt index aa8606d9c..642049344 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/EEMFakeServer/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/EEMFakeServer/CMakeLists.txt @@ -18,8 +18,8 @@ SET(EEMFakeServer_SRCS NGL_ADD_EXECUTABLE(TOOLSSV NO_TRANSLATION EEMFakeServer ${EEMFakeServer_SRCS}) NGL_TARGET_LINK_LIBRARIES(EEMFakeServer PUBLIC - Qt5::Core - Qt5::WebSockets + Qt6::Core + Qt6::WebSockets ) IF(NOT BUILD_RPM) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/Examples/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Tools/Examples/CMakeLists.txt index a3c439bad..1db59e0eb 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/Examples/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/Examples/CMakeLists.txt @@ -20,7 +20,7 @@ NGL_ADD_LIBRARY(WS GuiElementPlugin MODULE ${gui_element_SRCS}) NGL_TARGET_INCLUDE_DIRECTORIES(GuiElementPlugin PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/..) NGL_TARGET_LINK_LIBRARIES(GuiElementPlugin - Qt5::Widgets + Qt6::Widgets LtsWidgets LtsSession LtsSessionData diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/Examples/TestGuiElement/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Tools/Examples/TestGuiElement/CMakeLists.txt index a3c439bad..1db59e0eb 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/Examples/TestGuiElement/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/Examples/TestGuiElement/CMakeLists.txt @@ -20,7 +20,7 @@ NGL_ADD_LIBRARY(WS GuiElementPlugin MODULE ${gui_element_SRCS}) NGL_TARGET_INCLUDE_DIRECTORIES(GuiElementPlugin PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/..) NGL_TARGET_LINK_LIBRARIES(GuiElementPlugin - Qt5::Widgets + Qt6::Widgets LtsWidgets LtsSession LtsSessionData diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/LocalDomainFinder/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Tools/LocalDomainFinder/CMakeLists.txt index 13f677999..79c0a4496 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/LocalDomainFinder/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/LocalDomainFinder/CMakeLists.txt @@ -13,7 +13,7 @@ SET(HDRS NGL_ADD_EXECUTABLE(WS AAR SV NO_TRANSLATION localDomainFinder ${SRCS} ${HDRS}) NGL_TARGET_LINK_LIBRARIES(localDomainFinder - Qt5::Core + Qt6::Core LtsCommandLineParser NGLLogger nglcoreapplication diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/ParticipantDataGenerator/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Tools/ParticipantDataGenerator/CMakeLists.txt index fdde7c6d7..d09270ba7 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/ParticipantDataGenerator/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/ParticipantDataGenerator/CMakeLists.txt @@ -17,8 +17,8 @@ SET(participantDataGenerator_SRCS NGL_ADD_EXECUTABLE(AAR SV NO_TRANSLATION ParticipantDataGenerator ${participantDataGenerator_SRCS}) NGL_TARGET_LINK_LIBRARIES(ParticipantDataGenerator - Qt5::Core - Qt5::Network + Qt6::Core + Qt6::Network ddsconnector LtsCommandLineParser nglcoreapplication diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/QLedLine/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Tools/QLedLine/CMakeLists.txt index c97897164..319d94cb5 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/QLedLine/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/QLedLine/CMakeLists.txt @@ -30,8 +30,8 @@ NGL_TARGET_INCLUDE_DIRECTORIES(qledline NGL_TARGET_LINK_LIBRARIES(qledline PUBLIC qledmatrix - Qt5::Core - Qt5::Widgets + Qt6::Core + Qt6::Widgets ) NGL_INSTALL_TARGET(qledline) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/QLedMatrix/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Tools/QLedMatrix/CMakeLists.txt index 2dfb38429..c0d77aac6 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/QLedMatrix/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/QLedMatrix/CMakeLists.txt @@ -25,8 +25,8 @@ NGL_TARGET_INCLUDE_DIRECTORIES(qledmatrix NGL_TARGET_LINK_LIBRARIES(qledmatrix PUBLIC - Qt5::Core - Qt5::Widgets + Qt6::Core + Qt6::Widgets ) NGL_INSTALL_TARGET(qledmatrix) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/RestClientUi/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Tools/RestClientUi/CMakeLists.txt index 9184c7360..74a5746ac 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/RestClientUi/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/RestClientUi/CMakeLists.txt @@ -19,8 +19,8 @@ NGL_ADD_EXECUTABLE(TOOLSWS RestClientUi ${SRCS}) NGL_INSTALL(WS DIRECTORY rest_templates/ DESTINATION bin/updates/) NGL_TARGET_LINK_LIBRARIES(RestClientUi - Qt5::Widgets - Qt5::Gui + Qt6::Widgets + Qt6::Gui LtsRestClient ) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/TextEditorTest/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Tools/TextEditorTest/CMakeLists.txt index 7252b2a73..1f36175fc 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/TextEditorTest/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/TextEditorTest/CMakeLists.txt @@ -21,11 +21,11 @@ NGL_TARGET_LINK_LIBRARIES(textEditorTest NGLLogger nglsettings nglwidgets - Qt5::Core - Qt5::Gui - Qt5::Widgets - Qt5::Xml - Qt5::PrintSupport + Qt6::Core + Qt6::Gui + Qt6::Widgets + Qt6::Xml + Qt6::PrintSupport ) NGL_INSTALL_TARGET(textEditorTest) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/VapixConfig/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Tools/VapixConfig/CMakeLists.txt index 50d059bef..d858eba03 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/VapixConfig/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/VapixConfig/CMakeLists.txt @@ -29,10 +29,10 @@ NGL_TARGET_INCLUDE_DIRECTORIES(vapixconfig NGL_TARGET_LINK_LIBRARIES(vapixconfig PRIVATE - Qt5::Network - Qt5::Xml + Qt6::Network + Qt6::Xml PUBLIC - Qt5::Core + Qt6::Core ) NGL_INSTALL_TARGET(vapixconfig)