src/xwl -> src/xwayland
It makes naming more consistent, we use "wayland" more frequently than "wl".
This commit is contained in:
parent
b64f95b703
commit
6b4daeddc9
43 changed files with 11 additions and 12 deletions
|
@ -16,7 +16,7 @@
|
|||
#include "utils/xcbutils.h"
|
||||
#include "wayland_server.h"
|
||||
#include "workspace.h"
|
||||
#include "xwl/xwayland.h"
|
||||
#include "xwayland/xwayland.h"
|
||||
|
||||
#include <KPluginMetaData>
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
#include "wayland/seat_interface.h"
|
||||
#include "wayland_server.h"
|
||||
#include "workspace.h"
|
||||
#include "xwl/databridge.h"
|
||||
#include "xwayland/databridge.h"
|
||||
|
||||
#include <QProcess>
|
||||
#include <QProcessEnvironment>
|
||||
|
|
|
@ -16,8 +16,8 @@
|
|||
#include "wayland_server.h"
|
||||
#include "workspace.h"
|
||||
#include "x11client.h"
|
||||
#include "xwl/xwayland.h"
|
||||
#include "xwl/xwaylandlauncher.h"
|
||||
#include "xwayland/xwayland.h"
|
||||
#include "xwayland/xwaylandlauncher.h"
|
||||
|
||||
#include <xcb/xcb_icccm.h>
|
||||
|
||||
|
|
|
@ -14,8 +14,8 @@
|
|||
#include "wayland_server.h"
|
||||
#include "workspace.h"
|
||||
#include "x11client.h"
|
||||
#include "xwl/xwayland.h"
|
||||
#include "xwl/xwaylandlauncher.h"
|
||||
#include "xwayland/xwayland.h"
|
||||
#include "xwayland/xwaylandlauncher.h"
|
||||
|
||||
#include <xcb/xcb_icccm.h>
|
||||
|
||||
|
|
|
@ -159,7 +159,7 @@ target_sources(kwin PRIVATE
|
|||
xdgshellintegration.cpp
|
||||
xkb.cpp
|
||||
xwaylandclient.cpp
|
||||
xwl/xwayland_interface.cpp
|
||||
xwayland/xwayland_interface.cpp
|
||||
)
|
||||
|
||||
target_link_libraries(kwin
|
||||
|
@ -249,6 +249,7 @@ add_subdirectory(backends)
|
|||
add_subdirectory(scenes)
|
||||
add_subdirectory(utils)
|
||||
add_subdirectory(wayland)
|
||||
add_subdirectory(xwayland)
|
||||
|
||||
if (KWIN_BUILD_ACTIVITIES)
|
||||
target_sources(kwin PRIVATE activities.cpp)
|
||||
|
@ -293,8 +294,6 @@ kcoreaddons_target_static_plugins(kwin_x11 "kwin/effects/plugins")
|
|||
install(TARGETS kwin ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP)
|
||||
install(TARGETS kwin_x11 ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
|
||||
|
||||
add_subdirectory(xwl)
|
||||
|
||||
add_executable(kwin_wayland
|
||||
main_wayland.cpp
|
||||
tabletmodemanager.cpp
|
||||
|
|
|
@ -48,7 +48,7 @@
|
|||
#include "wayland/tablet_v2_interface.h"
|
||||
#include "wayland_server.h"
|
||||
#include "workspace.h"
|
||||
#include "xwl/xwayland_interface.h"
|
||||
#include "xwayland/xwayland_interface.h"
|
||||
|
||||
#include <KDecoration2/Decoration>
|
||||
#include <KGlobalAccel>
|
||||
|
|
|
@ -19,8 +19,8 @@
|
|||
#include "wayland/seat_interface.h"
|
||||
#include "wayland_server.h"
|
||||
#include "workspace.h"
|
||||
#include "xwl/xwayland.h"
|
||||
#include "xwl/xwaylandlauncher.h"
|
||||
#include "xwayland/xwayland.h"
|
||||
#include "xwayland/xwaylandlauncher.h"
|
||||
|
||||
// KDE
|
||||
#include <KCrash>
|
||||
|
|
Loading…
Reference in a new issue