Skip to content

Commit 714b3c9

Browse files
chore: bump Qt version require to 5.15
1 parent 8527c3f commit 714b3c9

File tree

3 files changed

+5
-21
lines changed

3 files changed

+5
-21
lines changed

CMakeLists.txt

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -45,22 +45,10 @@ if(LEMON_QT6)
4545
set(LEMON_QT_LIBNAME Qt6)
4646
set(QT_MAJOR_VERSION 6)
4747
set(QT_DEFAULT_MAJOR_VERSION 6)
48-
add_definitions(-DLEMON_QT6=1)
49-
#From: https://github.com/KDE/kwin/blob/master/cmake/modules/FindXKB.cmake#L35
50-
find_package(PkgConfig)
51-
pkg_check_modules(PKG_XKB QUIET xkbcommon)
52-
set(XKB_DEFINITIONS ${PKG_XKB_CFLAGS_OTHER})
53-
find_path(XKB_INCLUDE_DIR NAMES xkbcommon/xkbcommon.h HINTS ${PKG_XKB_INCLUDE_DIRS})
54-
find_library(XKB_LIBRARY NAMES xkbcommon HINTS ${PKG_XKB_LIBRARY_DIRS})
55-
add_library(XKB::XKB UNKNOWN IMPORTED)
56-
set_target_properties(XKB::XKB PROPERTIES
57-
IMPORTED_LOCATION "${XKB_LIBRARY}"
58-
INTERFACE_COMPILE_OPTIONS "${XKB_DEFINITIONS}"
59-
INTERFACE_INCLUDE_DIRECTORIES "${XKB_INCLUDE_DIR}"
60-
)
48+
add_definitions(-DLEMON_QT6)
6149
else()
6250
set(LEMON_QT_MAJOR_VERSION 5)
63-
set(LEMON_QT_MINOR_VERSION 10)
51+
set(LEMON_QT_MINOR_VERSION 15)
6452
set(LEMON_QT_LIBNAME Qt5)
6553
set(QT_MAJOR_VERSION 5)
6654
endif()
@@ -254,7 +242,7 @@ if(WIN32 AND ENABLE_XLS_EXPORT AND NOT LEMON_QT6)
254242
add_definitions(-DENABLE_XLS_EXPORT)
255243
endif()
256244

257-
target_link_libraries(lemon ${LEMON_QT_LIBS} lemon-core lemon-base SingleApplication::SingleApplication)
245+
target_link_libraries(lemon PRIVATE ${LEMON_QT_LIBS} lemon-core lemon-base SingleApplication::SingleApplication)
258246

259247

260248
# ==================================================================================

cmake/LemonTranslations.cmake

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,4 @@
55
find_package(${LEMON_QT_LIBNAME} COMPONENTS LinguistTools REQUIRED)
66
set(TRANSLATIONS_DIR ${CMAKE_SOURCE_DIR}/translations)
77
file(GLOB TRANSLATIONS_TS ${TRANSLATIONS_DIR}/**.ts)
8-
if(LEMON_QT6)
9-
qt_add_translation(QM_FILES ${TRANSLATIONS_TS})
10-
else()
11-
qt5_add_translation(QM_FILES ${TRANSLATIONS_TS})
12-
endif()
8+
qt_add_translation(QM_FILES ${TRANSLATIONS_TS})

makespec/BUILDVERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
122
1+
123

0 commit comments

Comments
 (0)