diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-01-28 13:22:44 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-01-30 11:56:09 +0000 |
| commit | 1f8ced2d6df024ba007f9bb25e12bf4e23aee2db (patch) | |
| tree | 69ba007162a5d019bd63f3aef078e11e0a518716 | |
| parent | 5399f9443e30f7ca849b8096dbe9ee8c88a35c74 (diff) | |
| download | qtbase-1f8ced2d6df024ba007f9bb25e12bf4e23aee2db.tar.gz | |
Fix line ending in custom build steps of vcxproj files
We must use Windows line endings in .vcxproj files to separate command
lines of custom build steps.
This amends commit f65cfadd.
Fixes: QTBUG-81553
Change-Id: I8d257f3846af7006df7f8d462b8f44efdce6a1fd
Reviewed-by: Miguel Costa <miguel.costa@qt.io>
| -rw-r--r-- | qmake/generators/win32/msbuild_objectmodel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/win32/msbuild_objectmodel.cpp b/qmake/generators/win32/msbuild_objectmodel.cpp index 0515c7404f..355260c974 100644 --- a/qmake/generators/win32/msbuild_objectmodel.cpp +++ b/qmake/generators/win32/msbuild_objectmodel.cpp @@ -310,7 +310,7 @@ static QString commandLinesForOutput(QStringList commands) if (!commands.at(i).startsWith("rem", Qt::CaseInsensitive)) commands.insert(i + 1, errchk); } - return commands.join('\n'); + return commands.join("\r\n"); } static QString unquote(const QString &value) |