From 91f9178220ac4e6877b93889c820fee9ffd3fb5f Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周六, 27 4月 2024 21:42:44 +0800
Subject: [PATCH] update
---
examples/shared/widgetframe/windowbar.cpp | 2 +-
qmsetup | 2 +-
src/widgets/CMakeLists.txt | 2 +-
src/quick/CMakeLists.txt | 2 +-
src/core/CMakeLists.txt | 2 +-
README.md | 4 ++--
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/README.md b/README.md
index 7deff56..9268a82 100644
--- a/README.md
+++ b/README.md
@@ -107,7 +107,7 @@
#### CMake Project
```sh
-cmake -B build -DQWindowKit_DIR=/path/install/cmake/QWindowKit
+cmake -B build -DQWindowKit_DIR=/path/install/lib/cmake/QWindowKit
```
```cmake
@@ -139,7 +139,7 @@
The following initialization should be done before any widget constructs.
```cpp
-#include <QWKQuick/qwkquickglobal.h>
+#include <QtWidgets/QApplication>
int main(int argc, char *argv[])
{
diff --git a/examples/shared/widgetframe/windowbar.cpp b/examples/shared/widgetframe/windowbar.cpp
index 8753bc2..362383f 100644
--- a/examples/shared/widgetframe/windowbar.cpp
+++ b/examples/shared/widgetframe/windowbar.cpp
@@ -25,7 +25,7 @@
if (QLocale::system().textDirection() == Qt::RightToLeft) {
layout->setDirection(QBoxLayout::RightToLeft);
}
-
+
layout->setContentsMargins(QMargins());
layout->setSpacing(0);
for (int i = IconButton; i <= CloseButton; ++i) {
diff --git a/qmsetup b/qmsetup
index 218fb32..0b95afa 160000
--- a/qmsetup
+++ b/qmsetup
@@ -1 +1 @@
-Subproject commit 218fb32b88a5ba2a83f37e9091d3109cc1896ac2
+Subproject commit 0b95afa778b99d9e9de772006555309b74ed32f4
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 3849ced..d524067 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -94,7 +94,7 @@
LINKS_PRIVATE ${_links_private}
QT_LINKS Core Gui
QT_INCLUDE_PRIVATE Core Gui
- INCLUDE_PRIVATE kernel contexts shared
+ INCLUDE_PRIVATE *
PREFIX QWK_CORE
SYNC_INCLUDE_OPTIONS ${_sync_include_options}
)
diff --git a/src/quick/CMakeLists.txt b/src/quick/CMakeLists.txt
index 84c1d58..830ee4f 100644
--- a/src/quick/CMakeLists.txt
+++ b/src/quick/CMakeLists.txt
@@ -25,7 +25,7 @@
LINKS QWKCore
QT_LINKS Core Gui Quick
QT_INCLUDE_PRIVATE Core Gui Quick
- INCLUDE_PRIVATE
+ INCLUDE_PRIVATE *
PREFIX QWK_QUICK
)
diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt
index 23a1122..69aae95 100644
--- a/src/widgets/CMakeLists.txt
+++ b/src/widgets/CMakeLists.txt
@@ -24,7 +24,7 @@
LINKS QWKCore
QT_LINKS Core Gui Widgets
QT_INCLUDE_PRIVATE Core Gui Widgets
- INCLUDE_PRIVATE
+ INCLUDE_PRIVATE *
PREFIX QWK_WIDGETS
)
--
Gitblit v1.9.1