diff --git a/YACReader/CMakeLists.txt b/YACReader/CMakeLists.txt index e6f74b0a..a6fcded6 100644 --- a/YACReader/CMakeLists.txt +++ b/YACReader/CMakeLists.txt @@ -232,15 +232,15 @@ qt_add_translations(YACReader ) target_link_libraries(YACReader PRIVATE - Qt::Core - Qt::Gui - Qt::GuiPrivate - Qt::Network - Qt::Widgets - Qt::Multimedia - Qt::TextToSpeech - Qt::Svg - Qt::Core5Compat + Qt6::Core + Qt6::Gui + Qt6::GuiPrivate + Qt6::Network + Qt6::Widgets + Qt6::Multimedia + Qt6::TextToSpeech + Qt6::Svg + Qt6::Core5Compat comic_backend common_gui rhi_flow_reader diff --git a/YACReaderLibrary/CMakeLists.txt b/YACReaderLibrary/CMakeLists.txt index ef562b5e..d8586d48 100644 --- a/YACReaderLibrary/CMakeLists.txt +++ b/YACReaderLibrary/CMakeLists.txt @@ -32,10 +32,10 @@ target_include_directories(library_common PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/db ) target_link_libraries(library_common PUBLIC - Qt::Core - Qt::Core5Compat - Qt::Network - Qt::Sql + Qt6::Core + Qt6::Core5Compat + Qt6::Network + Qt6::Sql common_all comic_backend cbx_backend @@ -63,14 +63,14 @@ target_include_directories(db_helper PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/db ) target_link_libraries(db_helper PUBLIC - Qt::Core - Qt::Sql + Qt6::Core + Qt6::Sql common_all QsLog ) # When BUILD_SERVER_STANDALONE=ON, only library_common and db_helper are built. -# The full YACReaderLibrary GUI app requires Qt::Widgets and other full-build components. +# The full YACReaderLibrary GUI app requires Qt6::Widgets and other full-build components. if(NOT BUILD_SERVER_STANDALONE) # --- YACReaderLibrary executable --- @@ -476,18 +476,18 @@ qt_add_translations(YACReaderLibrary ) target_link_libraries(YACReaderLibrary PRIVATE - Qt::Core - Qt::Gui - Qt::GuiPrivate - Qt::Network - Qt::Widgets - Qt::Sql - Qt::Svg - Qt::Quick - Qt::Qml - Qt::QuickWidgets - Qt::QuickControls2 - Qt::Core5Compat + Qt6::Core + Qt6::Gui + Qt6::GuiPrivate + Qt6::Network + Qt6::Widgets + Qt6::Sql + Qt6::Svg + Qt6::Quick + Qt6::Qml + Qt6::QuickWidgets + Qt6::QuickControls2 + Qt6::Core5Compat library_common db_helper comic_backend diff --git a/YACReaderLibrary/comic_vine/CMakeLists.txt b/YACReaderLibrary/comic_vine/CMakeLists.txt index cc0ca1a1..947d01b6 100644 --- a/YACReaderLibrary/comic_vine/CMakeLists.txt +++ b/YACReaderLibrary/comic_vine/CMakeLists.txt @@ -60,9 +60,9 @@ target_include_directories(comic_vine PRIVATE ${PROJECT_SOURCE_DIR}/YACReaderLibrary/db ) target_link_libraries(comic_vine PUBLIC - Qt::Core - Qt::Widgets - Qt::Network + Qt6::Core + Qt6::Widgets + Qt6::Network common_all common_gui custom_widgets_library diff --git a/YACReaderLibrary/server/CMakeLists.txt b/YACReaderLibrary/server/CMakeLists.txt index 5a78620c..af7b337e 100644 --- a/YACReaderLibrary/server/CMakeLists.txt +++ b/YACReaderLibrary/server/CMakeLists.txt @@ -73,9 +73,9 @@ if(UNIX AND NOT APPLE) "DATADIR=\"${CMAKE_INSTALL_FULL_DATADIR}\"") endif() target_link_libraries(server PUBLIC - Qt::Core - Qt::Network - Qt::Sql + Qt6::Core + Qt6::Network + Qt6::Sql QtWebApp_httpserver QtWebApp_templateengine QsLog diff --git a/YACReaderLibraryServer/CMakeLists.txt b/YACReaderLibraryServer/CMakeLists.txt index 42b5a27b..efaf364a 100644 --- a/YACReaderLibraryServer/CMakeLists.txt +++ b/YACReaderLibraryServer/CMakeLists.txt @@ -36,10 +36,10 @@ qt_add_translations(YACReaderLibraryServer ) target_link_libraries(YACReaderLibraryServer PRIVATE - Qt::Core - Qt::Network - Qt::Sql - Qt::Core5Compat + Qt6::Core + Qt6::Network + Qt6::Sql + Qt6::Core5Compat library_common db_helper comic_backend diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index 96125dd6..d8017a65 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -18,7 +18,7 @@ target_include_directories(yr_global PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) -target_link_libraries(yr_global PUBLIC Qt::Core) +target_link_libraries(yr_global PUBLIC Qt6::Core) if(UNIX AND NOT APPLE) target_compile_definitions(yr_global PRIVATE "LIBDIR=\"${CMAKE_INSTALL_FULL_LIBDIR}\"") @@ -30,7 +30,7 @@ add_library(naturalsort STATIC qnaturalsorting.cpp ) target_include_directories(naturalsort PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) -target_link_libraries(naturalsort PUBLIC Qt::Core) +target_link_libraries(naturalsort PUBLIC Qt6::Core) # --- concurrent_queue --- add_library(concurrent_queue STATIC @@ -38,7 +38,7 @@ add_library(concurrent_queue STATIC concurrent_queue.cpp ) target_include_directories(concurrent_queue PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) -target_link_libraries(concurrent_queue PUBLIC Qt::Core) +target_link_libraries(concurrent_queue PUBLIC Qt6::Core) # --- worker (header-only thread helpers) --- add_library(worker INTERFACE) @@ -67,10 +67,10 @@ add_library(common_all STATIC ) target_include_directories(common_all PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_link_libraries(common_all PUBLIC - Qt::Core - Qt::Gui - Qt::Sql - Qt::Network + Qt6::Core + Qt6::Gui + Qt6::Sql + Qt6::Network yr_global naturalsort pdf_backend_iface @@ -92,8 +92,8 @@ endif() target_include_directories(comic_backend PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_link_libraries(comic_backend PUBLIC - Qt::Core - Qt::Gui + Qt6::Core + Qt6::Gui common_all pdf_backend_iface cbx_backend @@ -101,7 +101,7 @@ target_link_libraries(comic_backend PUBLIC ) # GUI-only targets: not needed for server-standalone builds (Qt 6.4+) which -# lack Qt::Widgets, Qt::ShaderTools, Qt::GuiPrivate, etc. +# lack Qt6::Widgets, Qt6::ShaderTools, Qt6::GuiPrivate, etc. if(NOT BUILD_SERVER_STANDALONE) # --- common_gui (GUI-only code: widgets, version check, themes infrastructure) --- @@ -146,11 +146,11 @@ target_include_directories(common_gui PUBLIC ) target_link_libraries(common_gui PUBLIC - Qt::Core - Qt::Core5Compat - Qt::Widgets - Qt::Network - Qt::Svg + Qt6::Core + Qt6::Core5Compat + Qt6::Widgets + Qt6::Network + Qt6::Svg common_all yr_global QsLog @@ -178,10 +178,10 @@ target_include_directories(rhi_flow_reader PUBLIC ) target_compile_definitions(rhi_flow_reader PRIVATE YACREADER) target_link_libraries(rhi_flow_reader PUBLIC - Qt::Core - Qt::Gui - Qt::GuiPrivate - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::GuiPrivate + Qt6::Widgets yr_global ) qt_add_shaders(rhi_flow_reader "flow_shaders_reader" @@ -202,10 +202,10 @@ target_include_directories(rhi_flow_library PUBLIC ) target_compile_definitions(rhi_flow_library PRIVATE YACREADER_LIBRARY) target_link_libraries(rhi_flow_library PUBLIC - Qt::Core - Qt::Gui - Qt::GuiPrivate - Qt::Widgets + Qt6::Core + Qt6::Gui + Qt6::GuiPrivate + Qt6::Widgets yr_global ) qt_add_shaders(rhi_flow_library "flow_shaders_library" diff --git a/compressed_archive/CMakeLists.txt b/compressed_archive/CMakeLists.txt index 928fb622..a5f5ba5c 100644 --- a/compressed_archive/CMakeLists.txt +++ b/compressed_archive/CMakeLists.txt @@ -125,4 +125,4 @@ else() endif() # Qt, yr_global, and QsLog are needed by all backends -target_link_libraries(cbx_backend PRIVATE Qt::Core yr_global QsLog) +target_link_libraries(cbx_backend PRIVATE Qt6::Core yr_global QsLog) diff --git a/custom_widgets/CMakeLists.txt b/custom_widgets/CMakeLists.txt index aaa7ec25..84590dad 100644 --- a/custom_widgets/CMakeLists.txt +++ b/custom_widgets/CMakeLists.txt @@ -44,9 +44,9 @@ target_include_directories(custom_widgets_reader PRIVATE ) target_compile_definitions(custom_widgets_reader PRIVATE YACREADER) target_link_libraries(custom_widgets_reader PUBLIC - Qt::Core - Qt::Widgets - Qt::Network + Qt6::Core + Qt6::Widgets + Qt6::Network common_gui rhi_flow_reader QsLog @@ -91,9 +91,9 @@ target_include_directories(custom_widgets_library PRIVATE ) target_compile_definitions(custom_widgets_library PRIVATE YACREADER_LIBRARY) target_link_libraries(custom_widgets_library PUBLIC - Qt::Core - Qt::Widgets - Qt::Network + Qt6::Core + Qt6::Widgets + Qt6::Network common_gui rhi_flow_library QsLog diff --git a/shortcuts_management/CMakeLists.txt b/shortcuts_management/CMakeLists.txt index 4cbbd721..3c893d06 100644 --- a/shortcuts_management/CMakeLists.txt +++ b/shortcuts_management/CMakeLists.txt @@ -22,7 +22,7 @@ target_include_directories(shortcuts_reader PRIVATE ${PROJECT_SOURCE_DIR}/YACReader/themes ) target_compile_definitions(shortcuts_reader PRIVATE YACREADER) -target_link_libraries(shortcuts_reader PUBLIC Qt::Core Qt::Widgets yr_global common_gui) +target_link_libraries(shortcuts_reader PUBLIC Qt6::Core Qt6::Widgets yr_global common_gui) # --- shortcuts_library (YACREADER_LIBRARY define) --- add_library(shortcuts_library STATIC ${SHORTCUTS_SOURCES}) @@ -31,4 +31,4 @@ target_include_directories(shortcuts_library PRIVATE ${PROJECT_SOURCE_DIR}/YACReaderLibrary/themes ) target_compile_definitions(shortcuts_library PRIVATE YACREADER_LIBRARY) -target_link_libraries(shortcuts_library PUBLIC Qt::Core Qt::Widgets yr_global common_gui) +target_link_libraries(shortcuts_library PUBLIC Qt6::Core Qt6::Widgets yr_global common_gui) diff --git a/tests/compressed_archive_test/CMakeLists.txt b/tests/compressed_archive_test/CMakeLists.txt index 7b3e40b0..4f0e1c47 100644 --- a/tests/compressed_archive_test/CMakeLists.txt +++ b/tests/compressed_archive_test/CMakeLists.txt @@ -4,7 +4,7 @@ qt_add_executable(compressed_archive_test main.cpp ) target_link_libraries(compressed_archive_test PRIVATE - Qt::Core + Qt6::Core cbx_backend ) if(WIN32) diff --git a/tests/concurrent_queue_test/CMakeLists.txt b/tests/concurrent_queue_test/CMakeLists.txt index b6c49093..380e52b5 100644 --- a/tests/concurrent_queue_test/CMakeLists.txt +++ b/tests/concurrent_queue_test/CMakeLists.txt @@ -4,8 +4,8 @@ qt_add_executable(concurrent_queue_test concurrent_queue_test.cpp ) target_link_libraries(concurrent_queue_test PRIVATE - Qt::Core - Qt::Test + Qt6::Core + Qt6::Test concurrent_queue ) add_test(NAME concurrent_queue_test diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt index d4804f55..512e5745 100644 --- a/third_party/CMakeLists.txt +++ b/third_party/CMakeLists.txt @@ -21,7 +21,7 @@ add_library(QsLog STATIC ) target_include_directories(QsLog PUBLIC QsLog) target_compile_definitions(QsLog PUBLIC QS_LOG_SEPARATE_THREAD) -target_link_libraries(QsLog PUBLIC Qt::Core) +target_link_libraries(QsLog PUBLIC Qt6::Core) # --- QrCode (QR code generation, no Qt dependency) --- add_library(QrCode STATIC @@ -56,7 +56,7 @@ add_library(QtWebApp_httpserver STATIC QtWebApp/httpserver/staticfilecontroller.h ) target_include_directories(QtWebApp_httpserver PUBLIC QtWebApp/httpserver) -target_link_libraries(QtWebApp_httpserver PUBLIC Qt::Network) +target_link_libraries(QtWebApp_httpserver PUBLIC Qt6::Network) # --- QtWebApp template engine --- add_library(QtWebApp_templateengine STATIC @@ -69,7 +69,7 @@ add_library(QtWebApp_templateengine STATIC QtWebApp/templateengine/templatecache.h ) target_include_directories(QtWebApp_templateengine PUBLIC QtWebApp/templateengine) -target_link_libraries(QtWebApp_templateengine PUBLIC Qt::Core5Compat) +target_link_libraries(QtWebApp_templateengine PUBLIC Qt6::Core5Compat) # --- KDSignalThrottler (from KDToolBox) --- add_library(KDSignalThrottler STATIC @@ -77,4 +77,4 @@ add_library(KDSignalThrottler STATIC KDToolBox/KDSignalThrottler.h ) target_include_directories(KDSignalThrottler PUBLIC KDToolBox) -target_link_libraries(KDSignalThrottler PUBLIC Qt::Core) +target_link_libraries(KDSignalThrottler PUBLIC Qt6::Core)