From c55a56f1c2f5110f488d745cdf2c204f04c49701 Mon Sep 17 00:00:00 2001
From: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>
Date: Tue, 14 Nov 2017 18:11:54 +0000
Subject: notifier: fixed build without x11 headers

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@7725 90c681e8-e032-0410-971d-27865f9a5e38
---
 src/plugins/General/notifier/CMakeLists.txt | 1 +
 src/plugins/General/notifier/notifier.cpp   | 8 +++-----
 src/plugins/General/notifier/notifier.pro   | 1 +
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/plugins')

diff --git a/src/plugins/General/notifier/CMakeLists.txt b/src/plugins/General/notifier/CMakeLists.txt
index 1f0007ccf..ae11cd7c0 100644
--- a/src/plugins/General/notifier/CMakeLists.txt
+++ b/src/plugins/General/notifier/CMakeLists.txt
@@ -51,6 +51,7 @@ IF(X11_FOUND)
   include_directories(${X11_INCLUDE_DIRS})
   link_directories(${X11_LIBRARY_DIRS})
   ADD_DEFINITIONS(${X11_CFLAGS})
+  ADD_DEFINITIONS(-DX11_FOUND)
   target_link_libraries(notifier ${QT_LIBRARIES} qmmpui libqmmp ${X11_LDFLAGS})
 ELSE(X11_FOUND)
   target_link_libraries(notifier ${QT_LIBRARIES} qmmpui libqmmp)
diff --git a/src/plugins/General/notifier/notifier.cpp b/src/plugins/General/notifier/notifier.cpp
index f519100ad..1edaeaf36 100644
--- a/src/plugins/General/notifier/notifier.cpp
+++ b/src/plugins/General/notifier/notifier.cpp
@@ -26,15 +26,13 @@
 #include <qmmp/soundcore.h>
 #undef Visual
 
-#ifdef Q_WS_X11
+#ifdef X11_FOUND
 #include <QX11Info>
 #include <X11/X.h>
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
-#endif
-
-#ifdef Q_OS_WIN
+#elif defined (Q_OS_WIN)
 #include <windows.h>
 #endif
 
@@ -177,7 +175,7 @@ void Notifier::removePsiTuneFiles()
     }
 }
 
-#ifdef Q_WS_X11
+#ifdef X11_FOUND
 bool Notifier::hasFullscreenWindow() const
 {
     if(!m_disableForFullScreen)
diff --git a/src/plugins/General/notifier/notifier.pro b/src/plugins/General/notifier/notifier.pro
index 5a92fce11..eea864b6c 100644
--- a/src/plugins/General/notifier/notifier.pro
+++ b/src/plugins/General/notifier/notifier.pro
@@ -21,6 +21,7 @@ LIBS += $$QMMPUI_LIB
 
 unix {
   PKGCONFIG += x11
+  DEFINES += X11_FOUND
   target.path = $$LIB_DIR/qmmp/General
   INSTALLS += target
 }
-- 
cgit v1.2.3-13-gbd6f