[Fix](make): 解决编译运行问题
This commit is contained in:
parent
e251795ff1
commit
358a8aa5ca
|
@ -1,3 +1,9 @@
|
||||||
|
ukui-kwin-effects (1.0.8-ok2) yangtze; urgency=medium
|
||||||
|
|
||||||
|
* [Fix](make): 解决编译运行问题
|
||||||
|
|
||||||
|
-- Kevin Duan <duankaiwen@kylinos.cn> Mon, 13 Jun 2022 11:24:54 +0800
|
||||||
|
|
||||||
ukui-kwin-effects (1.0.8-ok1) yangtze; urgency=medium
|
ukui-kwin-effects (1.0.8-ok1) yangtze; urgency=medium
|
||||||
|
|
||||||
* [Feature](wayland): 适配wayland环境
|
* [Feature](wayland): 适配wayland环境
|
||||||
|
|
|
@ -0,0 +1,62 @@
|
||||||
|
From: cckylin-cibot <cckylin-cibot@kylinos.cn>
|
||||||
|
Date: Mon, 13 Jun 2022 03:27:05 +0000
|
||||||
|
Subject: =?utf-8?b?W0ZpeF0obWFrZSk6IOino+WGs+e8luivkei/kOihjOmXrumimA==?=
|
||||||
|
|
||||||
|
---
|
||||||
|
CMakeLists.txt | 3 +++
|
||||||
|
windowsview/CMakeLists.txt | 1 +
|
||||||
|
windowsview/desktopbackground.cpp | 2 +-
|
||||||
|
windowsview/windowthumbnail.h | 1 +
|
||||||
|
4 files changed, 6 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||||
|
index 75ee071..cf95758 100644
|
||||||
|
--- a/CMakeLists.txt
|
||||||
|
+++ b/CMakeLists.txt
|
||||||
|
@@ -2,6 +2,9 @@ cmake_minimum_required(VERSION 3.5)
|
||||||
|
|
||||||
|
project(ukui-kwin-effects)
|
||||||
|
|
||||||
|
+find_package(PkgConfig)
|
||||||
|
+pkg_check_modules(QGSettings REQUIRED gsettings-qt)
|
||||||
|
+include_directories(${QGSettings_INCLUDE_DIRS})
|
||||||
|
find_package(Qt5 CONFIG REQUIRED COMPONENTS Core Gui)
|
||||||
|
find_package(KF5CoreAddons REQUIRED)
|
||||||
|
find_package(KF5WindowSystem REQUIRED)
|
||||||
|
diff --git a/windowsview/CMakeLists.txt b/windowsview/CMakeLists.txt
|
||||||
|
index d48335a..f9772f9 100644
|
||||||
|
--- a/windowsview/CMakeLists.txt
|
||||||
|
+++ b/windowsview/CMakeLists.txt
|
||||||
|
@@ -59,6 +59,7 @@ target_link_libraries(
|
||||||
|
KF5::CoreAddons
|
||||||
|
KF5::GlobalAccel
|
||||||
|
Qt5::X11Extras
|
||||||
|
+ ${QGSettings_LIBRARIES}
|
||||||
|
)
|
||||||
|
|
||||||
|
install(TARGETS ${PLUGIN_NAME} DESTINATION ${INSTALL_PATH})
|
||||||
|
diff --git a/windowsview/desktopbackground.cpp b/windowsview/desktopbackground.cpp
|
||||||
|
index e45a402..068135e 100644
|
||||||
|
--- a/windowsview/desktopbackground.cpp
|
||||||
|
+++ b/windowsview/desktopbackground.cpp
|
||||||
|
@@ -1,7 +1,7 @@
|
||||||
|
#include "desktopbackground.h"
|
||||||
|
|
||||||
|
#include <QSGSimpleRectNode>
|
||||||
|
-#include <QGSettings/QGSettings>
|
||||||
|
+#include <QGSettings>
|
||||||
|
#include <QPainter>
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/windowsview/windowthumbnail.h b/windowsview/windowthumbnail.h
|
||||||
|
index 9bebc35..f28a729 100644
|
||||||
|
--- a/windowsview/windowthumbnail.h
|
||||||
|
+++ b/windowsview/windowthumbnail.h
|
||||||
|
@@ -41,6 +41,7 @@
|
||||||
|
#include <QWindow>
|
||||||
|
// xcb
|
||||||
|
#if HAVE_XCB_COMPOSITE
|
||||||
|
+#include <X11/Xlib.h>
|
||||||
|
#include <xcb/damage.h>
|
||||||
|
|
||||||
|
#if HAVE_EGL
|
|
@ -1 +1,2 @@
|
||||||
0001-Feature-wayland-wayland.patch
|
0001-Feature-wayland-wayland.patch
|
||||||
|
0002-Fix-make.patch
|
||||||
|
|
Loading…
Reference in New Issue