Merge branch 'Plasma/5.11'

autotests/CMakeLists.txt

@@ -95,6 +95,7 @@ if (XCB_ICCCM_FOUND)
     target_link_libraries( testXcbSizeHints
                            Qt5::Test
                            Qt5::X11Extras
+                           Qt5::Widgets
                            KF5::ConfigCore
                            KF5::WindowSystem
                            XCB::XCB
@@ -242,6 +243,7 @@ target_link_libraries(testScreens
     Qt5::Sensors
     Qt5::Test
     Qt5::X11Extras
+    Qt5::Widgets
     KF5::ConfigCore
     KF5::ConfigGui
     KF5::I18n
@@ -271,8 +273,8 @@ kconfig_add_kcfg_files(testXRandRScreens_SRCS ../settings.kcfgc)
 add_executable( testXRandRScreens ${testXRandRScreens_SRCS} )
 target_link_libraries( testXRandRScreens
                        Qt5::Test
-                       Qt5::Gui
                        Qt5::Sensors
+		       Qt5::Widgets
                        KF5::ConfigCore
                        KF5::ConfigGui
                        KF5::I18n

autotests/tabbox/CMakeLists.txt

@@ -18,7 +18,7 @@ add_executable( testTabBoxClientModel ${testTabBoxClientModel_SRCS} )
 set_target_properties(testTabBoxClientModel PROPERTIES COMPILE_DEFINITIONS "NO_NONE_WINDOW")
 target_link_libraries( testTabBoxClientModel
     Qt5::Core
-    Qt5::Gui
+    Qt5::Widgets
     Qt5::Script
     Qt5::Quick
     Qt5::Test
@@ -50,7 +50,7 @@ add_executable( testTabBoxHandler ${testTabBoxHandler_SRCS} )
 set_target_properties(testTabBoxHandler PROPERTIES COMPILE_DEFINITIONS "NO_NONE_WINDOW")
 target_link_libraries( testTabBoxHandler
     Qt5::Core
-    Qt5::Gui
+    Qt5::Widgets
     Qt5::Script
     Qt5::Quick
     Qt5::Test

effects/coverswitch/coverswitch.cpp

@@ -27,6 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QIcon>
 #include <QMatrix4x4>
 #include <QMouseEvent>
+#include <QFontMetrics>
 #include <KLocalizedString>
 #include <kcolorscheme.h>
 

effects/coverswitch/coverswitch.h

@@ -26,6 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QRegion>
 #include <QSize>
 #include <QTimeLine>
+#include <QFont>
 #include <QQueue>
 
 #include <kwineffects.h>

effects/cube/cube.h

@@ -27,6 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QQueue>
 #include <QMatrix4x4>
 #include <QTimeLine>
+#include <QFont>
 #include "cube_inside.h"
 #include "cube_proxy.h"
 

effects/flipswitch/flipswitch.h

@@ -25,6 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QMatrix4x4>
 #include <QQueue>
 #include <QTimeLine>
+#include <QFont>
 
 namespace KWin
 {

effects/mouseclick/mouseclick.h

@@ -25,6 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kwinglutils.h>
 #include <kwinxrenderutils.h>
 #include <KLocalizedString>
+#include <QFont>
 
 namespace KWin
 {

effects/presentwindows/presentwindows.h

@@ -26,6 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kwineffects.h>
 
+class QMouseEvent;
 class QElapsedTimer;
 class QQuickView;
 

effects/showfps/showfps.cpp

@@ -35,6 +35,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <math.h>
 #include <QPainter>
 #include <QVector2D>
+#include <QPalette>
 
 namespace KWin
 {

effects/showfps/showfps.h

@@ -22,6 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define KWIN_SHOWFPS_H
 
 #include <QTime>
+#include <QFont>
 
 #include <kwineffects.h>
 

effects/slidingpopups/slidingpopups.cpp

@@ -23,6 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <QTimeLine>
 #include <QApplication>
+#include <QFontMetrics>
 
 #include <KWayland/Server/surface_interface.h>
 #include <KWayland/Server/slide_interface.h>

libkwineffects/kwineffects.h

@@ -56,6 +56,7 @@ class QFont;
 class QGraphicsScale;
 class QKeyEvent;
 class QMatrix4x4;
+class QAction;
 
 /**
  * Logging category to be used inside the KWin effects.