XCB plugin compile fix.

This commit is contained in:
Samuel Rødal 2011-05-04 13:28:35 +02:00
parent 9631f6314c
commit a8c1cf755f
4 changed files with 7 additions and 8 deletions

View File

@ -46,7 +46,6 @@
#include <QtCore/QElapsedTimer>
#include <QtGui/private/qapplication_p.h>
#include <QtGui/QPlatformScreen>
#include <QtGui/private/qfontengine_ft_p.h>

View File

@ -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>

View File

@ -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;
}

View File

@ -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;
}