feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.6'

Browse Source 
Change-Id: I959428882b9da427c6bf522145646048141888c6
This commit is contained in:
Eike Ziller
2018-04-19 09:25:04 +02:00
parent 20e67865ea 717c7bfd9f
commit 7099f21586
11 changed files with 125 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/qmakeprojectmanager/qmakeproject.cpp
View File

@@ -562,7 +562,12 @@ void QmakeProject::asyncUpdate()
{
m_asyncUpdateTimer.setInterval(UPDATE_INTERVAL);
m_qmakeVfs->invalidateCache();
if (m_invalidateQmakeVfsContents) {
m_invalidateQmakeVfsContents = false;
m_qmakeVfs->invalidateContents();
} else {
m_qmakeVfs->invalidateCache();
}
Q_ASSERT(!m_asyncUpdateFutureInterface);
m_asyncUpdateFutureInterface = new QFutureInterface<void>();
@@ -588,7 +593,7 @@ void QmakeProject::asyncUpdate()
void QmakeProject::buildFinished(bool success)
{
if (success)
m_qmakeVfs->invalidateContents();
m_invalidateQmakeVfsContents = true;
}
bool QmakeProject::supportsKit(const Kit *k, QString *errorMessage) const
@@ -789,6 +794,7 @@ void QmakeProject::activeTargetWasChanged()
}
m_activeTarget = activeTarget();
m_invalidateQmakeVfsContents = true;
if (!m_activeTarget)
return;