Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt

1 files changed, 10 insertions, 0 deletions

diff --git a/tools/designer/src/components/widgetbox/widgetbox_dnditem.cpp b/tools/designer/src/components/widgetbox/widgetbox_dnditem.cpp
index 67e11840c5..045bfca3d8 100644
--- a/tools/designer/src/components/widgetbox/widgetbox_dnditem.cpp
+++ b/tools/designer/src/components/widgetbox/widgetbox_dnditem.cpp
@@ -50,6 +50,7 @@
 #include <formwindowbase_p.h>
 #include <qdesigner_utils_p.h>
 #include <qdesigner_dockwidget_p.h>
+#include <qsimpleresource_p.h>
 
 #include <QtDesigner/QDesignerFormEditorInterface>
 #include <QtDesigner/QDesignerFormWindowManagerInterface>
@@ -84,6 +85,7 @@ protected:
 
     virtual QWidget *create(DomWidget *ui_widget, QWidget *parents);
     virtual QWidget *createWidget(const QString &widgetName, QWidget *parentWidget, const QString &name);
+    virtual void createCustomWidgets(DomCustomWidgets *);
 };
 
 WidgetBoxResource::WidgetBoxResource(QDesignerFormEditorInterface *core) :
@@ -120,6 +122,14 @@ QWidget *WidgetBoxResource::create(DomWidget *ui_widget, QWidget *parent)
     return result;
 }
 
+void WidgetBoxResource::createCustomWidgets(DomCustomWidgets *dc)
+{
+    // Make a promotion entry in  case someone has a promoted widget
+    // in the scratchpad.
+    QSimpleResource::handleDomCustomWidgets(core(), dc);
+
+}
+
 /*******************************************************************************
 ** WidgetBoxResource
 */