Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7

Conflicts:
	doc/src/declarative/declarativeui.qdoc
	doc/src/declarative/dynamicobjects.qdoc
	doc/src/declarative/elements.qdoc
	doc/src/examples/qml-examples.qdoc

2 files changed, 5 insertions, 3 deletions

diff --git a/tools/designer/src/components/formeditor/qdesigner_resource.cpp b/tools/designer/src/components/formeditor/qdesigner_resource.cpp
index 430b070..6d718bb 100644
--- a/tools/designer/src/components/formeditor/qdesigner_resource.cpp
+++ b/tools/designer/src/components/formeditor/qdesigner_resource.cpp
@@ -1190,7 +1190,7 @@ QWidget *QDesignerResource::createWidget(const QString &widgetName, QWidget *par
             parentWidget->setProperty("_q_widgetOrder", qVariantFromValue(list));
             QList<QWidget *> zOrder = qVariantValue<QWidgetList>(parentWidget->property("_q_zOrder"));
             zOrder.append(w);
-            parentWidget->setProperty("_q_zOrder", qVariantFromValue(list));
+            parentWidget->setProperty("_q_zOrder", qVariantFromValue(zOrder));
         }
     } else {
         core()->metaDataBase()->add(w);
diff --git a/tools/designer/src/lib/shared/widgetfactory.cpp b/tools/designer/src/lib/shared/widgetfactory.cpp
index 887bb04..36f795e 100644
--- a/tools/designer/src/lib/shared/widgetfactory.cpp
+++ b/tools/designer/src/lib/shared/widgetfactory.cpp
@@ -412,8 +412,10 @@ QWidget *WidgetFactory::createWidget(const QString &widgetName, QWidget *parentW
             // Currently happens in the case of Q3-Support widgets
             baseClass =fallBackBaseClass;
         }
-        w = createWidget(baseClass, parentWidget);
-        promoteWidget(core(),w,widgetName);
+        if (QWidget *promotedWidget = createWidget(baseClass, parentWidget)) {
+            promoteWidget(core(), promotedWidget, widgetName);
+            return promotedWidget;  // Do not initialize twice.
+        }
     } while (false);
 
     Q_ASSERT(w != 0);