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
Plasma
KDE Portal for XDG Desktop
Commits
8f3837a7
Commit
8f3837a7
authored
Mar 16, 2022
by
Laurent Montel
Browse files
Prepare to use qt6 build
parent
565fad8e
Changes
3
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
8f3837a7
...
...
@@ -28,7 +28,7 @@ include(ECMConfiguredInstall)
include
(
FeatureSummary
)
find_package
(
Qt
5
${
QT_MIN_VERSION
}
CONFIG REQUIRED COMPONENTS
find_package
(
Qt
${
QT_MAJOR_VERSION
}
${
QT_MIN_VERSION
}
CONFIG REQUIRED COMPONENTS
Core
Concurrent
DBus
...
...
@@ -52,7 +52,9 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED
)
find_package
(
Wayland 1.15 REQUIRED COMPONENTS Client
)
find_package
(
PlasmaWaylandProtocols 1.7.0 REQUIRED
)
find_package
(
QtWaylandScanner REQUIRED
)
if
(
QT_MAJOR_VERSION EQUAL
"5"
)
find_package
(
QtWaylandScanner REQUIRED
)
endif
()
add_definitions
(
-DQT_DISABLE_DEPRECATED_BEFORE=0x050f00
)
add_definitions
(
-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055B00
)
...
...
data/CMakeLists.txt
View file @
8f3837a7
...
...
@@ -6,4 +6,4 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.impl.portal.desktop.kd
install
(
FILES
${
CMAKE_CURRENT_BINARY_DIR
}
/org.freedesktop.impl.portal.desktop.kde.desktop DESTINATION
${
KDE_INSTALL_APPDIR
}
)
ecm_install_configured_files
(
INPUT plasma-xdg-desktop-portal-kde.service.in @ONLY
DESTINATION
${
SYSTEMD
_
USER
_
UNIT
_INSTALL_
DIR
}
)
DESTINATION
${
KDE_INSTALL_
SYSTEMDUSERUNITDIR
}
)
src/CMakeLists.txt
View file @
8f3837a7
...
...
@@ -66,10 +66,17 @@ set(xdg_desktop_portal_kde_SRCS
resources.qrc
)
ecm_add_qtwayland_client_protocol
(
xdg_desktop_portal_kde_SRCS
PROTOCOL
${
PLASMA_WAYLAND_PROTOCOLS_DIR
}
/screencast.xml
BASENAME zkde-screencast-unstable-v1
)
if
(
QT_MAJOR_VERSION EQUAL
"5"
)
ecm_add_qtwayland_client_protocol
(
xdg_desktop_portal_kde_SRCS
PROTOCOL
${
PLASMA_WAYLAND_PROTOCOLS_DIR
}
/screencast.xml
BASENAME zkde-screencast-unstable-v1
)
else
()
# qt6_generate_wayland_protocol_client_sources(xdg-desktop-portal-kde FILES ${PLASMA_WAYLAND_PROTOCOLS_DIR}/screencast.xml
# ${CMAKE_CURRENT_SOURCE_DIR}/zkde-screencast-unstable-v1.xml
# )
endif
()
set_source_files_properties
(
../data/org.freedesktop.Accounts.User.xml PROPERTIES NO_NAMESPACE TRUE
)
...
...
@@ -102,4 +109,4 @@ install(TARGETS xdg-desktop-portal-kde DESTINATION ${KDE_INSTALL_LIBEXECDIR})
install
(
FILES
xdg-desktop-portal-kde.notifyrc
DESTINATION
${
KDE_INSTALL_KNOTIFY
5
RCDIR
}
)
DESTINATION
${
KDE_INSTALL_KNOTIFYRCDIR
}
)
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