diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2019-06-13 11:43:12 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@qt.io> | 2019-06-13 11:48:58 +0000 |
| commit | 66dc83139821a978cf889ffb3a33a3f0fb11e6b0 (patch) | |
| tree | 6793c9c27cb8468136ce31ec9711222e3f10ee4c | |
| parent | f3ea8e34de6d6a8e175aee51de16c16074f8107c (diff) | |
| download | qt-creator-66dc83139821a978cf889ffb3a33a3f0fb11e6b0.tar.gz | |
CMake: Do not QTC_ASSERT when Qml support is disabled
Change-Id: Ifb84aeb252053e1e6d856650d6ec54c27d589fa0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| -rw-r--r-- | src/plugins/cmakeprojectmanager/cmakeproject.cpp | 3 |
1 files changed, 1 insertions, 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 = |