diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-04-29 15:45:30 +0200 |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-04-29 15:46:07 +0200 |
| commit | 57b7c82560088149010b000bc78a3a6d8f2f8834 (patch) | |
| tree | a78376c695b0f649c7fcb4992a1dafa6b1e4cb13 /src/plugins/platforms/xcb/qxcbwindow.cpp | |
| parent | c1aa42e195cc6ad6b94b4d666fcdf7599dd91e8c (diff) | |
Add QWidgetWindow to bridge events from QWindow to QWidget.
Gets rid of QWidget dependencies in QWindow and QWindowSurface. Events
are not delivered to the correct child widget yet.
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbwindow.cpp')
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbwindow.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp index fa8ab0aa22..4d420e36a0 100644 --- a/src/plugins/platforms/xcb/qxcbwindow.cpp +++ b/src/plugins/platforms/xcb/qxcbwindow.cpp @@ -89,7 +89,6 @@ QXcbWindow::QXcbWindow(QWindow *window) : QPlatformWindow(window) , m_context(0) { - QWidget *tlw = window->widget(); m_screen = static_cast<QXcbScreen *>(QGuiApplicationPrivate::platformIntegration()->screens().at(0)); setConnection(m_screen->connection()); @@ -209,6 +208,7 @@ QXcbWindow::QXcbWindow(QWindow *window) &m_syncCounter)); } +#if 0 if (tlw && isTransient(tlw) && tlw->parentWidget()) { // ICCCM 4.1.2.6 QWidget *p = tlw->parentWidget()->window(); @@ -218,6 +218,7 @@ QXcbWindow::QXcbWindow(QWindow *window) 1, &parentWindow)); } +#endif // set the PID to let the WM kill the application if unresponsive long pid = getpid(); @@ -527,6 +528,7 @@ QPlatformGLContext *QXcbWindow::glContext() const void QXcbWindow::handleExposeEvent(const xcb_expose_event_t *event) { +#if 0 QWidget *widget = window()->widget(); if (!widget) return; @@ -537,6 +539,7 @@ void QXcbWindow::handleExposeEvent(const xcb_expose_event_t *event) surface->flush(widget, rect, QPoint()); } +#endif } void QXcbWindow::handleClientMessageEvent(const xcb_client_message_event_t *event) |