Compile on Windows

Some windows header have a define for DeleteFile.
2010-08-11 14:49:42 +02:00
parent 495c3f52fa
commit 3ccc079cd3
2 changed files with 3 additions and 2 deletions
--- 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
    };

--- 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;