Merge remote-tracking branch 'origin/master' into wip/clangwip/clang

Change-Id: I8a2c8068a3f2b15034fb1bf6304c9a0f3f0e3c8f

1 files changed, 5 insertions, 1 deletions

diff --git a/src/plugins/qmlprojectmanager/qmlprojectnodes.cpp b/src/plugins/qmlprojectmanager/qmlprojectnodes.cpp
index bbf8165091..d35faf01b9 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectnodes.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectnodes.cpp
@@ -176,7 +176,11 @@ QList<ProjectExplorer::ProjectNode::ProjectAction> QmlProjectNode::supportedActi
     QList<ProjectAction> actions;
     actions.append(AddNewFile);
     actions.append(EraseFile);
-    actions.append(Rename);
+    if (node->nodeType() == ProjectExplorer::FileNodeType) {
+        ProjectExplorer::FileNode *fileNode = static_cast<ProjectExplorer::FileNode *>(node);
+        if (fileNode->fileType() != ProjectExplorer::ProjectFileType)
+            actions.append(Rename);
+    }
     return actions;
 }