diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-07-18 07:30:29 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-07-18 07:30:29 +0200 |
| commit | f689f86be5443f1381c741f957e9f0b713994907 (patch) | |
| tree | c34366d37dfc60a820b13ffccd5b0fcf6ce3d430 /src/plugins/projectexplorer/projectmodels.cpp | |
| parent | 36566a50159fcfcef19937495303f67c675ccb0a (diff) | |
| parent | 3ae169f8ac3c4176e57399ae13f02fb778ced4ad (diff) | |
| download | qt-creator-f689f86be5443f1381c741f957e9f0b713994907.tar.gz | |
Merge remote-tracking branch 'origin/4.10'
Change-Id: I1193e94353c14492a9e7f093fbcd3fa53f83e390
Diffstat (limited to 'src/plugins/projectexplorer/projectmodels.cpp')
| -rw-r--r-- | src/plugins/projectexplorer/projectmodels.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/projectexplorer/projectmodels.cpp b/src/plugins/projectexplorer/projectmodels.cpp index 08010bb50b..ca8c7115f4 100644 --- a/src/plugins/projectexplorer/projectmodels.cpp +++ b/src/plugins/projectexplorer/projectmodels.cpp @@ -148,7 +148,9 @@ QVariant FlatModel::data(const QModelIndex &index, int role) const static QIcon warnIcon = Utils::Icons::WARNING.icon(); static QIcon emptyIcon = Utils::Icons::EMPTY16.icon(); if (project) { - if (project->isParsing()) + if (project->needsConfiguration()) + result = warnIcon; + else if (project->isParsing()) result = emptyIcon; else if (!project->activeTarget() || !project->projectIssues(project->activeTarget()->kit()).isEmpty()) @@ -180,7 +182,7 @@ QVariant FlatModel::data(const QModelIndex &index, int role) const break; } case Project::isParsingRole: { - result = project ? project->isParsing() : false; + result = project ? project->isParsing() && !project->needsConfiguration() : false; break; } } |