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

Merge remote-tracking branch 'origin/4.5' into 4.6

Browse Source 
Change-Id: I9277a92341ede8292978f2684eadcade04689983
This commit is contained in:
Eike Ziller
2018-01-15 09:49:21 +01:00
parent 389819f133 c0aaba0868
commit 0af3a2d29a
2 changed files with 7828 additions and 4650 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12471
share/qtcreator/translations/qtcreator_de.ts
View File

File diff suppressed because it is too large Load Diff

7
src/plugins/qbsprojectmanager/qbsproject.cpp
View File

@@ -140,7 +140,7 @@ QbsProject::QbsProject(const FileName &fileName) :
connect(this, &Project::removedTarget, connect(this, &Project::removedTarget,
this, [this](Target *t) {m_qbsProjects.remove(t); }); this, [this](Target *t) {m_qbsProjects.remove(t); });
auto delayedParsing = [this]() { auto delayedParsing = [this]() {
if (static_cast<BuildConfiguration *>(sender())->isActive()) if (static_cast<ProjectConfiguration *>(sender())->isActive())
delayParsing(); delayParsing();
}; };
subscribeSignal(&BuildConfiguration::environmentChanged, this, delayedParsing); subscribeSignal(&BuildConfiguration::environmentChanged, this, delayedParsing);
@@ -529,8 +529,11 @@ void QbsProject::handleRuleExecutionDone()
void QbsProject::changeActiveTarget(Target *t) void QbsProject::changeActiveTarget(Target *t)
{ {
if (t) if (t) {
m_qbsProject = m_qbsProjects.value(t); m_qbsProject = m_qbsProjects.value(t);
if (t->isActive())
delayParsing();
}
} }
void QbsProject::startParsing() void QbsProject::startParsing()