From 52f3a7d9d40d3bf835bb0716ad201ee56731b980 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@qt.io>
Date: Fri, 3 Apr 2020 11:49:27 +0200
Subject: Build qmake with QT_USE_STRINGBUILDER

Should improve performance and is going to be required in
the future anyway.

Change-Id: I89d7c50441d2491da1ab0a4d564dcc91f52ade85
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
---
 qmake/generators/makefile.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'qmake/generators/makefile.cpp')

diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index 5c61a3c65c..9d2d240bc2 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -2273,7 +2273,7 @@ QString MakefileGenerator::fullBuildArgs()
 
     //output
     QString ofile = fileFixify(Option::output.fileName());
-    if(!ofile.isEmpty() && ofile != project->first("QMAKE_MAKEFILE"))
+    if (!ofile.isEmpty() && ofile != project->first("QMAKE_MAKEFILE").toQStringView())
         ret += " -o " + escapeFilePath(ofile);
 
     //inputs
@@ -2515,7 +2515,7 @@ MakefileGenerator::writeSubTargets(QTextStream &t, QList<MakefileGenerator::SubT
         if(!abs_source_path.isEmpty() && out_directory.startsWith(abs_source_path))
             out_directory = Option::output_dir + out_directory.mid(abs_source_path.length());
 
-        QString out_directory_cdin = out_directory.isEmpty() ? "\n\t"
+        QString out_directory_cdin = out_directory.isEmpty() ? QString("\n\t")
                                                              : "\n\tcd " + escapeFilePath(out_directory) + " && ";
         QString makefilein = " -f " + escapeFilePath(subtarget->makefile);
 
@@ -2696,7 +2696,7 @@ MakefileGenerator::writeSubTargets(QTextStream &t, QList<MakefileGenerator::SubT
                 if(!recurse.contains(subtarget->name))
                     continue;
 
-                QString out_directory_cdin = out_directory.isEmpty() ? "\n\t"
+                QString out_directory_cdin = out_directory.isEmpty() ? QString("\n\t")
                                                                      : "\n\tcd " + escapeFilePath(out_directory) + " && ";
                 QString makefilein = " -f " + escapeFilePath(subtarget->makefile);
 
-- 
cgit v1.2.3