uic/Designer: Use correct margin defaults for custom page-based containers.

Designer-formbuilder/uic incorrectly considered custom containers that
do not inherit a known page-based container (say QTabWidget) as
instances of QLayoutWidget, giving them  a default margin of 0.

Add a check for the custom widget <container>-element to the checks
for QLayoutWidget in uic/formbuilder.

In the formbuilder, introduce a new data structure to store
custom widget information instead of using 3 separate hashes.

Adapt one autotest baseline (Qt 3).

Reviewed-by: Jarek Kobus <jkobus@trolltech.com>
Task-number: QTBUG-5335

1 files changed, 8 insertions, 0 deletions

diff --git a/src/tools/uic/customwidgetsinfo.cpp b/src/tools/uic/customwidgetsinfo.cpp
index 70adba2..ca3fd19 100644
--- a/src/tools/uic/customwidgetsinfo.cpp
+++ b/src/tools/uic/customwidgetsinfo.cpp
@@ -88,6 +88,14 @@ bool CustomWidgetsInfo::extends(const QString &classNameIn, const QLatin1String
     return false;
 }
 
+bool CustomWidgetsInfo::isCustomWidgetContainer(const QString &className) const
+{
+    if (const DomCustomWidget *dcw = m_customWidgets.value(className, 0))
+        if (dcw->hasElementContainer())
+            return dcw->elementContainer() != 0;
+    return false;
+}
+
 QString CustomWidgetsInfo::realClassName(const QString &className) const
 {
     if (className == QLatin1String("Line"))