Wayland plugin compile fixes.
parent
df677b9653
commit
5dc3a46a2a
|
|
@ -60,7 +60,7 @@
|
|||
#include "QtCore/qthreadstorage.h"
|
||||
#include "QtCore/qhash.h"
|
||||
#include "QtCore/qatomic.h"
|
||||
#include "private/qwidget_p.h"
|
||||
#include "QtWidgets/private/qwidget_p.h"
|
||||
#include "qcache.h"
|
||||
#include "qglpaintdevice_p.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@
|
|||
|
||||
#include "qwaylanddisplay.h"
|
||||
#include "qwaylandwindow.h"
|
||||
#include <QtGui/private/qapplication_p.h>
|
||||
#include <QtGui/private/qguiapplication_p.h>
|
||||
|
||||
void *QWaylandNativeInterface::nativeResourceForWindow(const QByteArray &resourceString, QWindow *window)
|
||||
{
|
||||
|
|
@ -66,7 +66,7 @@ QWaylandScreen * QWaylandNativeInterface::qPlatformScreenForWindow(QWindow *wind
|
|||
if (window) {
|
||||
screen = static_cast<QWaylandScreen *>(QPlatformScreen::platformScreenForWindow(window));
|
||||
} else {
|
||||
screen = static_cast<QWaylandScreen *>(QApplicationPrivate::platformIntegration()->screens()[0]);
|
||||
screen = static_cast<QWaylandScreen *>(QGuiApplicationPrivate::platformIntegration()->screens()[0]);
|
||||
}
|
||||
return screen;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -41,7 +41,6 @@
|
|||
#include "qwaylandshmsurface.h"
|
||||
|
||||
#include <QtCore/qdebug.h>
|
||||
#include <QtGui/private/qapplication_p.h>
|
||||
|
||||
#include "qwaylanddisplay.h"
|
||||
#include "qwaylandshmwindow.h"
|
||||
|
|
|
|||
|
|
@ -36,6 +36,7 @@ INCLUDEPATH += $$PWD
|
|||
QT += gui-private
|
||||
QT += opengl-private
|
||||
QT += core-private
|
||||
QT += widgets-private
|
||||
|
||||
include ($$PWD/gl_integration/gl_integration.pri)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue