feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Meson: Compile fix for namespaced Qt

Browse Source 
Task-number: QTCREATORBUG-24544
Change-Id: I5a6ff7f561aca0b967471f4532e32a05077e3939
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2020-08-28 08:48:48 +02:00
parent 4886375994
commit b41ea23233
8 changed files with 18 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/mesonprojectmanager/project/buildoptions/mesonbuildsettingswidget.h
View File

@@ -32,12 +32,12 @@
#include <QTimer> #include <QTimer>
#include <QWidget> #include <QWidget>
namespace Ui {
class MesonBuildSettingsWidget;
}
namespace MesonProjectManager { namespace MesonProjectManager {
namespace Internal { namespace Internal {
namespace Ui { class MesonBuildSettingsWidget; }
class MesonBuildConfiguration; class MesonBuildConfiguration;
class MesonBuildSettingsWidget : public ProjectExplorer::NamedWidget class MesonBuildSettingsWidget : public ProjectExplorer::NamedWidget
{ {

4
src/plugins/mesonprojectmanager/project/buildoptions/mesonbuildsettingswidget.ui
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>MesonBuildSettingsWidget</class> <class>MesonProjectManager::Internal::MesonBuildSettingsWidget</class>
<widget class="QWidget" name="MesonBuildSettingsWidget"> <widget class="QWidget" name="MesonProjectManager::Internal::MesonBuildSettingsWidget">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>

7
src/plugins/mesonprojectmanager/settings/general/generalsettingswidget.h
View File

@@ -30,12 +30,11 @@
#include <QTabWidget> #include <QTabWidget>
#include <QWidget> #include <QWidget>
namespace Ui {
class GeneralSettingsWidget;
}
namespace MesonProjectManager { namespace MesonProjectManager {
namespace Internal { namespace Internal {
namespace Ui { class GeneralSettingsWidget; }
class GeneralSettingsWidget final : public Core::IOptionsPageWidget class GeneralSettingsWidget final : public Core::IOptionsPageWidget
{ {
Q_DECLARE_TR_FUNCTIONS(MesonProjectManager::Internal::GeneralSettingsWidget) Q_DECLARE_TR_FUNCTIONS(MesonProjectManager::Internal::GeneralSettingsWidget)

4
src/plugins/mesonprojectmanager/settings/general/generalsettingswidget.ui
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>GeneralSettingsWidget</class> <class>MesonProjectManager::Internal::GeneralSettingsWidget</class>
<widget class="QWidget" name="GeneralSettingsWidget"> <widget class="QWidget" name="MesonProjectManager::Internal::GeneralSettingsWidget">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>

5
src/plugins/mesonprojectmanager/settings/tools/toolitemsettings.h
View File

@@ -29,13 +29,10 @@
#include "utils/optional.h" #include "utils/optional.h"
#include <QWidget> #include <QWidget>
namespace Ui {
class ToolItemSettings;
}
namespace MesonProjectManager { namespace MesonProjectManager {
namespace Internal { namespace Internal {
namespace Ui { class ToolItemSettings; }
class ToolTreeItem; class ToolTreeItem;
class ToolItemSettings : public QWidget class ToolItemSettings : public QWidget

4
src/plugins/mesonprojectmanager/settings/tools/toolitemsettings.ui
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>ToolItemSettings</class> <class>MesonProjectManager::Internal::ToolItemSettings</class>
<widget class="QWidget" name="ToolItemSettings"> <widget class="QWidget" name="MesonProjectManager::Internal::ToolItemSettings">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>

8
src/plugins/mesonprojectmanager/settings/tools/toolssettingswidget.h
View File

@@ -34,13 +34,11 @@
#include <QTabWidget> #include <QTabWidget>
#include <QWidget> #include <QWidget>
namespace Ui {
class ToolsSettingsWidget;
}
namespace MesonProjectManager { namespace MesonProjectManager {
namespace Internal { namespace Internal {
namespace Ui { class ToolsSettingsWidget; }
class ToolTreeItem; class ToolTreeItem;
class ToolsSettingsWidget final : public Core::IOptionsPageWidget class ToolsSettingsWidget final : public Core::IOptionsPageWidget
{ {

4
src/plugins/mesonprojectmanager/settings/tools/toolssettingswidget.ui
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>ToolsSettingsWidget</class> <class>MesonProjectManager::Internal::ToolsSettingsWidget</class>
<widget class="QWidget" name="MesonToolConfigWidget"> <widget class="QWidget" name="MesonProjectManager::Internal::ToolSettingsWidget">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>