Merge branch 'Plasma/5.11'

8 years ago · 9f7d482172
parent 1be6aecf24 ad130ff3bb
commit 9f7d482172
4 changed files with 4 additions and 2 deletions
--- a/containmentactions/switchdesktop/CMakeLists.txt
+++ b/containmentactions/switchdesktop/CMakeLists.txt
@ -7,10 +7,11 @@ add_library(plasma_containmentactions_switchdesktop MODULE ${switchdesktop_SRCS}
 kcoreaddons_desktop_to_json(plasma_containmentactions_switchdesktop plasma-containmentactions-switchdesktop.desktop)

 target_link_libraries(plasma_containmentactions_switchdesktop
+                        Qt5::Widgets
                        KF5::Plasma
                        KF5::WindowSystem
                        KF5::I18n
-			KF5::KIOCore
+                        KF5::KIOCore
                       )

 install(TARGETS plasma_containmentactions_switchdesktop DESTINATION ${KDE_INSTALL_PLUGINDIR})
--- a/containmentactions/switchwindow/CMakeLists.txt
+++ b/containmentactions/switchwindow/CMakeLists.txt
@ -10,6 +10,7 @@ add_library(plasma_containmentactions_switchwindow MODULE ${switchwindow_SRCS})
 kcoreaddons_desktop_to_json(plasma_containmentactions_switchwindow plasma-containmentactions-switchwindow.desktop)

 target_link_libraries(plasma_containmentactions_switchwindow
+                      Qt5::Widgets
                      KF5::Plasma
                      KF5::KIOCore
                      KF5::I18n
--- a/libkworkspace/kworkspace.cpp
+++ b/libkworkspace/kworkspace.cpp
@ -20,7 +20,6 @@
 #include "kworkspace.h"
 #include "config-libkworkspace.h"

-#include <QApplication>
 #include <QDataStream>
 #include <QFile>
 #include <QFileInfo>
--- a/libtaskmanager/xwindowtasksmodel.h
+++ b/libtaskmanager/xwindowtasksmodel.h
@ -26,6 +26,7 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 #include "taskmanager_export.h"

 #include <QMimeData>
+#include <qwindowdefs.h>

 #include <netwm.h>