From b4049ada7f1d357054c3f5ada44d94ec55a0ad20 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Thu, 16 Mar 2017 15:03:19 +0100 Subject: [PATCH] Qmake: Fix possible SOFT_ASSERT in qmake desktop RC Change-Id: I48d6a2cab8c27e9082c33361977dca86e606e141 Reviewed-by: Ulf Hermann --- .../qmakeprojectmanager/desktopqmakerunconfiguration.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp b/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp index 65b060572b9..88c6b3f78a2 100644 --- a/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp +++ b/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp @@ -442,7 +442,8 @@ QmakeProFileNode *DesktopQmakeRunConfiguration::projectNode() const QmakeProject *project = qmakeProject(); QTC_ASSERT(project, return nullptr); QmakeProFileNode *rootNode = project->rootProjectNode(); - QTC_ASSERT(rootNode, return nullptr); + if (!rootNode) + return nullptr; return rootNode->findProFileFor(m_proFilePath); }