From 6688b6144e9aae1d37bfc96dd38aaa989b522472 Mon Sep 17 00:00:00 2001
From: Christian Kamm <christian.d.kamm@nokia.com>
Date: Thu, 14 Oct 2010 14:58:57 +0200
Subject: [PATCH] QmlDump: Do not use an assert on something that can regularly
fail.
Reviewed-by: Kai Koehne
---
src/plugins/qt4projectmanager/qmldumptool.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/plugins/qt4projectmanager/qmldumptool.cpp b/src/plugins/qt4projectmanager/qmldumptool.cpp
index 7ca17122823..442598850f9 100644
--- a/src/plugins/qt4projectmanager/qmldumptool.cpp
+++ b/src/plugins/qt4projectmanager/qmldumptool.cpp
@@ -161,7 +161,8 @@ static QtVersion *qtVersionForProject(ProjectExplorer::Project *project)
if (project && project->id() == QLatin1String("QmlProjectManager.QmlProject")) {
// We cannot access the QmlProject interfaces here, therefore use the metatype system
- QTC_ASSERT(project->activeTarget() && project->activeTarget()->activeRunConfiguration(), return 0);
+ if (!project->activeTarget() || !project->activeTarget()->activeRunConfiguration())
+ return 0;
QVariant variant = project->activeTarget()->activeRunConfiguration()->property("qtVersionId");
QTC_ASSERT(variant.isValid() && variant.canConvert(QVariant::Int), return 0);
QtVersion *version = QtVersionManager::instance()->version(variant.toInt());
--
GitLab