3 files changed, 8 insertions, 3 deletions
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
index ef7bd8c3a5..e692a985eb 100644
--- a/src/widgets/kernel/qwidget.cpp
+++ b/src/widgets/kernel/qwidget.cpp
@@ -1435,7 +1435,7 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
     if (QWidget *nativeParent = q->nativeParentWidget()) {
         if (nativeParent->windowHandle()) {
             if (flags & Qt::Window) {
-                win->setTransientParent(nativeParent->windowHandle());
+                win->setTransientParent(nativeParent->window()->windowHandle());
                 win->setParent(0);
             } else {
                 win->setTransientParent(0);
diff --git a/src/widgets/widgets.pro b/src/widgets/widgets.pro
index c2cf4b7dfe..d819436f66 100644
--- a/src/widgets/widgets.pro
+++ b/src/widgets/widgets.pro
@@ -8,6 +8,9 @@ DEFINES   += QT_NO_USING_NAMESPACE
 win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x65000000
 irix-cc*:QMAKE_CXXFLAGS += -no_prelink -ptused
 
+MODULE_PLUGIN_TYPES += \
+    styles
+
 QMAKE_DOCS = $$PWD/doc/qtwidgets.qdocconf
 
 load(qt_module)
diff --git a/src/widgets/widgets/qsplitter.cpp b/src/widgets/widgets/qsplitter.cpp
index f58881af0d..1f29af319a 100644
--- a/src/widgets/widgets/qsplitter.cpp
+++ b/src/widgets/widgets/qsplitter.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the QtWidgets module of the Qt Toolkit.
@@ -1224,7 +1224,9 @@ void QSplitter::childEvent(QChildEvent *c)
         return;
     }
     QWidget *w = static_cast<QWidget*>(c->child());
-    if (c->added() && !d->blockChildAdd && !w->isWindow() && !d->findWidget(w)) {
+    if (w->isWindow())
+        return;
+    if (c->added() && !d->blockChildAdd && !d->findWidget(w)) {
         d->insertWidget_helper(d->list.count(), w, false);
     } else if (c->polished() && !d->blockChildAdd) {
         if (isVisible() && !(w->isHidden() && w->testAttribute(Qt::WA_WState_ExplicitShowHide)))