aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/projectexplorer/jsonwizard
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2019-06-19 15:31:07 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2019-06-19 13:38:07 +0000
commit77c90f0856ca69480c319db25f2bd969808ef74c (patch)
treef0862962e8e0e6c9a4fd95f59dbfd2c94c925a92 /src/plugins/projectexplorer/jsonwizard
parentc03c77b9c4ebe57f4e01121a246706e811fc2071 (diff)
Project wizards: Fix project node assertion
Change-Id: I864139747ee6b5e7cb1ac4d59d2b11219750ddde Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/projectexplorer/jsonwizard')
-rw-r--r--src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp9
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();