From 0719af99b7041e024a4fdf0fbdc26b1ca0dd787d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= <samuel.rodal@nokia.com>
Date: Wed, 11 May 2011 12:39:14 +0200
Subject: [PATCH] Compile fixes after merge.

---
 src/gui/guikernel/qplatformclipboard_qpa.cpp        | 4 ++--
 src/plugins/platforms/wayland/qwaylandclipboard.cpp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/gui/guikernel/qplatformclipboard_qpa.cpp b/src/gui/guikernel/qplatformclipboard_qpa.cpp
index 302df683bd..2da3892b2d 100644
--- 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 47ca22865b..e463af5d47 100644
--- 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;