From a7d000be71db475f034c42687e7905fc8116050f Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Thu, 11 May 2023 06:10:07 +0400 Subject: [PATCH] Get rid of qt5compat dependency --- external/qt/CMakeLists.txt | 9 --------- external/qt/package.cmake | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/external/qt/CMakeLists.txt b/external/qt/CMakeLists.txt index c060c4e..3d5a48d 100644 --- a/external/qt/CMakeLists.txt +++ b/external/qt/CMakeLists.txt @@ -14,7 +14,6 @@ if (DESKTOP_APP_USE_PACKAGED) INTERFACE Qt::Core Qt::CorePrivate - $ Qt::Gui Qt::GuiPrivate $ @@ -37,7 +36,6 @@ target_include_directories(external_qt SYSTEM INTERFACE ${qt_loc}/include ${qt_loc}/include/QtCore - $<$:${qt_loc}/include/QtCore5Compat> ${qt_loc}/include/QtGui $<$:${qt_loc}/include/QtOpenGL> ${qt_loc}/include/QtWidgets @@ -62,7 +60,6 @@ INTERFACE QT_STATICPLUGIN QT_PLUGIN QT_CORE_LIB - $<$:QT_CORE5COMPAT_LIB> QT_GUI_LIB $<$:QT_OPENGL_LIB> QT_WIDGETS_LIB @@ -99,12 +96,6 @@ set(common_qt_libs lib/${qt_lib_prefix}Qt${QT_VERSION_MAJOR}Core ) -if (TARGET Qt::Core5Compat) - list(PREPEND common_qt_libs - lib/${qt_lib_prefix}Qt${QT_VERSION_MAJOR}Core5Compat - ) -endif() - if (TARGET Qt::OpenGL) list(PREPEND common_qt_libs lib/${qt_lib_prefix}Qt${QT_VERSION_MAJOR}OpenGL diff --git a/external/qt/package.cmake b/external/qt/package.cmake index 4c30efd..8b0a0d8 100644 --- a/external/qt/package.cmake +++ b/external/qt/package.cmake @@ -39,7 +39,7 @@ find_package(Qt${QT_VERSION_MAJOR} OPTIONAL_COMPONENTS Qml Quick QuickWidgets QU set(qt_version_6_or_greater 0) if (QT_VERSION_MAJOR GREATER_EQUAL 6) set(qt_version_6_or_greater 1) - find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core5Compat OpenGL OpenGLWidgets REQUIRED) + find_package(Qt${QT_VERSION_MAJOR} COMPONENTS OpenGL OpenGLWidgets REQUIRED) endif() # QtWaylandScanner cmake integration from Qt 6 is used