diff options
| author | Miguel Costa <miguel.costa@qt.io> | 2022-04-07 14:06:44 +0200 |
|---|---|---|
| committer | Miguel Costa <miguel.costa@qt.io> | 2022-04-08 10:02:55 +0000 |
| commit | 148a8b9f68cc977916ff9693c9913494fa438b8e (patch) | |
| tree | 35fb9325177218fa63639df59987effaa6cf70ed | |
| parent | 16e9dfa6e93640aafa04d0c9e22a3ed5dd41db75 (diff) | |
Normalize QtVars property
Allows correct comparison of the current value with the backup, needed
to detect rebuild-triggering changes in Qt settings.
Change-Id: I61bf944079e8817da9425d5f769ec76da4b32020
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
| -rw-r--r-- | QtMSBuild/QtMsBuild/qt_private.props | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/QtMSBuild/QtMsBuild/qt_private.props b/QtMSBuild/QtMsBuild/qt_private.props index e5396a9d..30cc52c6 100644 --- a/QtMSBuild/QtMsBuild/qt_private.props +++ b/QtMSBuild/QtMsBuild/qt_private.props @@ -175,6 +175,27 @@ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////// + // Normalize QtVars (incl. backup) + // --> + <PropertyGroup> + <QtVars + Condition="'$(QtVars)' !=''" + >$(QtVars + .Replace(' ', '') + .Replace('%0a', '') + .Replace('%0d', '') + .Trim(';'))</QtVars> + <QtBkup_QtVars + Condition="'$(QtBkup_QtVars)' !=''" + >$(QtBkup_QtVars + .Replace(' ', '') + .Replace('%0a', '') + .Replace('%0d', '') + .Trim(';'))</QtBkup_QtVars> + </PropertyGroup> + + <!-- + ///////////////////////////////////////////////////////////////////////////////////////////////// // Default item metadata // --> <ItemDefinitionGroup> |