From 491673a778538a1565244c6f0a203b202400033c Mon Sep 17 00:00:00 2001 From: Elysia <39023210+elysia-best@users.noreply.github.com> Date: Tue, 25 Mar 2025 20:05:35 +0800 Subject: [PATCH 1/3] fix(sniproxy): ifx deprecation of QBitmap(const QPixmap &pixmap) --- xembed-sni-proxy/sniproxy.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/xembed-sni-proxy/sniproxy.cpp b/xembed-sni-proxy/sniproxy.cpp index 500529f..d4bfe36 100644 --- a/xembed-sni-proxy/sniproxy.cpp +++ b/xembed-sni-proxy/sniproxy.cpp @@ -9,6 +9,7 @@ #include "sniproxy.h" #include +#include #include #include @@ -357,8 +358,8 @@ QImage SNIProxy::convertFromNative(xcb_image_t *xcbImage) const if (format == QImage::Format_RGB32 && xcbImage->bpp == 32) { QImage m = image.createHeuristicMask(); - QBitmap mask(QPixmap::fromImage(m)); - QPixmap p = QPixmap::fromImage(image); + QBitmap mask = QBitmap::fromPixmap(QPixmap::fromImage(m)); + QPixmap p = QBitmap::fromPixmap(QPixmap::fromImage(image)); p.setMask(mask); image = p.toImage(); } From 64ec6854d73d17b109d4ef9018ed1c4f7c8e149c Mon Sep 17 00:00:00 2001 From: Elysia <39023210+elysia-best@users.noreply.github.com> Date: Tue, 25 Mar 2025 20:07:59 +0800 Subject: [PATCH 2/3] refactor(CMakeLists.txt): Remove -Werror compile option --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d4fb77f..8851361 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ set(CMAKE_AUTORCC ON) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) -add_compile_options(-Wall -Werror) +add_compile_options(-Wall) add_compile_definitions(QT_DISABLE_DEPRECATED_BEFORE=0x050F00) list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/) From 3203e5b3cadbef6098aafd35d96a6f726dbbb9fd Mon Sep 17 00:00:00 2001 From: Elysia <39023210+elysia-best@users.noreply.github.com> Date: Tue, 25 Mar 2025 20:19:44 +0800 Subject: [PATCH 3/3] refactor(CMakeLists.txt): Remove compile options and definitions --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8851361..1991bc5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,8 +10,8 @@ set(CMAKE_AUTORCC ON) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) -add_compile_options(-Wall) -add_compile_definitions(QT_DISABLE_DEPRECATED_BEFORE=0x050F00) +# add_compile_options(-Wall) +# add_compile_definitions(QT_DISABLE_DEPRECATED_BEFORE=0x050F00) list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/)