diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-04-03 11:49:27 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-05-05 18:41:10 +0200 |
| commit | 52f3a7d9d40d3bf835bb0716ad201ee56731b980 (patch) | |
| tree | a736d2cca2516f2ad2003ff28b34e7a8ff483cf6 /qmake/generators/mac | |
| parent | ae7e701074be97130aa45f780e2456981850b432 (diff) | |
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>
Diffstat (limited to 'qmake/generators/mac')
| -rw-r--r-- | qmake/generators/mac/pbuilder_pbx.cpp | 2 | ||||
| -rw-r--r-- | qmake/generators/mac/pbuilder_pbx.h | 2 |
2 files changed, 1 insertions, 3 deletions
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); |