From 245ddfa1f01b4c9fa10337246b8045755e5bcce5 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周二, 19 12月 2023 21:03:58 +0800
Subject: [PATCH] Change back to qScopeGuard
---
src/core/CMakeLists.txt | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 9cc3744..d76ca34 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -4,7 +4,6 @@
)
set(_src
- qwkcoreglobal.h
qwkglobal.h
qwkglobal_p.h
windowagentbase.h
@@ -12,22 +11,28 @@
windowagentbase.cpp
windowitemdelegate_p.h
windowitemdelegate.cpp
- kernel/eventobserver_p.h
- kernel/eventobserver.cpp
kernel/nativeeventfilter_p.h
kernel/nativeeventfilter.cpp
+ kernel/systemwindow_p.h
contexts/abstractwindowcontext_p.h
contexts/abstractwindowcontext.cpp
)
set(_defines_private)
+set(_links_private)
if(WIN32)
list(APPEND _src
qwindowkit_windows.h
qwindowkit_windows.cpp
)
-elseif(NOT APPLE)
+elseif(APPLE)
+ list(APPEND _links_private
+ "-framework Foundation"
+ "-framework Cocoa"
+ "-framework AppKit"
+ )
+else()
list(APPEND _src
qwindowkit_linux.h
)
@@ -38,7 +43,6 @@
contexts/qtwindowcontext_p.h
contexts/qtwindowcontext.cpp
)
- list(APPEND _defines_private QWINDOWKIT_FORCE_QT_WINDOW_CONTEXT)
else()
if(WIN32)
list(APPEND _src
@@ -48,7 +52,7 @@
elseif(APPLE)
list(APPEND _src
contexts/cocoawindowcontext_p.h
- contexts/cocoawindowcontext.cpp
+ contexts/cocoawindowcontext.mm
)
else()
list(APPEND _src
@@ -62,6 +66,7 @@
SOURCES ${_src}
DEFINES_PRIVATE ${_defines_private}
LINKS
+ LINKS_PRIVATE ${_links_private}
QT_LINKS Core Gui
QT_INCLUDE_PRIVATE Core Gui
INCLUDE_PRIVATE kernel contexts platforms
--
Gitblit v1.9.1