From e097323817b5884487dda6c92be8408f8b38d033 Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 19 Nov 2019 15:21:54 +0100 Subject: [PATCH] ProjectExplorer: Fix compilation with MSVC Amends 27586827238ca9079860e. Change-Id: I005c6aa848cd15fef8b59e05681c6b49b1453202 Reviewed-by: Christian Stenger --- src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp | 7 +++++-- src/plugins/projectexplorer/buildsystem.h | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp index 46c50104ed9..e4f6d3bf5e7 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp @@ -51,8 +51,8 @@ using namespace ProjectExplorer; -using namespace CMakeProjectManager; -using namespace CMakeProjectManager::Internal; +namespace CMakeProjectManager { +namespace Internal { namespace { void copySourcePathToClipboard(Utils::optional srcPath, @@ -283,3 +283,6 @@ void CMakeTargetNode::setTargetInformation(const QList &artifac + tmp.join("
"); } } + +} // Internal +} // CMakeBuildSystem diff --git a/src/plugins/projectexplorer/buildsystem.h b/src/plugins/projectexplorer/buildsystem.h index b73b459b7b1..96d37ec619d 100644 --- a/src/plugins/projectexplorer/buildsystem.h +++ b/src/plugins/projectexplorer/buildsystem.h @@ -86,7 +86,7 @@ public: const QList applicationTargets() const; BuildTargetInfo buildTarget(const QString &buildKey) const; - class ParseGuard + class PROJECTEXPLORER_EXPORT ParseGuard { friend class BuildSystem; explicit ParseGuard(BuildSystem *p);