From 7db1f8fc0444787690a2d981988e174c58fe1750 Mon Sep 17 00:00:00 2001
From: Laszlo Agocs <laszlo.p.agocs@nokia.com>
Date: Tue, 31 May 2011 12:36:46 +0200
Subject: Fix QWidget::windowHandle().

The window member in extra should remain null for widgets
that do not have a native window. The change introduced
in an earlier commit is clearly wrong.
---
 src/widgets/kernel/qwidget_qpa.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'src/widgets/kernel/qwidget_qpa.cpp')

diff --git a/src/widgets/kernel/qwidget_qpa.cpp b/src/widgets/kernel/qwidget_qpa.cpp
index 339e6d248e..685965442b 100644
--- a/src/widgets/kernel/qwidget_qpa.cpp
+++ b/src/widgets/kernel/qwidget_qpa.cpp
@@ -741,11 +741,8 @@ QWindow *QWidget::windowHandle() const
 {
     Q_D(const QWidget);
     QTLWExtra *extra = d->maybeTopData();
-    if (extra) {
-        if (!extra->window)
-            const_cast<QWidgetPrivate *>(d)->createTLSysExtra();
+    if (extra)
         return extra->window;
-    }
 
     return 0;
 }
-- 
cgit v1.2.3