XCB plugin compile fix.
This commit is contained in:
parent
9631f6314c
commit
a8c1cf755f
@ -46,7 +46,6 @@
|
||||
|
||||
#include <QtCore/QElapsedTimer>
|
||||
|
||||
#include <QtGui/private/qapplication_p.h>
|
||||
#include <QtGui/QPlatformScreen>
|
||||
|
||||
#include <QtGui/private/qfontengine_ft_p.h>
|
||||
|
@ -46,7 +46,7 @@
|
||||
|
||||
#include <QtAlgorithms>
|
||||
#include <QSocketNotifier>
|
||||
#include <QtGui/private/qapplication_p.h>
|
||||
#include <QtGui/private/qguiapplication_p.h>
|
||||
#include <QAbstractEventDispatcher>
|
||||
|
||||
#include <QtCore/QDebug>
|
||||
|
@ -43,7 +43,7 @@
|
||||
|
||||
#include "qxcbscreen.h"
|
||||
|
||||
#include <QtGui/private/qapplication_p.h>
|
||||
#include <private/qguiapplication_p.h>
|
||||
#include <QtCore/QMap>
|
||||
|
||||
#include <QtCore/QDebug>
|
||||
@ -109,7 +109,7 @@ QXcbScreen *QXcbNativeInterface::qPlatformScreenForWindow(QWindow *window)
|
||||
if (window) {
|
||||
screen = static_cast<QXcbScreen *>(QPlatformScreen::platformScreenForWindow(window));
|
||||
}else {
|
||||
screen = static_cast<QXcbScreen *>(QApplicationPrivate::platformIntegration()->screens()[0]);
|
||||
screen = static_cast<QXcbScreen *>(QGuiApplicationPrivate::platformIntegration()->screens()[0]);
|
||||
}
|
||||
return screen;
|
||||
}
|
||||
|
@ -51,7 +51,7 @@
|
||||
|
||||
#include <xcb/xcb_icccm.h>
|
||||
|
||||
#include <private/qapplication_p.h>
|
||||
#include <private/qguiapplication_p.h>
|
||||
#include <private/qwindowsurface_p.h>
|
||||
|
||||
#include <QtGui/QWindowSystemInterface>
|
||||
@ -114,8 +114,8 @@ QXcbWindow::QXcbWindow(QWindow *window)
|
||||
QRect rect = window->geometry();
|
||||
|
||||
xcb_window_t xcb_parent_id = m_screen->root();
|
||||
if (window->parent() && window->parent()->windowHandle())
|
||||
xcb_parent_id = static_cast<QXcbWindow *>(window->parent()->windowHandle())->xcb_window();
|
||||
if (window->parent() && window->parent()->handle())
|
||||
xcb_parent_id = static_cast<QXcbWindow *>(window->parent()->handle())->xcb_window();
|
||||
|
||||
#if defined(XCB_USE_GLX) || defined(XCB_USE_EGL)
|
||||
if (window->surfaceType() == QWindow::OpenGLSurface
|
||||
@ -503,7 +503,7 @@ void QXcbWindow::requestActivateWindow()
|
||||
|
||||
QPlatformGLContext *QXcbWindow::glContext() const
|
||||
{
|
||||
if (!QApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::OpenGL)) {
|
||||
if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::OpenGL)) {
|
||||
printf("no opengl\n");
|
||||
return 0;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user