Compile fixes after merge.

diff --git a/src/gui/guikernel/qplatformclipboard_qpa.cpp b/src/gui/guikernel/qplatformclipboard_qpa.cpp
index 302df68..2da3892 100644 (file)
--- a/src/gui/guikernel/qplatformclipboard_qpa.cpp
+++ b/src/gui/guikernel/qplatformclipboard_qpa.cpp
@@ -42,7 +42,7 @@
 
 #ifndef QT_NO_CLIPBOARD
 
-#include <QtGui/private/qapplication_p.h>
+#include <QtGui/private/qguiapplication_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -104,7 +104,7 @@ bool QPlatformClipboard::supportsMode(QClipboard::Mode mode) const
 
 void QPlatformClipboard::emitChanged(QClipboard::Mode mode)
 {
-    QApplication::clipboard()->emitChanged(mode);
+    QGuiApplication::clipboard()->emitChanged(mode);
 }
 
 QT_END_NAMESPACE

diff --git a/src/plugins/platforms/wayland/qwaylandclipboard.cpp b/src/plugins/platforms/wayland/qwaylandclipboard.cpp
index 47ca228..e463af5 100644 (file)
--- a/src/plugins/platforms/wayland/qwaylandclipboard.cpp
+++ b/src/plugins/platforms/wayland/qwaylandclipboard.cpp
@@ -43,12 +43,12 @@
 #include "qwaylanddisplay.h"
 #include "qwaylandinputdevice.h"
 #include <QtGui/QPlatformNativeInterface>
-#include <QtGui/QApplication>
+#include <QtGui/QGuiApplication>
 #include <QtCore/QMimeData>
 #include <QtCore/QStringList>
 #include <QtCore/QFile>
 #include <QtCore/QtDebug>
-#include <QtGui/private/qdnd_p.h>
+#include <QtWidgets/private/qdnd_p.h>
 
 static QWaylandClipboard *clipboard;