From 52f3a7d9d40d3bf835bb0716ad201ee56731b980 Mon Sep 17 00:00:00 2001 From: Lars Knoll 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 --- qmake/generators/mac/pbuilder_pbx.cpp | 2 +- qmake/generators/mac/pbuilder_pbx.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'qmake/generators/mac') diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp index c2f6df7787..ec0a044361 100644 --- a/qmake/generators/mac/pbuilder_pbx.cpp +++ b/qmake/generators/mac/pbuilder_pbx.cpp @@ -644,7 +644,7 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t) bool isObj = project->values(ProKey(*it + ".CONFIG")).indexOf("no_link") == -1; if (!isObj) { for (int i = 0; i < sources.size(); ++i) { - if (sources.at(i).keyName() == inputs.at(input)) { + if (sources.at(i).keyName() == inputs.at(input).toQStringView()) { duplicate = true; break; } diff --git a/qmake/generators/mac/pbuilder_pbx.h b/qmake/generators/mac/pbuilder_pbx.h index 1b90a3bbeb..9b85764caa 100644 --- a/qmake/generators/mac/pbuilder_pbx.h +++ b/qmake/generators/mac/pbuilder_pbx.h @@ -56,8 +56,6 @@ class ProjectBuilderMakefileGenerator : public UnixMakefileGenerator enum { SettingsAsList=0x01, SettingsNoQuote=0x02 }; inline QString writeSettings(const QString &var, const char *val, int flags=0, int indent_level=0) { return writeSettings(var, ProString(val), flags, indent_level); } - inline QString writeSettings(const QString &var, const QString &val, int flags=0, int indent_level=0) - { return writeSettings(var, ProString(val), flags, indent_level); } inline QString writeSettings(const QString &var, const ProString &val, int flags=0, int indent_level=0) { return writeSettings(var, ProStringList(val), flags, indent_level); } QString writeSettings(const QString &var, const ProStringList &vals, int flags=0, int indent_level=0); -- cgit v1.2.3