diff options
| author | Jørgen Lind <[email protected]> | 2011-04-26 12:43:11 +0200 |
|---|---|---|
| committer | Samuel Rødal <[email protected]> | 2011-04-28 15:38:48 +0200 |
| commit | fbef41167aa4aede67bc1ec904142e2e5e12c7fc (patch) | |
| tree | e8c77fbeab44e1d95ecf9870f9a323d7f9ce95c7 /src/gui/kernel/qplatformwindow_qpa.cpp | |
| parent | 25028e3b144a54435be437d452b65bfbd4f63309 (diff) | |
Make QtGui compile again....
Comment out stuff in QWidget::create_sys
(cherry picked from commit 1bbc6a6bb2bf1175080e7a5ba6834ff642fd47ab)
Diffstat (limited to 'src/gui/kernel/qplatformwindow_qpa.cpp')
| -rw-r--r-- | src/gui/kernel/qplatformwindow_qpa.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/gui/kernel/qplatformwindow_qpa.cpp b/src/gui/kernel/qplatformwindow_qpa.cpp index 19bf7a9f294..e3caba1331b 100644 --- a/src/gui/kernel/qplatformwindow_qpa.cpp +++ b/src/gui/kernel/qplatformwindow_qpa.cpp @@ -46,7 +46,7 @@ class QPlatformWindowPrivate { - QWidget *tlw; + QWindow *window; QRect rect; Qt::WindowFlags flags; friend class QPlatformWindow; @@ -56,12 +56,11 @@ class QPlatformWindowPrivate Constructs a platform window with the given top level widget. */ -QPlatformWindow::QPlatformWindow(QWidget *tlw) +QPlatformWindow::QPlatformWindow(QWindow *window) : d_ptr(new QPlatformWindowPrivate) { Q_D(QPlatformWindow); - d->tlw = tlw; - tlw->setPlatformWindow(this); + d->window = window; } /*! @@ -74,10 +73,10 @@ QPlatformWindow::~QPlatformWindow() /*! Returnes the widget which belongs to the QPlatformWindow */ -QWidget *QPlatformWindow::widget() const +QWindow *QPlatformWindow::window() const { Q_D(const QPlatformWindow); - return d->tlw; + return d->window; } /*! @@ -186,7 +185,7 @@ void QPlatformWindow::setOpacity(qreal level) */ void QPlatformWindow::requestActivateWindow() { - QWindowSystemInterface::handleWindowActivated(widget()); + QWindowSystemInterface::handleWindowActivated(window()->widget()); } /*! |