diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-12-05 10:44:37 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-12-16 11:23:47 +0100 |
commit | deeaa500ad8c591b3142eb53a57e79b6b4ae1ca6 (patch) | |
tree | ee0856577debcf24d4fbc333aa6145a898128c43 /qmake | |
parent | d6266c757d2f2ea4ff1e71dc8545f9bf97aa3bb1 (diff) |
Mark the old style unprefixed stream functions deprecated
Requires a third definition for the source-compatible but deprecated
version.
Change-Id: I260ae79f4547f99eed701b10e0b25222f81cd5ff
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'qmake')
-rw-r--r-- | qmake/generators/unix/unixmake2.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp index 550fa9d834..4a6a42c7d2 100644 --- a/qmake/generators/unix/unixmake2.cpp +++ b/qmake/generators/unix/unixmake2.cpp @@ -1542,14 +1542,14 @@ std::pair<bool, QString> UnixMakefileGenerator::writeObjectsPart(QTextStream &t, t << "\\\n\t\t" << (*objit); } if (incrs_out.count() == objs.count()) { //we just switched places, no real incrementals to be done! - t << escapeFilePaths(incrs_out).join(QString(" \\\n\t\t")) << endl; + t << escapeFilePaths(incrs_out).join(QString(" \\\n\t\t")) << Qt::endl; } else if (!incrs_out.count()) { - t << endl; + t << Qt::endl; } else { src_incremental = true; - t << endl; + t << Qt::endl; t << "INCREMENTAL_OBJECTS = " - << escapeFilePaths(incrs_out).join(QString(" \\\n\t\t")) << endl; + << escapeFilePaths(incrs_out).join(QString(" \\\n\t\t")) << Qt::endl; } } else { const ProString &objMax = project->first("QMAKE_LINK_OBJECT_MAX"); @@ -1566,7 +1566,7 @@ std::pair<bool, QString> UnixMakefileGenerator::writeObjectsPart(QTextStream &t, createResponseFile(ld_response_file, objs); objectsLinkLine = "@" + escapeFilePath(ld_response_file); } - t << "OBJECTS = " << valList(escapeDependencyPaths(objs)) << endl; + t << "OBJECTS = " << valList(escapeDependencyPaths(objs)) << Qt::endl; } return std::make_pair(src_incremental, objectsLinkLine); } |