diff options
| author | Robert Loehning <robert.loehning@theqtcompany.com> | 2015-05-19 11:22:36 +0200 |
|---|---|---|
| committer | Robert Loehning <robert.loehning@theqtcompany.com> | 2015-05-19 11:22:36 +0200 |
| commit | 8df59beb6a99fdc30d76cc0aa72b2d91441b3d77 (patch) | |
| tree | 5905c76083522ed909aad666587f2347a34eab77 /plugins/autotest/testtreemodel.cpp | |
| parent | bbc656f3d37da9bb4bfe74a57c8e17b035fbd0ec (diff) | |
| parent | c5fad3756006429026165a345b9eadcd4b5425df (diff) | |
| download | qt-creator-8df59beb6a99fdc30d76cc0aa72b2d91441b3d77.tar.gz | |
Merge branch '3.4' into wip/squish
Change-Id: Iee6bcc93f49d504d9ea531038c669f4f59d3feba
Diffstat (limited to 'plugins/autotest/testtreemodel.cpp')
| -rw-r--r-- | plugins/autotest/testtreemodel.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/autotest/testtreemodel.cpp b/plugins/autotest/testtreemodel.cpp index 823508c036..1e40493c02 100644 --- a/plugins/autotest/testtreemodel.cpp +++ b/plugins/autotest/testtreemodel.cpp @@ -663,7 +663,8 @@ QList<TestConfiguration *> TestTreeModel::getSelectedTests() const QString TestTreeModel::getMainFileForUnnamedQuickTest(const QString &qmlFile) const { const TestTreeItem *unnamed = unnamedQuickTests(); - for (int row = 0, count = unnamed->childCount(); row < count; ++row) { + const int count = unnamed ? unnamed->childCount() : 0; + for (int row = 0; row < count; ++row) { const TestTreeItem *child = unnamed->child(row); if (qmlFile == child->filePath()) return child->mainFile(); |