From 1f8ced2d6df024ba007f9bb25e12bf4e23aee2db Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Tue, 28 Jan 2020 13:22:44 +0100 Subject: 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 --- qmake/generators/win32/msbuild_objectmodel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qmake') 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) -- cgit v1.2.3