diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-05-04 13:57:06 +0200 |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-05-04 13:57:06 +0200 |
| commit | 4e69052efc367f0cd2e9a2b5f4b824b4c0a11829 (patch) | |
| tree | 2738fad5012a434b7e8cfb62f6947323bebffb2b | |
| parent | a8c1cf755f9b0a47ca4cc382397df6788246969b (diff) | |
More fixes...
| -rw-r--r-- | src/gui/guikernel/qwindow.cpp | 6 | ||||
| -rw-r--r-- | src/plugins/platforms/xcb/xcb.pro | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/gui/guikernel/qwindow.cpp b/src/gui/guikernel/qwindow.cpp index 60647953f2..7faf49395a 100644 --- a/src/gui/guikernel/qwindow.cpp +++ b/src/gui/guikernel/qwindow.cpp @@ -110,6 +110,12 @@ WId QWindow::winId() const return d->platformWindow->winId(); } +QWindow *QWindow::parent() const +{ + Q_D(const QWindow); + return d->parentWindow; +} + /** Sets the parent Window. This will lead to the windowing system managing the clip of the window, so it will be clipped to the parent window. Setting parent to be 0(NULL) means map it as a top level window. If the parent window has grabbed its window system resources, then the current window will also grab its window system resources. diff --git a/src/plugins/platforms/xcb/xcb.pro b/src/plugins/platforms/xcb/xcb.pro index 101bdcd3c1..1a487d66f4 100644 --- a/src/plugins/platforms/xcb/xcb.pro +++ b/src/plugins/platforms/xcb/xcb.pro @@ -23,6 +23,8 @@ HEADERS = \ qxcbwindowsurface.h \ qxcbnativeinterface.h +QT += gui-private + contains(QT_CONFIG, opengl) { QT += opengl |