1 files changed, 39 insertions, 0 deletions
diff --git a/src/tools/uic/customwidgetsinfo.cpp b/src/tools/uic/customwidgetsinfo.cpp
index 0ac0c2b6a3..d6a409152b 100644
--- a/src/tools/uic/customwidgetsinfo.cpp
+++ b/src/tools/uic/customwidgetsinfo.cpp
@@ -31,6 +31,8 @@
 #include "ui4.h"
 #include "utils.h"
 
+#include <utility>
+
 QT_BEGIN_NAMESPACE
 
 CustomWidgetsInfo::CustomWidgetsInfo() = default;
@@ -73,6 +75,24 @@ bool CustomWidgetsInfo::extends(const QString &classNameIn, QLatin1String baseCl
     return false;
 }
 
+bool CustomWidgetsInfo::extendsOneOf(const QString &classNameIn,
+                                     const QStringList &baseClassNames) const
+{
+    if (baseClassNames.contains(classNameIn))
+        return true;
+
+    QString className = classNameIn;
+    while (const DomCustomWidget *c = customWidget(className)) {
+        const QString extends = c->elementExtends();
+        if (className == extends) // Faulty legacy custom widget entries exist.
+            return false;
+        if (baseClassNames.contains(extends))
+            return true;
+        className = extends;
+    }
+    return false;
+}
+
 bool CustomWidgetsInfo::isCustomWidgetContainer(const QString &className) const
 {
     if (const DomCustomWidget *dcw = m_customWidgets.value(className, 0))
@@ -96,5 +116,24 @@ QString CustomWidgetsInfo::customWidgetAddPageMethod(const QString &name) const
     return QString();
 }
 
+// add page methods for simple containers taking only the widget parameter
+QString CustomWidgetsInfo::simpleContainerAddPageMethod(const QString &name) const
+{
+    using AddPageMethod = std::pair<const char *, const char *>;
+
+    static AddPageMethod addPageMethods[] = {
+        {"QStackedWidget", "addWidget"},
+        {"QToolBar", "addWidget"},
+        {"QDockWidget", "setWidget"},
+        {"QScrollArea", "setWidget"},
+        {"QSplitter", "addWidget"},
+        {"QMdiArea", "addSubWindow"}
+    };
+    for (const auto &m : addPageMethods) {
+        if (extends(name, QLatin1String(m.first)))
+            return QLatin1String(m.second);
+    }
+    return QString();
+}
 
 QT_END_NAMESPACE