aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/valgrind/memcheckerrorview.cpp
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@digia.com>2014-05-02 10:00:20 +0200
committerEike Ziller <eike.ziller@digia.com>2014-05-02 10:00:20 +0200
commit0fb641c90e64054a28a39e3f48d96f953399805a (patch)
tree504f097db01334a87316f8e825f1db0cba6bfba1 /src/plugins/valgrind/memcheckerrorview.cpp
parentf4520bafaccb0832266f8d88f254e910ed7a23f4 (diff)
parent4b2cc015f867941a7ae35a38d81ec9daa5616711 (diff)
Merge remote-tracking branch 'origin/3.1'
Conflicts: qtcreator.pri qtcreator.qbs src/libs/qmljs/qmljsmodelmanagerinterface.cpp src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp Change-Id: Ie216b715d6f87a6d72d3b8fe3d4e777e561579f9
Diffstat (limited to 'src/plugins/valgrind/memcheckerrorview.cpp')
-rw-r--r--src/plugins/valgrind/memcheckerrorview.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/valgrind/memcheckerrorview.cpp b/src/plugins/valgrind/memcheckerrorview.cpp
index db305eaea3..6f3318b1a6 100644
--- a/src/plugins/valgrind/memcheckerrorview.cpp
+++ b/src/plugins/valgrind/memcheckerrorview.cpp
@@ -198,6 +198,8 @@ static QString relativeToPath()
static QString errorLocation(const QModelIndex &index, const Error &error,
bool link = false, const QString &linkAttr = QString())
{
+ if (!index.isValid())
+ return QString();
const ErrorListModel *model = 0;
const QAbstractProxyModel *proxy = qobject_cast<const QAbstractProxyModel *>(index.model());
while (!model && proxy) {