diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-04 01:00:59 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-02-04 10:44:00 +0100 |
| commit | 97417e8f2896bfbe1d9e9a703ddba980983d1442 (patch) | |
| tree | ecee79f9b126bc695904e74000c0775d1ef34646 /qmake | |
| parent | 02eb9df851093f11872c828869226903c81f1b60 (diff) | |
| parent | 056230cc9c3309823a93df0e34c92affb29df9e4 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
.qmake.conf
examples/widgets/widgets/imageviewer/imageviewer.cpp
src/corelib/text/qchar.cpp
src/corelib/time/qdatetime.cpp
Change-Id: I9762f5c4ff650799219729d6aee79ac07ce9024a
Diffstat (limited to 'qmake')
| -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) |