Meson: Compile fix for namespaced Qt

Task-number: QTCREATORBUG-24544
Change-Id: I5a6ff7f561aca0b967471f4532e32a05077e3939
Reviewed-by: Eike Ziller <eike.ziller@qt.io>

8 files changed, 18 insertions, 24 deletions

diff --git a/src/plugins/mesonprojectmanager/project/buildoptions/mesonbuildsettingswidget.h b/src/plugins/mesonprojectmanager/project/buildoptions/mesonbuildsettingswidget.h
index d3b9ab5118..68f677c41f 100644
--- a/src/plugins/mesonprojectmanager/project/buildoptions/mesonbuildsettingswidget.h
+++ b/src/plugins/mesonprojectmanager/project/buildoptions/mesonbuildsettingswidget.h
@@ -32,12 +32,12 @@
 #include <QTimer>
 #include <QWidget>
 
-namespace Ui {
-class MesonBuildSettingsWidget;
-}
 
 namespace MesonProjectManager {
 namespace Internal {
+
+namespace Ui { class MesonBuildSettingsWidget; }
+
 class MesonBuildConfiguration;
 class MesonBuildSettingsWidget : public ProjectExplorer::NamedWidget
 {
diff --git a/src/plugins/mesonprojectmanager/project/buildoptions/mesonbuildsettingswidget.ui b/src/plugins/mesonprojectmanager/project/buildoptions/mesonbuildsettingswidget.ui
index f5a80ee047..6efac5a04f 100644
--- a/src/plugins/mesonprojectmanager/project/buildoptions/mesonbuildsettingswidget.ui
+++ b/src/plugins/mesonprojectmanager/project/buildoptions/mesonbuildsettingswidget.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>MesonBuildSettingsWidget</class>
- <widget class="QWidget" name="MesonBuildSettingsWidget">
+ <class>MesonProjectManager::Internal::MesonBuildSettingsWidget</class>
+ <widget class="QWidget" name="MesonProjectManager::Internal::MesonBuildSettingsWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
diff --git a/src/plugins/mesonprojectmanager/settings/general/generalsettingswidget.h b/src/plugins/mesonprojectmanager/settings/general/generalsettingswidget.h
index cf0da678e5..d16e6ec755 100644
--- a/src/plugins/mesonprojectmanager/settings/general/generalsettingswidget.h
+++ b/src/plugins/mesonprojectmanager/settings/general/generalsettingswidget.h
@@ -30,12 +30,11 @@
 #include <QTabWidget>
 #include <QWidget>
 
-namespace Ui {
-class GeneralSettingsWidget;
-}
-
 namespace MesonProjectManager {
 namespace Internal {
+
+namespace Ui { class GeneralSettingsWidget; }
+
 class GeneralSettingsWidget final : public Core::IOptionsPageWidget
 {
     Q_DECLARE_TR_FUNCTIONS(MesonProjectManager::Internal::GeneralSettingsWidget)
diff --git a/src/plugins/mesonprojectmanager/settings/general/generalsettingswidget.ui b/src/plugins/mesonprojectmanager/settings/general/generalsettingswidget.ui
index 8f44e3df74..6323bf302e 100644
--- a/src/plugins/mesonprojectmanager/settings/general/generalsettingswidget.ui
+++ b/src/plugins/mesonprojectmanager/settings/general/generalsettingswidget.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>GeneralSettingsWidget</class>
- <widget class="QWidget" name="GeneralSettingsWidget">
+ <class>MesonProjectManager::Internal::GeneralSettingsWidget</class>
+ <widget class="QWidget" name="MesonProjectManager::Internal::GeneralSettingsWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
diff --git a/src/plugins/mesonprojectmanager/settings/tools/toolitemsettings.h b/src/plugins/mesonprojectmanager/settings/tools/toolitemsettings.h
index 9a692b00c1..988add23be 100644
--- a/src/plugins/mesonprojectmanager/settings/tools/toolitemsettings.h
+++ b/src/plugins/mesonprojectmanager/settings/tools/toolitemsettings.h
@@ -29,13 +29,10 @@
 #include "utils/optional.h"
 #include <QWidget>
 
-namespace Ui {
-class ToolItemSettings;
-}
-
 namespace MesonProjectManager {
 namespace Internal {
 
+namespace Ui { class ToolItemSettings; }
 class ToolTreeItem;
 
 class ToolItemSettings : public QWidget
diff --git a/src/plugins/mesonprojectmanager/settings/tools/toolitemsettings.ui b/src/plugins/mesonprojectmanager/settings/tools/toolitemsettings.ui
index 60a93dca1a..5e1b2a5953 100644
--- a/src/plugins/mesonprojectmanager/settings/tools/toolitemsettings.ui
+++ b/src/plugins/mesonprojectmanager/settings/tools/toolitemsettings.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>ToolItemSettings</class>
- <widget class="QWidget" name="ToolItemSettings">
+ <class>MesonProjectManager::Internal::ToolItemSettings</class>
+ <widget class="QWidget" name="MesonProjectManager::Internal::ToolItemSettings">
   <property name="geometry">
    <rect>
     <x>0</x>
diff --git a/src/plugins/mesonprojectmanager/settings/tools/toolssettingswidget.h b/src/plugins/mesonprojectmanager/settings/tools/toolssettingswidget.h
index 9c1bd5231f..26739e88b9 100644
--- a/src/plugins/mesonprojectmanager/settings/tools/toolssettingswidget.h
+++ b/src/plugins/mesonprojectmanager/settings/tools/toolssettingswidget.h
@@ -34,13 +34,11 @@
 #include <QTabWidget>
 #include <QWidget>
 
-
-namespace Ui {
-class ToolsSettingsWidget;
-}
-
 namespace MesonProjectManager {
 namespace Internal {
+
+namespace Ui { class ToolsSettingsWidget; }
+
 class ToolTreeItem;
 class ToolsSettingsWidget final : public Core::IOptionsPageWidget
 {
diff --git a/src/plugins/mesonprojectmanager/settings/tools/toolssettingswidget.ui b/src/plugins/mesonprojectmanager/settings/tools/toolssettingswidget.ui
index 7cc3da0b83..ed6409ab13 100644
--- a/src/plugins/mesonprojectmanager/settings/tools/toolssettingswidget.ui
+++ b/src/plugins/mesonprojectmanager/settings/tools/toolssettingswidget.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>ToolsSettingsWidget</class>
- <widget class="QWidget" name="MesonToolConfigWidget">
+ <class>MesonProjectManager::Internal::ToolsSettingsWidget</class>
+ <widget class="QWidget" name="MesonProjectManager::Internal::ToolSettingsWidget">
   <property name="geometry">
    <rect>
     <x>0</x>