diff options
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/doc/src/qmake-manual.qdoc | 4 | ||||
| -rw-r--r-- | qmake/generators/win32/msbuild_objectmodel.cpp | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/qmake/doc/src/qmake-manual.qdoc b/qmake/doc/src/qmake-manual.qdoc index 3a1d79cb79..4c71ceb929 100644 --- a/qmake/doc/src/qmake-manual.qdoc +++ b/qmake/doc/src/qmake-manual.qdoc @@ -917,7 +917,7 @@ Specifies project configuration and compiler options. The values are recognized internally by qmake and have special meaning. - The following \c CONFIG values control compilation flags: + The following \c CONFIG values control compiler and linker flags: \table \header \li Option \li Description @@ -948,6 +948,8 @@ \row \li warn_off \li The compiler should output as few warnings as possible. \row \li exceptions \li Exception support is enabled. Set by default. \row \li exceptions_off \li Exception support is disabled. + \row \li ltcg \li Link time code generation is enabled. + This option is off by default. \row \li rtti \li RTTI support is enabled. By default, the compiler default is used. \row \li rtti_off \li RTTI support is disabled. By default, the compiler 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) |