Compile fixes after merge.
This commit is contained in:
parent
5e2b0aa1b3
commit
0719af99b7
@ -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
|
||||
|
@ -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;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user