Designer: Fix a bug affecting tab reordering of promoted tab widgets.

Event filter was added twice due to widget initialization being
done twice caused by recursion of WidgetFactory::createWidget()
in the case of a fallback to promotion when a custom widget
plugin is missing.

Task-number: QTBUG-18121
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>

1 files changed, 4 insertions, 2 deletions

diff --git a/tools/designer/src/lib/shared/widgetfactory.cpp b/tools/designer/src/lib/shared/widgetfactory.cpp
index 887bb04cd4..36f795eb6c 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);