Add support for native children in QtGui again

no pluginsupport though

2 files changed, 1 insertions, 11 deletions

diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index 611bd50..5078ba4 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -2429,10 +2429,7 @@ WId QWidget::effectiveWinId() const
         return id;
     QWidget *realParent = nativeParentWidget();
     Q_ASSERT(realParent);
-#ifndef Q_WS_LITE
-    //### we really need to implement winId functionality
     Q_ASSERT(realParent->internalWinId());
-#endif
     return realParent->internalWinId();
 }
 
@@ -4121,9 +4118,6 @@ QWidget *QWidget::window() const
 */
 QWidget *QWidget::nativeParentWidget() const
 {
-#ifdef Q_WS_LITE
-    return window(); //### we don't have native child widgets yet
-#endif
     QWidget *parent = parentWidget();
     while (parent && !parent->internalWinId())
         parent = parent->parentWidget();
diff --git a/src/gui/painting/qbackingstore.cpp b/src/gui/painting/qbackingstore.cpp
index 7220ce6..b158a76 100644
--- a/src/gui/painting/qbackingstore.cpp
+++ b/src/gui/painting/qbackingstore.cpp
@@ -747,12 +747,8 @@ void QWidgetBackingStore::markDirtyOnScreen(const QRegion &region, QWidget *widg
     }
 
     // Alien widgets.
-    if (!widget->internalWinId() && !widget->isWindow()) { //### LITEHACK we need winid support!!!
-#ifdef Q_WS_LITE
-        QWidget *nativeParent = widget->window();        //### LITEHACK so far only toplevels are native
-#else
+    if (!widget->internalWinId() && !widget->isWindow()) {
         QWidget *nativeParent = widget->nativeParentWidget();        // Alien widgets with the top-level as the native parent (common case).
-#endif
         if (nativeParent == tlw) {
             if (!widget->testAttribute(Qt::WA_WState_InPaintEvent))
                 dirtyOnScreen += region.translated(topLevelOffset);