diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-05-11 12:39:14 +0200 |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-05-11 12:39:14 +0200 |
| commit | 0719af99b7041e024a4fdf0fbdc26b1ca0dd787d (patch) | |
| tree | 4901f88960fa8e76a640c947ead4e877387c89e2 | |
| parent | 5e2b0aa1b344bc93af29d7977aa7e497bfc7a9cf (diff) | |
Compile fixes after merge.
| -rw-r--r-- | src/gui/guikernel/qplatformclipboard_qpa.cpp | 4 | ||||
| -rw-r--r-- | 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; |