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
Plasma Integration
Commits
89edcbe4
Commit
89edcbe4
authored
Apr 05, 2022
by
Laurent Montel
Browse files
Adapt build system for building against qt6
Still QDBusPlatformMenu linking problem (not idea yet)
parent
8a36a5b4
Pipeline
#159437
passed with stage
in 1 minute and 7 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
89edcbe4
...
...
@@ -30,7 +30,9 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
WidgetsAddons WindowSystem ConfigWidgets
)
find_package
(
QtWaylandScanner REQUIRED
)
if
(
QT_MAJOR_VERSION EQUAL
"5"
)
find_package
(
QtWaylandScanner
${
QT_MIN_VERSION
}
REQUIRED
)
endif
()
find_package
(
Wayland 1.9 REQUIRED Client
)
find_package
(
PlasmaWaylandProtocols 1.6.0 CONFIG REQUIRED
)
...
...
src/platformtheme/CMakeLists.txt
View file @
89edcbe4
...
...
@@ -37,18 +37,24 @@ set(platformtheme_SRCS
qt_add_dbus_interface
(
platformtheme_SRCS org.kde.StatusNotifierWatcher.xml statusnotifierwatcher_interface
)
kconfig_add_kcfg_files
(
platformtheme_SRCS renderersettings.kcfgc
)
add_library
(
KDEPlasmaPlatformTheme MODULE
)
if
(
QT_MAJOR_VERSION EQUAL
"5"
)
ecm_add_qtwayland_client_protocol
(
platformtheme_SRCS
PROTOCOL
${
PLASMA_WAYLAND_PROTOCOLS_DIR
}
/appmenu.xml
BASENAME appmenu
)
ecm_add_qtwayland_client_protocol
(
platformtheme_SRCS
PROTOCOL
${
PLASMA_WAYLAND_PROTOCOLS_DIR
}
/
appmenu
.xml
BASENAME
appmenu
)
ecm_add_qtwayland_client_protocol
(
p
latform
t
heme
_SRC
S
PROTOCOL
${
PLASMA_WAYLAND_PROTOCOLS_DIR
}
/server-decoration-palette.xml
BASENAME server-decoration-palette
)
add_library
(
KDEPlasmaPlatformTheme
MODUL
E
${
platformtheme_SRCS
}
)
ecm_add_qtwayland_client_protocol
(
platformtheme_SRCS
PROTOCOL
${
PLASMA_WAYLAND_PROTOCOLS_DIR
}
/
server-decoration-palette
.xml
BASENAME
server-decoration-palette
)
else
()
qt6_generate_wayland_protocol_client_sources
(
KDEPlasmaP
latform
T
heme
FILE
S
${
PLASMA_WAYLAND_PROTOCOLS_DIR
}
/server-decoration-palette.xml
${
PLASMA_WAYLAND_PROTOCOLS_DIR
}
/appmenu.xml
)
endif
()
target_sources
(
KDEPlasmaPlatformTheme
PRIVAT
E
${
platformtheme_SRCS
}
)
target_link_libraries
(
KDEPlasmaPlatformTheme
PRIVATE
...
...
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