aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiguel Costa <miguel.costa@qt.io>2019-12-19 15:01:14 +0100
committerMiguel Costa <miguel.costa@qt.io>2020-01-06 08:53:35 +0000
commit6cbf19ba027e7c5d7539ca32f35ac2a6bfdc8556 (patch)
tree293f39cec9678699804c987d4de07efb35307845
parente2396892c5494b05e2d2c76bd41423c989357acc (diff)
Fix incremental build
Incremental build stopped working properly after adding the qmake config type (debug or release) as a project property. This was due to the property value not being written in the Qt vars. backup (which controls incremental build with respect to changes in Qt build settings). Change-Id: I4c7929c68f47b1d01b22e4d62458cbebb1ea423b Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
-rw-r--r--src/qtmsbuild/qt_vars.targets2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qtmsbuild/qt_vars.targets b/src/qtmsbuild/qt_vars.targets
index 07306bf1..ffcc5c55 100644
--- a/src/qtmsbuild/qt_vars.targets
+++ b/src/qtmsbuild/qt_vars.targets
@@ -260,6 +260,7 @@
<QtLibrarySearchPath Include="$(QtLibrarySearchPath)"/>
<QtVariables Include="$(QtVars)"/>
<QMakeCodeLines Include="$(QMakeCodeLines)"/>
+ <QtBuildConfig Include="$(QtBuildConfig)"/>
</ItemGroup>
<!--// Write end of .props (XML) file
@@ -359,6 +360,7 @@
<QtLibrarySearchPath Remove="@(QtLibrarySearchPath)"/>
<QtVariables Remove="@(QtVariables)"/>
<QMakeCodeLines Remove="@(QMakeCodeLines)"/>
+ <QtBuildConfig Remove="@(QtBuildConfig)"/>
<QtVarDef Remove="@(QtVarDef)"/>
<QtVar Remove="@(QtVar)"/>
</ItemGroup>