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

ProjectExplorer: Fix compilation with MSVC

Browse Source 
Amends 2758682723.

Change-Id: I005c6aa848cd15fef8b59e05681c6b49b1453202
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2019-11-19 15:21:54 +01:00
parent 9f21f59e68
commit e097323817
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp
View File

@@ -51,8 +51,8 @@
using namespace ProjectExplorer; using namespace ProjectExplorer;
using namespace CMakeProjectManager; namespace CMakeProjectManager {
using namespace CMakeProjectManager::Internal; namespace Internal {
namespace { namespace {
void copySourcePathToClipboard(Utils::optional<QString> srcPath, void copySourcePathToClipboard(Utils::optional<QString> srcPath,
@@ -283,3 +283,6 @@ void CMakeTargetNode::setTargetInformation(const QList<Utils::FilePath> &artifac
+ tmp.join("<br>"); + tmp.join("<br>");
} }
} }
} // Internal
} // CMakeBuildSystem

2
src/plugins/projectexplorer/buildsystem.h
View File

@@ -86,7 +86,7 @@ public:
const QList<BuildTargetInfo> applicationTargets() const; const QList<BuildTargetInfo> applicationTargets() const;
BuildTargetInfo buildTarget(const QString &buildKey) const; BuildTargetInfo buildTarget(const QString &buildKey) const;
class ParseGuard class PROJECTEXPLORER_EXPORT ParseGuard
{ {
friend class BuildSystem; friend class BuildSystem;
explicit ParseGuard(BuildSystem *p); explicit ParseGuard(BuildSystem *p);