Merge remote-tracking branch 'origin/4.10'

 Conflicts:
	src/libs/utils/consoleprocess.h

Change-Id: I771630cb4dc60a9e87e9d30d6295040c27348d8c

1 files changed, 7 insertions, 2 deletions

diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp
index a1d9c7d6f0..7141148ef8 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp
+++ b/src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp
@@ -499,8 +499,13 @@ void JsonWizard::openProjectForNode(Node *node)
 {
     using namespace Utils;
 
-    ProjectNode *projNode = node->asProjectNode() ? node->asProjectNode() : node->parentProjectNode();
-
+    const ProjectNode *projNode = node->asProjectNode();
+    if (!projNode) {
+        if (ContainerNode * const cn = node->asContainerNode())
+            projNode = cn->rootProjectNode();
+        else
+            projNode = node->parentProjectNode();
+    }
     QTC_ASSERT(projNode, return);
 
     Utils::optional<FilePath> projFilePath = projNode->visibleAfterAddFileAction();