Qt Designer: Potential fix for Unity builds

Fully qualify all classes in Ui namespaces.

Fixes: QTBUG-120751
Task-number: QTBUG-115448
Pick-to: 6.7
Change-Id: Ic85fc5604b237ba84c2e4a9c50f4b94cdbb3037c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>

10 files changed, 10 insertions, 10 deletions

diff --git a/src/designer/src/components/formeditor/deviceprofiledialog.cpp b/src/designer/src/components/formeditor/deviceprofiledialog.cpp
index 6deabbaa1..188e24cf0 100644
--- a/src/designer/src/components/formeditor/deviceprofiledialog.cpp
+++ b/src/designer/src/components/formeditor/deviceprofiledialog.cpp
@@ -44,7 +44,7 @@ namespace qdesigner_internal {
 
 DeviceProfileDialog::DeviceProfileDialog(QDesignerDialogGuiInterface *dlgGui, QWidget *parent) :
     QDialog(parent),
-    m_ui(new Ui::DeviceProfileDialog),
+    m_ui(new QT_PREPEND_NAMESPACE(Ui)::DeviceProfileDialog),
     m_dlgGui(dlgGui)
 {
     setModal(true);
diff --git a/src/designer/src/components/formeditor/formwindowsettings.cpp b/src/designer/src/components/formeditor/formwindowsettings.cpp
index df3fa01c2..ad0e32f48 100644
--- a/src/designer/src/components/formeditor/formwindowsettings.cpp
+++ b/src/designer/src/components/formeditor/formwindowsettings.cpp
@@ -143,7 +143,7 @@ void FormWindowData::applyToFormWindow(FormWindowBase* fw) const
 
 FormWindowSettings::FormWindowSettings(QDesignerFormWindowInterface *parent) :
     QDialog(parent),
-    m_ui(new ::Ui::FormWindowSettings),
+    m_ui(new QT_PREPEND_NAMESPACE(Ui)::FormWindowSettings),
     m_formWindow(qobject_cast<FormWindowBase*>(parent)),
     m_oldData(new FormWindowData)
 {
diff --git a/src/designer/src/components/formeditor/templateoptionspage.cpp b/src/designer/src/components/formeditor/templateoptionspage.cpp
index b54981272..2063972d9 100644
--- a/src/designer/src/components/formeditor/templateoptionspage.cpp
+++ b/src/designer/src/components/formeditor/templateoptionspage.cpp
@@ -20,7 +20,7 @@ namespace qdesigner_internal {
 TemplateOptionsWidget::TemplateOptionsWidget(QDesignerFormEditorInterface *core, QWidget *parent) :
     QWidget(parent),
     m_core(core),
-    m_ui(new Ui::TemplateOptionsWidget)
+    m_ui(new QT_PREPEND_NAMESPACE(qdesigner_internal)::Ui::TemplateOptionsWidget)
 {
     m_ui->setupUi(this);
 
diff --git a/src/designer/src/components/propertyeditor/newdynamicpropertydialog.cpp b/src/designer/src/components/propertyeditor/newdynamicpropertydialog.cpp
index 6ac1638bc..a8972c332 100644
--- a/src/designer/src/components/propertyeditor/newdynamicpropertydialog.cpp
+++ b/src/designer/src/components/propertyeditor/newdynamicpropertydialog.cpp
@@ -18,7 +18,7 @@ NewDynamicPropertyDialog::NewDynamicPropertyDialog(QDesignerDialogGuiInterface *
                                                        QWidget *parent)   :
     QDialog(parent),
     m_dialogGui(dialogGui),
-    m_ui(new Ui::NewDynamicPropertyDialog)
+    m_ui(new QT_PREPEND_NAMESPACE(qdesigner_internal)::Ui::NewDynamicPropertyDialog)
 {
     m_ui->setupUi(this);
     connect(m_ui->m_lineEdit, &QLineEdit::textChanged, this, &NewDynamicPropertyDialog::nameChanged);
diff --git a/src/designer/src/designer/preferencesdialog.cpp b/src/designer/src/designer/preferencesdialog.cpp
index 6c597c6a0..eac6e82dd 100644
--- a/src/designer/src/designer/preferencesdialog.cpp
+++ b/src/designer/src/designer/preferencesdialog.cpp
@@ -15,7 +15,7 @@ QT_BEGIN_NAMESPACE
 
 PreferencesDialog::PreferencesDialog(QDesignerFormEditorInterface *core, QWidget *parentWidget) :
     QDialog(parentWidget),
-    m_ui(new Ui::PreferencesDialog()),
+    m_ui(new QT_PREPEND_NAMESPACE(Ui)::PreferencesDialog()),
     m_core(core)
 {
     m_ui->setupUi(this);
diff --git a/src/designer/src/designer/qdesigner_appearanceoptions.cpp b/src/designer/src/designer/qdesigner_appearanceoptions.cpp
index 4c68a4445..a4e062145 100644
--- a/src/designer/src/designer/qdesigner_appearanceoptions.cpp
+++ b/src/designer/src/designer/qdesigner_appearanceoptions.cpp
@@ -29,7 +29,7 @@ void AppearanceOptions::fromSettings(const QDesignerSettings &settings)
 // ---------------- QDesignerAppearanceOptionsWidget
 QDesignerAppearanceOptionsWidget::QDesignerAppearanceOptionsWidget(QWidget *parent) :
     QWidget(parent),
-    m_ui(new Ui::AppearanceOptionsWidget)
+    m_ui(new QT_PREPEND_NAMESPACE(Ui)::AppearanceOptionsWidget)
 {
     m_ui->setupUi(this);
 
diff --git a/src/designer/src/lib/shared/gridpanel.cpp b/src/designer/src/lib/shared/gridpanel.cpp
index 645c79935..a5f6ae654 100644
--- a/src/designer/src/lib/shared/gridpanel.cpp
+++ b/src/designer/src/lib/shared/gridpanel.cpp
@@ -12,7 +12,7 @@ namespace qdesigner_internal {
 GridPanel::GridPanel(QWidget *parentWidget) :
     QWidget(parentWidget)
 {
-    m_ui = new Ui::GridPanel;
+    m_ui = new QT_PREPEND_NAMESPACE(qdesigner_internal)::Ui::GridPanel;
     m_ui->setupUi(this);
 
     connect(m_ui->m_resetButton, &QAbstractButton::clicked, this, &GridPanel::reset);
diff --git a/src/designer/src/lib/shared/newactiondialog.cpp b/src/designer/src/lib/shared/newactiondialog.cpp
index 2aea8bb57..5bbb5d725 100644
--- a/src/designer/src/lib/shared/newactiondialog.cpp
+++ b/src/designer/src/lib/shared/newactiondialog.cpp
@@ -44,7 +44,7 @@ unsigned ActionData::compare(const ActionData &rhs) const
 // -------------------- NewActionDialog
 NewActionDialog::NewActionDialog(ActionEditor *parent) :
     QDialog(parent, Qt::Sheet),
-    m_ui(new Ui::NewActionDialog),
+    m_ui(new QT_PREPEND_NAMESPACE(qdesigner_internal)::Ui::NewActionDialog),
     m_actionEditor(parent),
     m_autoUpdateObjectName(true)
 {
diff --git a/src/designer/src/lib/shared/newformwidget.cpp b/src/designer/src/lib/shared/newformwidget.cpp
index 1cf1c8bfb..383b3fc5a 100644
--- a/src/designer/src/lib/shared/newformwidget.cpp
+++ b/src/designer/src/lib/shared/newformwidget.cpp
@@ -102,7 +102,7 @@ static const struct TemplateSize templateSizes[] =
 NewFormWidget::NewFormWidget(QDesignerFormEditorInterface *core, QWidget *parentWidget) :
     QDesignerNewFormWidgetInterface(parentWidget),
     m_core(core),
-    m_ui(new Ui::NewFormWidget),
+      m_ui(new QT_PREPEND_NAMESPACE(qdesigner_internal)::Ui::NewFormWidget),
     m_currentItem(nullptr),
     m_acceptedItem(nullptr)
 {
diff --git a/src/designer/src/lib/shared/orderdialog.cpp b/src/designer/src/lib/shared/orderdialog.cpp
index be94b512d..faa13501a 100644
--- a/src/designer/src/lib/shared/orderdialog.cpp
+++ b/src/designer/src/lib/shared/orderdialog.cpp
@@ -21,7 +21,7 @@ namespace qdesigner_internal {
 
 OrderDialog::OrderDialog(QWidget *parent) :
     QDialog(parent),
-    m_ui(new Ui::OrderDialog),
+    m_ui(new QT_PREPEND_NAMESPACE(qdesigner_internal)::Ui::OrderDialog),
     m_format(PageOrderFormat)
 {
     m_ui->setupUi(this);