diff --git a/src/plugins/ios/iosdeploystepwidget.h b/src/plugins/ios/iosdeploystepwidget.h index 38c91ab9b20..ad88e5f20de 100644 --- a/src/plugins/ios/iosdeploystepwidget.h +++ b/src/plugins/ios/iosdeploystepwidget.h @@ -27,12 +27,11 @@ #include -QT_BEGIN_NAMESPACE -namespace Ui { class IosDeployStepWidget; } -QT_END_NAMESPACE - namespace Ios { namespace Internal { + +namespace Ui { class IosDeployStepWidget; } + class IosDeployStep; class IosDeployStepWidget : public ProjectExplorer::BuildStepConfigWidget diff --git a/src/plugins/ios/iosdeploystepwidget.ui b/src/plugins/ios/iosdeploystepwidget.ui index 7b97b387b2d..58cb34bcc8c 100644 --- a/src/plugins/ios/iosdeploystepwidget.ui +++ b/src/plugins/ios/iosdeploystepwidget.ui @@ -1,6 +1,6 @@ - IosDeployStepWidget + Ios::Internal::IosDeployStepWidget diff --git a/src/plugins/ios/iossettingswidget.cpp b/src/plugins/ios/iossettingswidget.cpp index 60798cf28e4..2d19582d8a3 100644 --- a/src/plugins/ios/iossettingswidget.cpp +++ b/src/plugins/ios/iossettingswidget.cpp @@ -50,7 +50,7 @@ namespace Internal { IosSettingsWidget::IosSettingsWidget(QWidget *parent) : QWidget(parent), - m_ui(new Ui_IosSettingsWidget), + m_ui(new Ui::IosSettingsWidget), m_saveSettingsRequested(false) { initGui(); diff --git a/src/plugins/ios/iossettingswidget.h b/src/plugins/ios/iossettingswidget.h index fbd1101397c..2fa828489be 100644 --- a/src/plugins/ios/iossettingswidget.h +++ b/src/plugins/ios/iossettingswidget.h @@ -32,13 +32,11 @@ #include #include -QT_BEGIN_NAMESPACE -class Ui_IosSettingsWidget; -QT_END_NAMESPACE - namespace Ios { namespace Internal { +namespace Ui { class IosSettingsWidget; } + class IosSettingsWidget : public QWidget { Q_OBJECT @@ -52,7 +50,7 @@ public: private: void initGui(); - Ui_IosSettingsWidget *m_ui; + Ui::IosSettingsWidget *m_ui; bool m_saveSettingsRequested; }; diff --git a/src/plugins/ios/iossettingswidget.ui b/src/plugins/ios/iossettingswidget.ui index 8ead1af7c58..f1ae1525ac8 100644 --- a/src/plugins/ios/iossettingswidget.ui +++ b/src/plugins/ios/iossettingswidget.ui @@ -1,6 +1,6 @@ - IosSettingsWidget + Ios::Internal::IosSettingsWidget