From fe00efd3a6604b9925326787f44ba3caee70a75a Mon Sep 17 00:00:00 2001
From: Ivailo Monev <xakepa10@laimg.moc>
Date: Mon, 15 Aug 2016 15:38:21 +0000
Subject: [PATCH] libs: link kworkspace to required X11 libraries

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
---
 libs/kworkspace/CMakeLists.txt          | 57 +++++++++++++++++++++------------
 libs/kworkspace/screenpreviewwidget.cpp |  3 +-
 2 files changed, 37 insertions(+), 23 deletions(-)

diff --git a/libs/kworkspace/CMakeLists.txt b/libs/kworkspace/CMakeLists.txt
index 7805bb1f..54e903e9 100644
--- a/libs/kworkspace/CMakeLists.txt
+++ b/libs/kworkspace/CMakeLists.txt
@@ -1,31 +1,46 @@
 
-set(kworkspace_LIB_SRCS kdisplaymanager.cpp
-                        kwindowlistmenu.cpp
-                        screenpreviewwidget.cpp
-                        kworkspace.cpp
-   )
+set(kworkspace_LIB_SRCS
+    kdisplaymanager.cpp
+    kwindowlistmenu.cpp
+    screenpreviewwidget.cpp
+    kworkspace.cpp
+)
 
 
-set(ksmserver_xml  ${CMAKE_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml)
-qt4_add_dbus_interface( kworkspace_LIB_SRCS ${ksmserver_xml} ksmserver_interface )
+set(ksmserver_xml ${CMAKE_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml)
+qt4_add_dbus_interface(kworkspace_LIB_SRCS ${ksmserver_xml} ksmserver_interface)
 
-set(kwin_xml  ${CMAKE_SOURCE_DIR}/kwin/org.kde.KWin.xml)
+set(kwin_xml ${CMAKE_SOURCE_DIR}/kwin/org.kde.KWin.xml)
 
 set_source_files_properties(${kwin_xml} PROPERTIES INCLUDE "interface_util.h")
 
-qt4_add_dbus_interface( kworkspace_LIB_SRCS ${kwin_xml} kwin_interface )
-
-
+qt4_add_dbus_interface(kworkspace_LIB_SRCS ${kwin_xml} kwin_interface)
 
 add_library(kworkspace SHARED ${kworkspace_LIB_SRCS})
 
-target_link_libraries(kworkspace  ${KDE4_KDEUI_LIBS} ${X11_LIBRARIES} ${KDE4_PLASMA_LIBS} )
-
-set_target_properties(kworkspace PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} DEFINE_SYMBOL MAKE_KWORKSPACE_LIB)
-install(TARGETS kworkspace EXPORT kdeworkspaceLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
-
-install( FILES kdisplaymanager.h
-               kwindowlistmenu.h
-               kworkspace.h
-               kworkspace_export.h
-         DESTINATION ${INCLUDE_INSTALL_DIR}/kworkspace COMPONENT Devel )
+target_link_libraries(kworkspace
+    ${KDE4_KDEUI_LIBS}
+    ${KDE4_PLASMA_LIBS}
+    ${X11_Xau_LIB}
+    ${X11_SM_LIB}
+)
+
+set_target_properties(kworkspace PROPERTIES
+    VERSION ${GENERIC_LIB_VERSION}
+    SOVERSION ${GENERIC_LIB_SOVERSION}
+    DEFINE_SYMBOL MAKE_KWORKSPACE_LIB
+)
+install(
+    TARGETS kworkspace
+    EXPORT kdeworkspaceLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
+)
+
+install(
+    FILES
+    kdisplaymanager.h
+    kwindowlistmenu.h
+    kworkspace.h
+    kworkspace_export.h
+    DESTINATION ${INCLUDE_INSTALL_DIR}/kworkspace
+    COMPONENT Devel
+)
diff --git a/libs/kworkspace/screenpreviewwidget.cpp b/libs/kworkspace/screenpreviewwidget.cpp
index 04045a4c..9bc81578 100644
--- a/libs/kworkspace/screenpreviewwidget.cpp
+++ b/libs/kworkspace/screenpreviewwidget.cpp
@@ -20,8 +20,7 @@
 
 #include "screenpreviewwidget.h"
 
-#include <QtGui/qevent.h>
-#include <QtGui/qevent.h>
+#include <QEvent>
 #include <QPainter>
 
 #include <KDebug>
-- 
2.11.0