From 66dc83139821a978cf889ffb3a33a3f0fb11e6b0 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Thu, 13 Jun 2019 11:43:12 +0200 Subject: CMake: Do not QTC_ASSERT when Qml support is disabled Change-Id: Ifb84aeb252053e1e6d856650d6ec54c27d589fa0 Reviewed-by: Eike Ziller --- src/plugins/cmakeprojectmanager/cmakeproject.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp index ec8e0d076d..a9d4d76b96 100644 --- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp @@ -311,9 +311,8 @@ void CMakeProject::updateProjectData(CMakeBuildConfiguration *bc) void CMakeProject::updateQmlJSCodeModel() { QmlJS::ModelManagerInterface *modelManager = QmlJS::ModelManagerInterface::instance(); - QTC_ASSERT(modelManager, return); - if (!activeTarget() || !activeTarget()->activeBuildConfiguration()) + if (!modelManager || !activeTarget() || !activeTarget()->activeBuildConfiguration()) return; QmlJS::ModelManagerInterface::ProjectInfo projectInfo = -- cgit v1.2.3