From aa30f49d6a38c77693ecf58ea9cbd13470e5fe9c Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 27 Nov 2014 15:02:50 +0100 Subject: prune pointless assignments of QString::replace() and remove() results they operate in-place. Change-Id: Iab6f2f6a9f6f67b9d70feb77ec719e424909022d Reviewed-by: Joerg Bornemann --- qmake/generators/unix/unixmake.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'qmake/generators/unix/unixmake.cpp') diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp index de1950f081f..5aa3a577cd9 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -194,13 +194,11 @@ UnixMakefileGenerator::init() pchBaseName += project->first("QMAKE_ORIG_TARGET").toQString(); // replace place holders - pchFlags = pchFlags.replace("${QMAKE_PCH_INPUT}", - project->first("PRECOMPILED_HEADER").toQString()); - pchFlags = pchFlags.replace("${QMAKE_PCH_OUTPUT_BASE}", pchBaseName); + pchFlags.replace("${QMAKE_PCH_INPUT}", project->first("PRECOMPILED_HEADER").toQString()); + pchFlags.replace("${QMAKE_PCH_OUTPUT_BASE}", pchBaseName); if (project->isActiveConfig("icc_pch_style")) { // icc style - pchFlags = pchFlags.replace("${QMAKE_PCH_OUTPUT}", - pchBaseName + project->first("QMAKE_PCH_OUTPUT_EXT")); + pchFlags.replace("${QMAKE_PCH_OUTPUT}", pchBaseName + project->first("QMAKE_PCH_OUTPUT_EXT")); } else { // gcc style (including clang_pch_style) QString headerSuffix; @@ -224,8 +222,7 @@ UnixMakefileGenerator::init() } if(!pchOutputFile.isEmpty()) { - pchFlags = pchFlags.replace("${QMAKE_PCH_OUTPUT}", - pchBaseName + pchOutputFile + headerSuffix); + pchFlags.replace("${QMAKE_PCH_OUTPUT}", pchBaseName + pchOutputFile + headerSuffix); } } -- cgit v1.2.3