From e4cf1392c937e000f59167e563e57ac1dcf229fb Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Fri, 27 Feb 2026 22:52:23 -0500 Subject: [PATCH] build: Replace WINAPI_MSWINDOWS with Q_OS_WIN --- CMakeLists.txt | 1 - src/lib/deskflow/ClientApp.cpp | 4 ++-- src/lib/deskflow/ServerApp.cpp | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0f1db8c31..3e4f9b3ec 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -103,7 +103,6 @@ set(REQUIRED_LIBPORTAL_VERSION 0.9.1) set(REQUIRED_QT_VERSION 6.7.0) if (WIN32) - add_definitions(-DWINAPI_MSWINDOWS) # VSCMD_ARG_TGT_ARCH is set on CI if ("$ENV{VSCMD_ARG_TGT_ARCH}" STREQUAL "") # NOT on CI diff --git a/src/lib/deskflow/ClientApp.cpp b/src/lib/deskflow/ClientApp.cpp index 191661d42..1262f3123 100644 --- a/src/lib/deskflow/ClientApp.cpp +++ b/src/lib/deskflow/ClientApp.cpp @@ -22,7 +22,7 @@ #include "net/SocketMultiplexer.h" #include "net/TCPSocketFactory.h" -#if WINAPI_MSWINDOWS +#if defined(Q_OS_WIN) #include "platform/MSWindowsScreen.h" #endif @@ -104,7 +104,7 @@ const char *ClientApp::daemonName() const deskflow::Screen *ClientApp::createScreen() { -#if WINAPI_MSWINDOWS +#if defined(Q_OS_WIN) return new deskflow::Screen( new MSWindowsScreen( false, Settings::value(Settings::Core::UseHooks).toBool(), getEvents(), diff --git a/src/lib/deskflow/ServerApp.cpp b/src/lib/deskflow/ServerApp.cpp index ed4418ca6..af4f15ccc 100644 --- a/src/lib/deskflow/ServerApp.cpp +++ b/src/lib/deskflow/ServerApp.cpp @@ -30,7 +30,7 @@ // must be before screen header includes #include -#if WINAPI_MSWINDOWS +#if defined(Q_OS_WIN) #include "platform/MSWindowsScreen.h" #endif @@ -392,7 +392,7 @@ bool ServerApp::startServer() deskflow::Screen *ServerApp::createScreen() { -#if WINAPI_MSWINDOWS +#if defined(Q_OS_WIN) return new deskflow::Screen( new MSWindowsScreen(true, Settings::value(Settings::Core::UseHooks).toBool(), getEvents()), getEvents() );