Skip to content

Commit

Permalink
Build with Qt6
Browse files Browse the repository at this point in the history
  • Loading branch information
jmlich committed Jul 9, 2023
1 parent 398497d commit af405e2
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
include(FeatureSummary)
include(GNUInstallDirs)

set(QT_MIN_VERSION "5.12.0")
find_package(Qt5 ${QT_MIN_VERSION} COMPONENTS Core DBus REQUIRED)
set(QT_MIN_VERSION "6.0.0")
find_package(Qt6 ${QT_MIN_VERSION} COMPONENTS Core DBus REQUIRED)
find_package(PkgConfig REQUIRED)

pkg_search_module(GLIB REQUIRED glib-2.0)
Expand Down
2 changes: 1 addition & 1 deletion devicelock.conf
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[DeviceLock]
pluginName=/usr/lib/qt5/plugins/devicelock/glacier-devicelock
pluginName=/usr/lib/qt6/plugins/devicelock/glacier-devicelock
6 changes: 3 additions & 3 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ set(HEADERS devicelocking.h)
add_executable(glacier-devicelock ${SRC})

target_link_libraries(glacier-devicelock
Qt5::Core
Qt5::DBus
Qt6::Core
Qt6::DBus
${GLIB_LDFLAGS})

target_include_directories(glacier-devicelock PRIVATE ${GLIB_INCLUDE_DIRS})

install(TARGETS glacier-devicelock RUNTIME
DESTINATION /usr/lib/qt5/plugins/devicelock/)
DESTINATION /usr/lib/qt6/plugins/devicelock/)

0 comments on commit af405e2

Please sign in to comment.