From 531e97b499dde8bf158bf0975215c8f0ce5bf3e3 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Mon, 12 Apr 2021 19:40:34 +0200 Subject: [PATCH] Only use QPlatformNativeInterface on X11 --- CMakeLists.txt | 18 +++++++++--------- src/osd/osdpretty.cpp | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 99640133..ef1f3f1e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -222,16 +222,16 @@ if(X11_FOUND) else() message(WARNING, "Missing X11/XF86keysym.h") endif() -endif(X11_FOUND) -find_path(QPA_QPLATFORMNATIVEINTERFACE_H qpa/qplatformnativeinterface.h PATHS ${Qt${QT_MAJOR_VERSION}Gui_PRIVATE_INCLUDE_DIRS}) -if(QPA_QPLATFORMNATIVEINTERFACE_H) - set(HAVE_QPA_QPLATFORMNATIVEINTERFACE_H ON) - include_directories(${Qt${QT_MAJOR_VERSION}Gui_PRIVATE_INCLUDE_DIRS}) - message(STATUS "Have qpa/qplatformnativeinterface.h header.") -else() - message(STATUS "Missing qpa/qplatformnativeinterface.h header.") -endif() + find_path(QPA_QPLATFORMNATIVEINTERFACE_H qpa/qplatformnativeinterface.h PATHS ${Qt${QT_MAJOR_VERSION}Gui_PRIVATE_INCLUDE_DIRS}) + if(QPA_QPLATFORMNATIVEINTERFACE_H) + set(HAVE_QPA_QPLATFORMNATIVEINTERFACE_H ON) + include_directories(${Qt${QT_MAJOR_VERSION}Gui_PRIVATE_INCLUDE_DIRS}) + message(STATUS "Have qpa/qplatformnativeinterface.h header.") + else() + message(STATUS "Missing qpa/qplatformnativeinterface.h header.") + endif() +endif(X11_FOUND) # TAGLIB pkg_check_modules(TAGLIB REQUIRED taglib>=1.11.1) diff --git a/src/osd/osdpretty.cpp b/src/osd/osdpretty.cpp index bb9611eb..ea5c10a2 100644 --- a/src/osd/osdpretty.cpp +++ b/src/osd/osdpretty.cpp @@ -55,7 +55,7 @@ #include #ifdef HAVE_X11EXTRAS # include -#elif defined(HAVE_QPA_QPLATFORMNATIVEINTERFACE_H) +#elif defined(Q_OS_UNIX) && defined(HAVE_QPA_QPLATFORMNATIVEINTERFACE_H) # include #endif #ifdef HAVE_WINEXTRAS @@ -219,7 +219,7 @@ bool OSDPretty::IsTransparencyAvailable() { #if defined(HAVE_X11EXTRAS) return QX11Info::isCompositingManagerRunning(); -#elif defined(HAVE_QPA_QPLATFORMNATIVEINTERFACE_H) +#elif defined(Q_OS_UNIX) && defined(HAVE_QPA_QPLATFORMNATIVEINTERFACE_H) if (qApp) { QPlatformNativeInterface *native = qApp->platformNativeInterface(); if (native) {