From 16b6578806e6f97063dd29decb0a3afd912c2ccd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20G=C3=A2teau?= <agateau@kde.org>
Date: Fri, 28 Feb 2014 16:09:34 +0100
Subject: [PATCH] Hopefully fix build on CI

CI noX11 variant fails, complaining HAVE_X11 is not set. I assume this is
because the call to add_definitions is too late. Using config-plasma.h is
cleaner anyway.
---
 src/shell/CMakeLists.txt | 3 ---
 src/shell/panelview.cpp  | 2 ++
 src/shell/panelview.h    | 1 -
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/shell/CMakeLists.txt b/src/shell/CMakeLists.txt
index 5039bd359..90cb3cdab 100644
--- a/src/shell/CMakeLists.txt
+++ b/src/shell/CMakeLists.txt
@@ -78,9 +78,6 @@ target_link_libraries(plasma-shell
 )
 target_include_directories(plasma-shell PRIVATE "${CMAKE_BINARY_DIR}")
 
-#FIXME: this shouldn't be necessary?
-add_definitions(-DHAVE_X11=${HAVE_X11})
-
 if(HAVE_X11)
   target_link_libraries(plasma-shell ${X11_LIBRARIES} ${XCB_XCB_LIBRARY} )
   target_link_libraries(plasma-shell Qt5::X11Extras)
diff --git a/src/shell/panelview.cpp b/src/shell/panelview.cpp
index fee30c148..949f6fad8 100644
--- a/src/shell/panelview.cpp
+++ b/src/shell/panelview.cpp
@@ -16,6 +16,8 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
+#include <config-plasma.h>
+
 #include "panelview.h"
 #include "shellcorona.h"
 #include "panelshadows_p.h"
diff --git a/src/shell/panelview.h b/src/shell/panelview.h
index ed4a59e69..40881454d 100644
--- a/src/shell/panelview.h
+++ b/src/shell/panelview.h
@@ -19,7 +19,6 @@
 #ifndef PANELVIEW_H
 #define PANELVIEW_H
 
-
 #include <view.h>
 #include "panelconfigview.h"
 #include <QtCore/qpointer.h>