From a981df3bf641b691293c14ca7ff35a2d8457c721 Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 31 Aug 2020 07:42:27 +0200 Subject: [PATCH] More namespaced Qt Amends b41ea232332dd8d95140169e557aa8ad51770245. Missed that because the file is gone in master. Task-number: QTCREATORBUG-24544 Change-Id: I7e5948d564c370f9ed197d999778151f2fe61b38 Reviewed-by: Christian Stenger --- .../project/buildoptions/mesonbuildstepconfigwidget.h | 6 +++--- .../project/buildoptions/mesonbuildstepconfigwidget.ui | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/plugins/mesonprojectmanager/project/buildoptions/mesonbuildstepconfigwidget.h b/src/plugins/mesonprojectmanager/project/buildoptions/mesonbuildstepconfigwidget.h index b0cc6fb9d83..a479d108ca8 100644 --- a/src/plugins/mesonprojectmanager/project/buildoptions/mesonbuildstepconfigwidget.h +++ b/src/plugins/mesonprojectmanager/project/buildoptions/mesonbuildstepconfigwidget.h @@ -28,11 +28,11 @@ #include #include -namespace Ui { -class MesonBuildStepConfigWidget; -} namespace MesonProjectManager { namespace Internal { + +namespace Ui { class MesonBuildStepConfigWidget; } + class MesonBuildStepConfigWidget final : public ProjectExplorer::BuildStepConfigWidget { Q_DECLARE_TR_FUNCTIONS(MesonProjectManager::Internal::MesonBuildStepConfigWidget) diff --git a/src/plugins/mesonprojectmanager/project/buildoptions/mesonbuildstepconfigwidget.ui b/src/plugins/mesonprojectmanager/project/buildoptions/mesonbuildstepconfigwidget.ui index 1212227fb76..84f2e8171a3 100644 --- a/src/plugins/mesonprojectmanager/project/buildoptions/mesonbuildstepconfigwidget.ui +++ b/src/plugins/mesonprojectmanager/project/buildoptions/mesonbuildstepconfigwidget.ui @@ -1,7 +1,7 @@ - MesonBuildStepConfigWidget - + MesonProjectManager::Internal::MesonBuildStepConfigWidget + 0