Qt Designer: Fix a few unity build issues

Disambiguate some enumerations and variables.
Add QT_PREPEND_NAMESPACE to more Ui namespaces.

Amends eb46711c2000c11c5daf8c3704589c486c1141d2.
Complements d0223dabe6922669519a0f7ed0704a13ce99951e.

Task-number: QTBUG-115448
Change-Id: Ifc0d14bb5e0cedb3bf61ab17ead2e928674b8693
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
(cherry picked from commit 30797f219b069967afe8cb2d7d0a1a0a95f338cc)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

9 files changed, 19 insertions, 29 deletions

diff --git a/src/designer/src/lib/CMakeLists.txt b/src/designer/src/lib/CMakeLists.txt
index 85cf5372f..742e2c3c2 100644
--- a/src/designer/src/lib/CMakeLists.txt
+++ b/src/designer/src/lib/CMakeLists.txt
@@ -150,18 +150,10 @@ qt_internal_add_module(Designer
         components/qdesigner_components.h
         components/qdesigner_components_global.h
     NO_UNITY_BUILD_SOURCES
-        shared/previewconfigurationwidget.cpp # no type named 'PreviewConfigurationWidget' in namespace 'qdesigner_internal::Ui'
         shared/qdesigner_command.cpp # redefinition of 'QMetaTypeId<QList<QWidget *>>' (from morphmenu.cpp)
                                      # and recursiveUpdate (from formwindowbase.cpp)
-        shared/qlayout_widget.cpp    # redefinition of 'FormLayoutColumns' (from layout.cpp)
-        shared/qtresourceeditordialog.cpp # redefinition of 'Geometry' (from plaintexteditor.cpp)
-        shared/richtexteditor.cpp # no type named 'AddLinkDialog' in namespace 'qdesigner_internal::Ui'
-        shared/selectsignaldialog.cpp # no type named 'SelectSignalDialog' in namespace 'qdesigner_internal::Ui'
-        shared/signalslotdialog.cpp # no type named 'SignalSlotDialogClass' in namespace 'qdesigner_internal::Ui'
-        shared/widgetdatabase.cpp # redefinition of 'debugWidgetDataBase' (from abstractwidgetdatabase.cpp)
-        uilib/abstractformbuilder.cpp # redefinition of 'QMetaTypeId<QList<QWidget *>>' (from morphmenu.cpp)
-        uilib/formbuilderextra.cpp # use of undeclared identifier 'dcw'
-        uilib/properties.cpp # 'setupColorGroup' [etc] is a protected member of 'QAbstractFormBuilder'
+        uilib/abstractformbuilder.cpp # using namespace QFormInternal/redefinition of 'QMetaTypeId<QList<QWidget *>>' (from morphmenu.cpp)
+        uilib/ui4.cpp # using namespace QFormInternal
     DEFINES
         QDESIGNER_EXTENSION_LIBRARY
         QDESIGNER_SDK_LIBRARY
diff --git a/src/designer/src/lib/sdk/abstractwidgetdatabase.cpp b/src/designer/src/lib/sdk/abstractwidgetdatabase.cpp
index dc0968aee..80cb911c6 100644
--- a/src/designer/src/lib/sdk/abstractwidgetdatabase.cpp
+++ b/src/designer/src/lib/sdk/abstractwidgetdatabase.cpp
@@ -7,9 +7,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace {
-    enum { debugWidgetDataBase =  0 };
-}
+enum { debugAbstractWidgetDataBase =  0 };
 
 /*!
     \class QDesignerWidgetDataBaseInterface
@@ -61,7 +59,7 @@ int QDesignerWidgetDataBaseInterface::indexOf(QDesignerWidgetDataBaseItemInterfa
 */
 void QDesignerWidgetDataBaseInterface::insert(int index, QDesignerWidgetDataBaseItemInterface *item)
 {
-    if (debugWidgetDataBase)
+    if (debugAbstractWidgetDataBase)
         qDebug() << "insert at " << index << ' ' << item->name() << " derived from " << item->extends();
 
     m_items.insert(index, item);
@@ -71,7 +69,7 @@ void QDesignerWidgetDataBaseInterface::insert(int index, QDesignerWidgetDataBase
 */
 void QDesignerWidgetDataBaseInterface::append(QDesignerWidgetDataBaseItemInterface *item)
 {
-    if (debugWidgetDataBase)
+    if (debugAbstractWidgetDataBase)
         qDebug() << "append " << item->name() << " derived from " << item->extends();
     m_items.append(item);
 }
diff --git a/src/designer/src/lib/shared/layout.cpp b/src/designer/src/lib/shared/layout.cpp
index 860148aa7..b35361a38 100644
--- a/src/designer/src/lib/shared/layout.cpp
+++ b/src/designer/src/lib/shared/layout.cpp
@@ -41,8 +41,6 @@ QT_BEGIN_NAMESPACE
 
 using namespace Qt::StringLiterals;
 
-enum { FormLayoutColumns = 2 };
-
 namespace qdesigner_internal {
 
 /* The wizard has a policy of setting a size policy of its external children
@@ -556,6 +554,8 @@ class GridHelper
 {
     Q_DISABLE_COPY_MOVE(GridHelper);
 public:
+    enum { FormLayoutColumns = 2 };
+
     enum Mode {
         GridLayout, // Arbitrary size/supports span
         FormLayout  // 2-column/no span
diff --git a/src/designer/src/lib/shared/plaintexteditor.cpp b/src/designer/src/lib/shared/plaintexteditor.cpp
index 5b8aba14c..d3c8f6ecc 100644
--- a/src/designer/src/lib/shared/plaintexteditor.cpp
+++ b/src/designer/src/lib/shared/plaintexteditor.cpp
@@ -14,7 +14,7 @@
 QT_BEGIN_NAMESPACE
 
 static const char *PlainTextDialogC = "PlainTextDialog";
-static const char *Geometry = "Geometry";
+static const char PlainTextEditorGeometryC[] = "Geometry";
 
 
 namespace qdesigner_internal {
@@ -39,8 +39,8 @@ PlainTextEditorDialog::PlainTextEditorDialog(QDesignerFormEditorInterface *core,
     QDesignerSettingsInterface *settings = core->settingsManager();
     settings->beginGroup(QLatin1String(PlainTextDialogC));
 
-    if (settings->contains(QLatin1String(Geometry)))
-        restoreGeometry(settings->value(QLatin1String(Geometry)).toByteArray());
+    if (settings->contains(QLatin1String(PlainTextEditorGeometryC)))
+        restoreGeometry(settings->value(QLatin1StringView(PlainTextEditorGeometryC)).toByteArray());
 
     settings->endGroup();
 }
@@ -50,7 +50,7 @@ PlainTextEditorDialog::~PlainTextEditorDialog()
     QDesignerSettingsInterface *settings = m_core->settingsManager();
     settings->beginGroup(QLatin1String(PlainTextDialogC));
 
-    settings->setValue(QLatin1String(Geometry), saveGeometry());
+    settings->setValue(QLatin1StringView(PlainTextEditorGeometryC), saveGeometry());
     settings->endGroup();
 }
 
diff --git a/src/designer/src/lib/shared/previewconfigurationwidget.cpp b/src/designer/src/lib/shared/previewconfigurationwidget.cpp
index 4d466af71..b4c03a3b7 100644
--- a/src/designer/src/lib/shared/previewconfigurationwidget.cpp
+++ b/src/designer/src/lib/shared/previewconfigurationwidget.cpp
@@ -84,7 +84,7 @@ private:
 
     const QString m_defaultStyle;
     QGroupBox *m_parent;
-    Ui::PreviewConfigurationWidget m_ui;
+    QT_PREPEND_NAMESPACE(Ui)::PreviewConfigurationWidget m_ui;
 
     int m_firstUserSkinIndex;
     int m_browseSkinIndex;
diff --git a/src/designer/src/lib/shared/qtresourceeditordialog.cpp b/src/designer/src/lib/shared/qtresourceeditordialog.cpp
index c5a27b831..78d74d3d6 100644
--- a/src/designer/src/lib/shared/qtresourceeditordialog.cpp
+++ b/src/designer/src/lib/shared/qtresourceeditordialog.cpp
@@ -33,7 +33,7 @@ static const char *rccAliasAttribute = "alias";
 static const char *rccPrefixAttribute = "prefix";
 static const char *rccLangAttribute = "lang";
 static const char *SplitterPosition = "SplitterPosition";
-static const char *Geometry = "Geometry";
+static const char ResourceEditorGeometry[] = "Geometry";
 static const char *QrcDialogC = "QrcDialog";
 
 static QString msgOverwrite(const QString &fname)
@@ -1995,7 +1995,7 @@ QtResourceEditorDialog::QtResourceEditorDialog(QDesignerFormEditorInterface *cor
     settings->beginGroup(QLatin1String(QrcDialogC));
 
     d_ptr->m_ui.splitter->restoreState(settings->value(QLatin1String(SplitterPosition)).toByteArray());
-    const QVariant geometry = settings->value(QLatin1String(Geometry));
+    const QVariant geometry = settings->value(QLatin1StringView(ResourceEditorGeometry));
     if (geometry.metaType().id() == QMetaType::QByteArray) // Used to be a QRect up until 5.4.0, QTBUG-43374
         restoreGeometry(geometry.toByteArray());
 
@@ -2008,7 +2008,7 @@ QtResourceEditorDialog::~QtResourceEditorDialog()
     settings->beginGroup(QLatin1String(QrcDialogC));
 
     settings->setValue(QLatin1String(SplitterPosition), d_ptr->m_ui.splitter->saveState());
-    settings->setValue(QLatin1String(Geometry), saveGeometry());
+    settings->setValue(QLatin1StringView(ResourceEditorGeometry), saveGeometry());
     settings->endGroup();
 
     disconnect(d_ptr->m_qrcManager, nullptr, this, nullptr);
diff --git a/src/designer/src/lib/shared/richtexteditor.cpp b/src/designer/src/lib/shared/richtexteditor.cpp
index fbc6974f5..ba08328cb 100644
--- a/src/designer/src/lib/shared/richtexteditor.cpp
+++ b/src/designer/src/lib/shared/richtexteditor.cpp
@@ -178,12 +178,12 @@ public slots:
 
 private:
     RichTextEditor *m_editor;
-    Ui::AddLinkDialog *m_ui;
+    QT_PREPEND_NAMESPACE(Ui)::AddLinkDialog *m_ui;
 };
 
 AddLinkDialog::AddLinkDialog(RichTextEditor *editor, QWidget *parent) :
     QDialog(parent),
-    m_ui(new Ui::AddLinkDialog)
+    m_ui(new QT_PREPEND_NAMESPACE(Ui)::AddLinkDialog)
 {
     m_ui->setupUi(this);
 
diff --git a/src/designer/src/lib/shared/selectsignaldialog.cpp b/src/designer/src/lib/shared/selectsignaldialog.cpp
index 9cf348cbc..1938046f4 100644
--- a/src/designer/src/lib/shared/selectsignaldialog.cpp
+++ b/src/designer/src/lib/shared/selectsignaldialog.cpp
@@ -34,7 +34,7 @@ using Methods = QList<SelectSignalDialog::Method>;
 
 SelectSignalDialog::SelectSignalDialog(QWidget *parent)
     : QDialog(parent)
-    , m_ui(new Ui::SelectSignalDialog)
+    , m_ui(new QT_PREPEND_NAMESPACE(Ui)::SelectSignalDialog)
     , m_model(new QStandardItemModel(0, 1, this))
 {
     m_ui->setupUi(this);
diff --git a/src/designer/src/lib/shared/signalslotdialog.cpp b/src/designer/src/lib/shared/signalslotdialog.cpp
index 0f6a3aad0..4d2de5136 100644
--- a/src/designer/src/lib/shared/signalslotdialog.cpp
+++ b/src/designer/src/lib/shared/signalslotdialog.cpp
@@ -286,7 +286,7 @@ void SignaturePanel::closeEditor()
 SignalSlotDialog::SignalSlotDialog(QDesignerDialogGuiInterface *dialogGui, QWidget *parent, FocusMode mode) :
     QDialog(parent),
     m_focusMode(mode),
-    m_ui(new Ui::SignalSlotDialogClass),
+    m_ui(new QT_PREPEND_NAMESPACE(Ui)::SignalSlotDialogClass),
     m_dialogGui(dialogGui)
 {
     setModal(true);