Adds immediate migration results

2026-08-18 22:12:24 +02:00
1 parent ba4121728b
commit 6a2a0667ab
@@ -34,7 +34,7 @@ NGL_TARGET_LINK_LIBRARIES(NGLLogger
 PRIVATE
 $<IF:$<BOOL:${Log4Qt_FOUND}>,Log4Qt::log4qt,>
 PUBLIC
-  Qt5::Core
+  Qt6::Core
 )

 NGL_INSTALL_TARGET(NGLLogger)
@@ -9,8 +9,8 @@ SET(qtsapp_common_SRCS
 NGL_ADD_LIBRARY(WS AAR SV qtsa_common STATIC ${qtsapp_common_SRCS})
 NGL_TARGET_LINK_LIBRARIES(qtsa_common
  PUBLIC
-    Qt5::Network
-    Qt5::Core
+    Qt6::Network
+    Qt6::Core
 )

 SET(qtsapp_SRCS
@@ -28,8 +28,8 @@ NGL_TARGET_LINK_LIBRARIES(qtsingleapplication
  PRIVATE
    qtsa_common
  PUBLIC
-    Qt5::Core
-    Qt5::Widgets
+    Qt6::Core
+    Qt6::Widgets
 )

 SET(qtscoreapp_SRCS
@@ -46,5 +46,5 @@ NGL_TARGET_LINK_LIBRARIES(qtsinglecoreapplication
  PRIVATE
    qtsa_common
  PUBLIC
-    Qt5::Core
+    Qt6::Core
 )
@@ -2,6 +2,7 @@


 #include "qtlockedfile.h"
+#include <utility>
 #include <qt_windows.h>
 #include <QFileInfo>

@@ -31,5 +31,5 @@ NGL_TARGET_INCLUDE_DIRECTORIES(wms_json_ds
                              )
 NGL_TARGET_LINK_LIBRARIES(wms_json_ds
                          PUBLIC
-                          Qt5::Core
+                          Qt6::Core
                         )
@@ -15,7 +15,7 @@ SET(nglapplication_SRCS
  ngl_qt_msg_handler.inc
  ngl_signal_handler.inc
 )
-NGL_ADD_LIBRARY(WS AAR SV HLA nglapplication SHARED ${nglapplication_SRCS})
+NGL_ADD_LIBRARY(ALL nglapplication SHARED ${nglapplication_SRCS})
 NGL_TARGET_INCLUDE_DIRECTORIES(nglapplication
  PUBLIC
    ${CMAKE_CURRENT_SOURCE_DIR}/../
@@ -25,8 +25,8 @@ NGL_TARGET_LINK_LIBRARIES(nglapplication
    NGLLogger
    nglsettings
  PUBLIC
-    Qt5::Core
-    Qt5::Widgets
+    Qt6::Core
+    Qt6::Widgets
 )
 NGL_INSTALL_TARGET(nglapplication)

@@ -51,6 +51,8 @@ NGL_TARGET_LINK_LIBRARIES(nglsingleapplication
    NGLLogger
    nglsettings
  PUBLIC
+    Qt6::Core
+    Qt6::Widgets
    qtsingleapplication
 )
 NGL_INSTALL_TARGET(nglsingleapplication)
@@ -77,7 +79,7 @@ NGL_TARGET_LINK_LIBRARIES(nglcoreapplication
    NGLLogger
    nglsettings
  PUBLIC
-    Qt5::Core
+    Qt6::Core
 )
 NGL_INSTALL_TARGET(nglcoreapplication)

@@ -103,6 +105,7 @@ NGL_TARGET_LINK_LIBRARIES(nglsinglecoreapplication
    NGLLogger
    nglsettings
  PUBLIC
+    Qt6::Core
    qtsinglecoreapplication
 )
 NGL_INSTALL_TARGET(nglsinglecoreapplication)
@@ -129,6 +132,6 @@ NGL_TARGET_LINK_LIBRARIES(nglguiapplication
    NGLLogger
    nglsettings
  PUBLIC
-    Qt5::Gui
+    Qt6::Gui
 )
 NGL_INSTALL_TARGET(nglguiapplication)
@@ -18,9 +18,9 @@ SET(nglcomp_SRCS
 NGL_ADD_LIBRARY(WS nglcompression SHARED ${nglcomp_SRCS})
 NGL_TARGET_LINK_LIBRARIES(nglcompression
  PUBLIC
-    Qt5::Core
+    Qt6::Core
  PRIVATE
-    Qt5::Concurrent
+    Qt6::Concurrent
    NGLLogger
    ${BZIP2_LIBRARIES}
 #    BZip2::BZip2 # not available with cmake 3.5
@@ -40,7 +40,7 @@ IF(BUILD_WS AND BUILD_TESTING)
      nglcoreapplication
      ngltools
      nglcompression
-      Qt5::Test
+      Qt6::Test
      )

  ADD_TEST(NAME nglcomp_test COMMAND $<TARGET_FILE:nglcomp_test>)
@@ -32,8 +32,8 @@ NGL_TARGET_LINK_LIBRARIES(ngldb
    nglsettings
    ${PostgreSQL_LIBRARIES}
  PUBLIC
-    Qt5::Core
-    Qt5::Sql
+    Qt6::Core
+    Qt6::Sql
 )
 NGL_TARGET_INCLUDE_DIRECTORIES(ngldb
  PRIVATE
@@ -20,9 +20,9 @@ NGL_ADD_LIBRARY(ALL nglsettings SHARED ${nglsettings_SRCS} ${nglsettings_HDRS})
 NGL_TARGET_LINK_LIBRARIES(nglsettings
  PRIVATE
    ngltools
-    Qt5::Network
+    Qt6::Network
  PUBLIC
-    Qt5::Core
+    Qt6::Core
 )

 NGL_TARGET_INCLUDE_DIRECTORIES(nglsettings
@@ -21,7 +21,7 @@ SET(ngltools_SRCS
 NGL_ADD_LIBRARY(ALL ngltools SHARED ${ngltools_SRCS})
 NGL_TARGET_LINK_LIBRARIES(ngltools
  PUBLIC
-    Qt5::Core
+    Qt6::Core
 )

 # Smoke test for ngltools DTG conversion utilities
@@ -31,9 +31,9 @@ IF(BUILD_TESTING)
    set(_QTTEST_TARGET Qt6::Test)
    set(_QTCORE_TARGET Qt6::Core)
  else()
-    find_package(Qt5 COMPONENTS Test Core REQUIRED)
-    set(_QTTEST_TARGET Qt5::Test)
-    set(_QTCORE_TARGET Qt5::Core)
+    find_package(Qt6 COMPONENTS Test Core REQUIRED)
+    set(_QTTEST_TARGET Qt6::Test)
+    set(_QTCORE_TARGET Qt6::Core)
  endif()

  if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/tests/NGLToolsQtSmokeTest.cpp)
@@ -13,7 +13,7 @@ SET(my_SRCS
 NGL_ADD_LIBRARY(ALL ngltranslator SHARED ${my_SRCS})
 NGL_TARGET_LINK_LIBRARIES(ngltranslator
  PUBLIC
-    Qt5::Core
+    Qt6::Core
 )
 NGL_TARGET_INCLUDE_DIRECTORIES(ngltranslator
  PUBLIC
@@ -2,6 +2,7 @@


 #include "ngltranslator.h"
+#include <utility>
 #include "ngltranslator_p.h"

 #include <QCoreApplication>
@@ -1,6 +1,6 @@
 PROJECT(nglwidgets)

-FIND_PACKAGE(PopplerQt5 REQUIRED)
+FIND_PACKAGE(PopplerQt6 REQUIRED)

 #
 # NGL Widgets library
@@ -54,8 +54,8 @@ NGL_TARGET_LINK_LIBRARIES(nglwidgets
    ngltools
    ${POPPLER_QT5_LIBRARY}
  PUBLIC
-    Qt5::Core
-    Qt5::Widgets
+    Qt6::Core
+    Qt6::Widgets
 )

 NGL_INSTALL_TARGET(nglwidgets)
@@ -1,4 +1,5 @@
 #include "nglpdfdocument.h"
+#include <utility>
 #include "nglpdfpage.h"

 #include <QtCore/QUrl>
@@ -1,4 +1,5 @@
 #include "nglpdfpage.h"
+#include <utility>

 #include <QtGui/QPainter>
 #include <QtGui/QMouseEvent>
@@ -11,7 +11,7 @@ SET(CMAKE_VISIBILITY_INLINES_HIDDEN ON)
 SET(CMAKE_POSITION_INDEPENDENT_CODE ON)
 SET(CMAKE_AUTOMOC TRUE)
 SET(QT_USE_IMPORTED_TARGETS TRUE)
-FIND_PACKAGE(Qt5 5.9.0 COMPONENTS Core Sql Test REQUIRED)
+find_package(Qt6 5.9.0 COMPONENTS Core Sql Test REQUIRED)

 FIND_PACKAGE(IClientSDK REQUIRED)

@@ -28,8 +28,8 @@ SET(ifx_SRCS

 ADD_LIBRARY(qsql_informix SHARED ${ifx_SRCS})
 TARGET_LINK_LIBRARIES(qsql_informix
-  Qt5::Core
-  Qt5::Sql
+  Qt6::Core
+  Qt6::Sql
  ${ICLIENT_SDK_LIBRARIES}
  ${ICLIENT_SDK_LIBRARIES_CPP}
  ${ICLIENT_SDK_ESQL_OBJECT_FILE}
@@ -43,7 +43,7 @@ SET(test_SRCS
 ADD_EXECUTABLE(qsql_informix_test ${test_SRCS})
 TARGET_LINK_LIBRARIES(qsql_informix_test
  qsql_informix
-  Qt5::Test
+  Qt6::Test
  dl
 )
 ADD_TEST(NAME qsql_informix_test COMMAND $<TARGET_FILE:qsql_informix_test>)
@@ -22,10 +22,10 @@ SET(tcp_HDRS
 NGL_ADD_LIBRARY(tcpserver AAR SV SHARED ${tcp_SRCS})
 NGL_TARGET_LINK_LIBRARIES(tcpserver
  PRIVATE
-    Qt5::Network
+    Qt6::Network
    ngltools
  PUBLIC
-    Qt5::Core
+    Qt6::Core
    NGLLogger
 )
 NGL_TARGET_INCLUDE_DIRECTORIES(tcpserver
@@ -47,8 +47,8 @@ IF(BUILD_TESTING AND BUILD_SV AND NOT WIN32)

  ADD_EXECUTABLE(tcpserver_test ${tcp_test_SRCS})
  TARGET_LINK_LIBRARIES(tcpserver_test
-      Qt5::Core
-      Qt5::Network
+      Qt6::Core
+      Qt6::Network
      tcpserver
      NGLLogger
  )
@@ -2,6 +2,7 @@


 #include "tcpserver.h"
+#include <utility>
 #include "tcpserver_logger.h"
 #include "workerbase.h"