Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Graphics
Kamera
Commits
88ecb54b
Commit
88ecb54b
authored
Dec 23, 2021
by
Laurent Montel
Browse files
Make it compile against qt6
parent
5c9544d3
Pipeline
#113455
passed with stage
in 49 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
88ecb54b
...
...
@@ -18,7 +18,11 @@ include(FindPkgConfig)
include
(
FeatureSummary
)
find_package
(
Qt5 5.15 REQUIRED COMPONENTS Core
)
find_package
(
Qt
${
QT_MAJOR_VERSION
}
5.15 REQUIRED COMPONENTS Core
)
if
(
QT_MAJOR_VERSION STREQUAL
"6"
)
find_package
(
Qt6Core5Compat
)
endif
()
find_package
(
KF5
${
KF5_MIN_VERSION
}
REQUIRED COMPONENTS
ConfigWidgets
XmlGui
...
...
@@ -77,7 +81,7 @@ endif()
install
(
FILES
solid_camera.desktop
DESTINATION
${
DATA
_INSTALL_DIR
}
/solid/actions
)
DESTINATION
${
KDE
_INSTALL_
DATA
DIR
}
/solid/actions
)
install
(
FILES
org.kde.kamera.metainfo.xml
...
...
kioslave/CMakeLists.txt
View file @
88ecb54b
...
...
@@ -10,7 +10,7 @@ add_library(kio_kamera MODULE ${kio_kamera_PART_SRCS})
include_directories
(
${
GPHOTO2_INCLUDE_DIRS
}
${
CMAKE_BINARY_DIR
}
)
target_link_libraries
(
kio_kamera
Qt::Core
Qt
${
QT_MAJOR_VERSION
}
::Core
KF5::KIOCore
KF5::I18n
KF5::ConfigCore
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment