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 /src/gui | |
| parent | 5e2b0aa1b344bc93af29d7977aa7e497bfc7a9cf (diff) | |
Compile fixes after merge.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/guikernel/qplatformclipboard_qpa.cpp | 4 |
1 files changed, 2 insertions, 2 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 |