From 3ccc079cd3f30d4d65c34d6af285c357f09ebc58 Mon Sep 17 00:00:00 2001
From: dt <qtc-committer@nokia.com>
Date: Wed, 11 Aug 2010 14:49:42 +0200
Subject: [PATCH] Compile on Windows
Some windows header have a define for DeleteFile.
---
src/plugins/projectexplorer/projectnodes.h | 3 ++-
src/plugins/qt4projectmanager/qt4nodes.cpp | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/plugins/projectexplorer/projectnodes.h b/src/plugins/projectexplorer/projectnodes.h
index 63ecd5ae7e6..f8de9aeea0b 100644
--- a/src/plugins/projectexplorer/projectnodes.h
+++ b/src/plugins/projectexplorer/projectnodes.h
@@ -161,7 +161,8 @@ public:
RemoveSubProject,
AddFile,
RemoveFile,
- DeleteFile,
+ // DeleteFile is a define on windows...
+ EraseFile,
Rename
};
diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp
index 493ff7699c2..d998eb21ac9 100644
--- a/src/plugins/qt4projectmanager/qt4nodes.cpp
+++ b/src/plugins/qt4projectmanager/qt4nodes.cpp
@@ -696,7 +696,7 @@ QList<ProjectNode::ProjectAction> Qt4PriFileNode::supportedActions(Node *node) c
case LibraryTemplate:
actions << AddFile;
if (m_recursiveEnumerateFiles.contains(node->path()))
- actions << DeleteFile;
+ actions << EraseFile;
else
actions << RemoveFile;
break;
--
GitLab