AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qmake: use QString::replace() overloaded with QLatin1String

Browse Source 
instead of QStringLiteral, QString, const char*.

Results: reduce .rodata, prevent re-creation of QString.

Change-Id: Ie2e3089974c42e6733457bbe58521bccd1da3a53
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
Anton Kudryavtsev 2016-02-04 17:12:03 +03:00
parent 4a251da5bb
commit 4748acbf1e
12 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
qmake/generators/mac/pbuilder_pbx.cpp
View File

@ -1494,21 +1494,21 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t)
if (plist_in_file.open(QIODevice::ReadOnly)) { if (plist_in_file.open(QIODevice::ReadOnly)) {
QTextStream plist_in(&plist_in_file); QTextStream plist_in(&plist_in_file);
QString plist_in_text = plist_in.readAll(); QString plist_in_text = plist_in.readAll();
plist_in_text.replace("@ICON@", plist_in_text.replace(QLatin1String("@ICON@"),
(project->isEmpty("ICON") ? QString("") : project->first("ICON").toQString().section(Option::dir_sep, -1))); (project->isEmpty("ICON") ? QString("") : project->first("ICON").toQString().section(Option::dir_sep, -1)));
if (project->first("TEMPLATE") == "app") { if (project->first("TEMPLATE") == "app") {
plist_in_text.replace("@EXECUTABLE@", project->first("QMAKE_ORIG_TARGET").toQString()); plist_in_text.replace(QLatin1String("@EXECUTABLE@"), project->first("QMAKE_ORIG_TARGET").toQString());
} else { } else {
plist_in_text.replace("@LIBRARY@", project->first("QMAKE_ORIG_TARGET").toQString()); plist_in_text.replace(QLatin1String("@LIBRARY@"), project->first("QMAKE_ORIG_TARGET").toQString());
} }
QString bundlePrefix = project->first("QMAKE_TARGET_BUNDLE_PREFIX").toQString(); QString bundlePrefix = project->first("QMAKE_TARGET_BUNDLE_PREFIX").toQString();
if (bundlePrefix.isEmpty()) if (bundlePrefix.isEmpty())
bundlePrefix = "com.yourcompany"; bundlePrefix = "com.yourcompany";
plist_in_text.replace("@BUNDLEIDENTIFIER@", bundlePrefix + '.' + QLatin1String("${PRODUCT_NAME:rfc1034identifier}")); plist_in_text.replace(QLatin1String("@BUNDLEIDENTIFIER@"), bundlePrefix + '.' + QLatin1String("${PRODUCT_NAME:rfc1034identifier}"));
if (!project->values("VERSION").isEmpty()) { if (!project->values("VERSION").isEmpty()) {
plist_in_text.replace("@SHORT_VERSION@", project->first("VER_MAJ") + "." + project->first("VER_MIN")); plist_in_text.replace(QLatin1String("@SHORT_VERSION@"), project->first("VER_MAJ") + "." + project->first("VER_MIN"));
} }
plist_in_text.replace("@TYPEINFO@", plist_in_text.replace(QLatin1String("@TYPEINFO@"),
(project->isEmpty("QMAKE_PKGINFO_TYPEINFO") (project->isEmpty("QMAKE_PKGINFO_TYPEINFO")
? QString::fromLatin1("????") : project->first("QMAKE_PKGINFO_TYPEINFO").left(4).toQString())); ? QString::fromLatin1("????") : project->first("QMAKE_PKGINFO_TYPEINFO").left(4).toQString()));
QFile plist_out_file(Option::output_dir + "/Info.plist"); QFile plist_out_file(Option::output_dir + "/Info.plist");
@ -1711,9 +1711,9 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t)
QTextStream defaultSchemeStream(&defaultSchemeFile); QTextStream defaultSchemeStream(&defaultSchemeFile);
QString schemeData = defaultSchemeStream.readAll(); QString schemeData = defaultSchemeStream.readAll();
schemeData.replace("@QMAKE_ORIG_TARGET@", target); schemeData.replace(QLatin1String("@QMAKE_ORIG_TARGET@"), target);
schemeData.replace("@TARGET_PBX_KEY@", keyFor(pbx_dir + "QMAKE_PBX_TARGET")); schemeData.replace(QLatin1String("@TARGET_PBX_KEY@"), keyFor(pbx_dir + "QMAKE_PBX_TARGET"));
schemeData.replace("@TEST_BUNDLE_PBX_KEY@", keyFor("QMAKE_TEST_BUNDLE_REFERENCE")); schemeData.replace(QLatin1String("@TEST_BUNDLE_PBX_KEY@"), keyFor("QMAKE_TEST_BUNDLE_REFERENCE"));
QTextStream outputSchemeStream(&outputSchemeFile); QTextStream outputSchemeStream(&outputSchemeFile);
outputSchemeStream << schemeData; outputSchemeStream << schemeData;

10
qmake/generators/makefile.cpp
View File

@ -1132,8 +1132,8 @@ MakefileGenerator::writeObj(QTextStream &t, const char *src)
ProStringList::ConstIterator oit = objl.begin(); ProStringList::ConstIterator oit = objl.begin();
ProStringList::ConstIterator sit = srcl.begin(); ProStringList::ConstIterator sit = srcl.begin();
QString stringSrc("$src"); QLatin1String stringSrc("$src");
QString stringObj("$obj"); QLatin1String stringObj("$obj");
for(;sit != srcl.end() && oit != objl.end(); ++oit, ++sit) { for(;sit != srcl.end() && oit != objl.end(); ++oit, ++sit) {
if((*sit).isEmpty()) if((*sit).isEmpty())
continue; continue;
@ -2282,7 +2282,7 @@ MakefileGenerator::writeHeader(QTextStream &t)
t << "# Project: " << fileFixify(project->projectFile()) << endl; t << "# Project: " << fileFixify(project->projectFile()) << endl;
t << "# Template: " << var("TEMPLATE") << endl; t << "# Template: " << var("TEMPLATE") << endl;
if(!project->isActiveConfig("build_pass")) if(!project->isActiveConfig("build_pass"))
t << "# Command: " << build_args().replace("$(QMAKE)", var("QMAKE_QMAKE")) << endl; t << "# Command: " << build_args().replace(QLatin1String("$(QMAKE)"), var("QMAKE_QMAKE")) << endl;
t << "#############################################################################\n"; t << "#############################################################################\n";
t << endl; t << endl;
QString ofile = Option::fixPathToTargetOS(Option::output.fileName()); QString ofile = Option::fixPathToTargetOS(Option::output.fileName());
@ -3177,7 +3177,7 @@ MakefileGenerator::pkgConfigFixPath(QString path) const
{ {
QString prefix = pkgConfigPrefix(); QString prefix = pkgConfigPrefix();
if(path.startsWith(prefix)) if(path.startsWith(prefix))
path.replace(prefix, "${prefix}"); path.replace(prefix, QLatin1String("${prefix}"));
return path; return path;
} }
@ -3329,7 +3329,7 @@ static QString windowsifyPath(const QString &str)
{ {
// The paths are escaped in prl files, so every slash needs to turn into two backslashes. // The paths are escaped in prl files, so every slash needs to turn into two backslashes.
// Then each backslash needs to be escaped for sed. And another level for C quoting here. // Then each backslash needs to be escaped for sed. And another level for C quoting here.
return QString(str).replace('/', "\\\\\\\\"); return QString(str).replace('/', QLatin1String("\\\\\\\\"));
} }
QString MakefileGenerator::installMetaFile(const ProKey &replace_rule, const QString &src, const QString &dst) QString MakefileGenerator::installMetaFile(const ProKey &replace_rule, const QString &src, const QString &dst)

8
qmake/generators/unix/unixmake.cpp
View File

@ -178,12 +178,12 @@ UnixMakefileGenerator::init()
pchBaseName += project->first("QMAKE_ORIG_TARGET").toQString(); pchBaseName += project->first("QMAKE_ORIG_TARGET").toQString();
// replace place holders // replace place holders
pchFlags.replace("${QMAKE_PCH_INPUT}", pchFlags.replace(QLatin1String("${QMAKE_PCH_INPUT}"),
escapeFilePath(project->first("PRECOMPILED_HEADER").toQString())); escapeFilePath(project->first("PRECOMPILED_HEADER").toQString()));
pchFlags.replace("${QMAKE_PCH_OUTPUT_BASE}", escapeFilePath(pchBaseName)); pchFlags.replace(QLatin1String("${QMAKE_PCH_OUTPUT_BASE}"), escapeFilePath(pchBaseName));
if (project->isActiveConfig("icc_pch_style")) { if (project->isActiveConfig("icc_pch_style")) {
// icc style // icc style
pchFlags.replace("${QMAKE_PCH_OUTPUT}", pchFlags.replace(QLatin1String("${QMAKE_PCH_OUTPUT}"),
escapeFilePath(pchBaseName + project->first("QMAKE_PCH_OUTPUT_EXT"))); escapeFilePath(pchBaseName + project->first("QMAKE_PCH_OUTPUT_EXT")));
} else { } else {
// gcc style (including clang_pch_style) // gcc style (including clang_pch_style)
@ -197,7 +197,7 @@ UnixMakefileGenerator::init()
ProString language = project->first(ProKey("QMAKE_LANGUAGE_" + compiler)); ProString language = project->first(ProKey("QMAKE_LANGUAGE_" + compiler));
if (!language.isEmpty()) { if (!language.isEmpty()) {
pchFlags.replace("${QMAKE_PCH_OUTPUT}", pchFlags.replace(QLatin1String("${QMAKE_PCH_OUTPUT}"),
escapeFilePath(pchBaseName + language + headerSuffix)); escapeFilePath(pchBaseName + language + headerSuffix));
} }
} }

16
qmake/generators/unix/unixmake2.cpp
View File

@ -536,7 +536,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
<< "ld -r -o " << incr_target_dir_f << ' ' << link_deps << endl; << "ld -r -o " << incr_target_dir_f << ' ' << link_deps << endl;
//communicated below //communicated below
ProStringList &cmd = project->values("QMAKE_LINK_SHLIB_CMD"); ProStringList &cmd = project->values("QMAKE_LINK_SHLIB_CMD");
cmd[0] = cmd.at(0).toQString().replace("$(OBJECTS) ", "$(INCREMENTAL_OBJECTS)"); //ick cmd[0] = cmd.at(0).toQString().replace(QLatin1String("$(OBJECTS) "), QLatin1String("$(INCREMENTAL_OBJECTS)")); //ick
cmd.append(incr_target_dir_f); cmd.append(incr_target_dir_f);
deps.prepend(incr_target_dir_d + ' '); deps.prepend(incr_target_dir_d + ' ');
incr_deps = "$(INCREMENTAL_OBJECTS)"; incr_deps = "$(INCREMENTAL_OBJECTS)";
@ -704,7 +704,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
t << destdir_d << "$(TARGET): " << depVar("PRE_TARGETDEPS") t << destdir_d << "$(TARGET): " << depVar("PRE_TARGETDEPS")
<< ' ' << depVar("POST_TARGETDEPS") << valList(escapeDependencyPaths(build)) << "\n\t"; << ' ' << depVar("POST_TARGETDEPS") << valList(escapeDependencyPaths(build)) << "\n\t";
ar = project->first("QMAKE_AR_CMD").toQString(); ar = project->first("QMAKE_AR_CMD").toQString();
ar.replace("$(OBJECTS)", escapeFilePaths(build).join(' ')); ar.replace(QLatin1String("$(OBJECTS)"), escapeFilePaths(build).join(' '));
} else { } else {
t << destdir_d << escapeDependencyPath(*libit) << ": " t << destdir_d << escapeDependencyPath(*libit) << ": "
<< valList(escapeDependencyPaths(build)) << "\n\t"; << valList(escapeDependencyPaths(build)) << "\n\t";
@ -1083,8 +1083,8 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
<< "\n\techo \"// Automatically generated, do not modify\" > " << sourceFile_f << "\n\techo \"// Automatically generated, do not modify\" > " << sourceFile_f
<< "\n\trm -f " << escapeFilePath(pchOutput); << "\n\trm -f " << escapeFilePath(pchOutput);
pchFlags.replace("${QMAKE_PCH_TEMP_SOURCE}", sourceFile_f) pchFlags.replace(QLatin1String("${QMAKE_PCH_TEMP_SOURCE}"), sourceFile_f)
.replace("${QMAKE_PCH_TEMP_OBJECT}", escapeFilePath(objectFile)); .replace(QLatin1String("${QMAKE_PCH_TEMP_OBJECT}"), escapeFilePath(objectFile));
} else { } else {
// gcc style (including clang_pch_style) // gcc style (including clang_pch_style)
ProString header_prefix = project->first("QMAKE_PRECOMP_PREFIX"); ProString header_prefix = project->first("QMAKE_PRECOMP_PREFIX");
@ -1103,9 +1103,9 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
<< escapeDependencyPaths(findDependencies(pchInput)).join(" \\\n\t\t") << escapeDependencyPaths(findDependencies(pchInput)).join(" \\\n\t\t")
<< "\n\t" << mkdir_p_asstring(pchOutputDir); << "\n\t" << mkdir_p_asstring(pchOutputDir);
} }
pchFlags.replace("${QMAKE_PCH_INPUT}", escapeFilePath(pchInput)) pchFlags.replace(QLatin1String("${QMAKE_PCH_INPUT}"), escapeFilePath(pchInput))
.replace("${QMAKE_PCH_OUTPUT_BASE}", escapeFilePath(pchBaseName.toQString())) .replace(QLatin1String("${QMAKE_PCH_OUTPUT_BASE}"), escapeFilePath(pchBaseName.toQString()))
.replace("${QMAKE_PCH_OUTPUT}", escapeFilePath(pchOutput.toQString())); .replace(QLatin1String("${QMAKE_PCH_OUTPUT}"), escapeFilePath(pchOutput.toQString()));
QString compilerExecutable; QString compilerExecutable;
if (compiler == "C" || compiler == "OBJC") if (compiler == "C" || compiler == "OBJC")
@ -1151,7 +1151,7 @@ void UnixMakefileGenerator::init2()
ProStringList &ar_cmd = project->values("QMAKE_AR_CMD"); ProStringList &ar_cmd = project->values("QMAKE_AR_CMD");
if (!ar_cmd.isEmpty()) if (!ar_cmd.isEmpty())
ar_cmd[0] = ar_cmd.at(0).toQString().replace("(TARGET)","(TARGETA)"); ar_cmd[0] = ar_cmd.at(0).toQString().replace(QLatin1String("(TARGET)"), QLatin1String("(TARGETA)"));
else else
ar_cmd.append("$(AR) $(TARGETA) $(OBJECTS)"); ar_cmd.append("$(AR) $(TARGETA) $(OBJECTS)");
if (!project->isEmpty("QMAKE_BUNDLE")) { if (!project->isEmpty("QMAKE_BUNDLE")) {

2
qmake/generators/win32/cesdkhandler.cpp
View File

@ -147,7 +147,7 @@ bool CeSdkHandler::parseMsBuildFile(QFile *file, CeSdkInfo *info)
QSettings sdkRootPathRegistry(regString, QSettings::NativeFormat); QSettings sdkRootPathRegistry(regString, QSettings::NativeFormat);
const QString erg = sdkRootPathRegistry.value(QStringLiteral(".")).toString(); const QString erg = sdkRootPathRegistry.value(QStringLiteral(".")).toString();
const QString fullSdkRootPath = erg + sdkRootPath.mid(endIndex + 1); const QString fullSdkRootPath = erg + sdkRootPath.mid(endIndex + 1);
const QString rootString = QStringLiteral("$(SdkRootPath)"); const QLatin1String rootString("$(SdkRootPath)");
includePath = includePath.replace(rootString, fullSdkRootPath); includePath = includePath.replace(rootString, fullSdkRootPath);
libraryPath = libraryPath.replace(rootString, fullSdkRootPath); libraryPath = libraryPath.replace(rootString, fullSdkRootPath);

2
qmake/generators/win32/mingw_make.cpp
View File

@ -51,7 +51,7 @@ QString MingwMakefileGenerator::escapeDependencyPath(const QString &path) const
{ {
QString ret = path; QString ret = path;
ret.replace('\\', "/"); // ### this shouldn't be here ret.replace('\\', "/"); // ### this shouldn't be here
ret.replace(' ', "\\ "); ret.replace(' ', QLatin1String("\\ "));
return ret; return ret;
} }

2
qmake/generators/win32/msbuild_objectmodel.cpp
View File

@ -328,7 +328,7 @@ static QString vcxCommandSeparator()
static QString unquote(const QString &value) static QString unquote(const QString &value)
{ {
QString result = value; QString result = value;
result.replace(QStringLiteral("\\\""), QStringLiteral("\"")); result.replace(QLatin1String("\\\""), QLatin1String("\""));
return result; return result;
} }

4
qmake/generators/win32/msvc_nmake.cpp
View File

@ -53,7 +53,7 @@ static QString nmakePathList(const QStringList &list)
pathList.append(QDir::cleanPath(path)); pathList.append(QDir::cleanPath(path));
return QDir::toNativeSeparators(pathList.join(QLatin1Char(';'))) return QDir::toNativeSeparators(pathList.join(QLatin1Char(';')))
.replace('#', QStringLiteral("^#")).replace('$', QStringLiteral("$$")); .replace('#', QLatin1String("^#")).replace('$', QLatin1String("$$"));
} }
NmakeMakefileGenerator::NmakeMakefileGenerator() : Win32MakefileGenerator(), usePCH(false) NmakeMakefileGenerator::NmakeMakefileGenerator() : Win32MakefileGenerator(), usePCH(false)
@ -330,7 +330,7 @@ QString NmakeMakefileGenerator::var(const ProKey &value) const
QString precompRule = QString("-c -FI%1 -Yu%2 -Fp%3") QString precompRule = QString("-c -FI%1 -Yu%2 -Fp%3")
.arg(precompH_f, precompH_f, escapeFilePath(precompPch)); .arg(precompH_f, precompH_f, escapeFilePath(precompPch));
QString p = MakefileGenerator::var(value); QString p = MakefileGenerator::var(value);
p.replace("-c", precompRule); p.replace(QLatin1String("-c"), precompRule);
// Cannot use -Gm with -FI & -Yu, as this gives an // Cannot use -Gm with -FI & -Yu, as this gives an
// internal compiler error, on the newer compilers // internal compiler error, on the newer compilers
// ### work-around for a VS 2003 bug. Move to some prf file or remove completely. // ### work-around for a VS 2003 bug. Move to some prf file or remove completely.

10
qmake/generators/win32/msvc_vcproj.cpp
View File

@ -704,12 +704,12 @@ void VcprojGenerator::writeSubDirs(QTextStream &t)
} }
QString slnConf = _slnSolutionConf; QString slnConf = _slnSolutionConf;
if (!project->isEmpty("VCPROJ_ARCH")) { if (!project->isEmpty("VCPROJ_ARCH")) {
slnConf.replace(QString("|Win32"), "|" + project->first("VCPROJ_ARCH")); slnConf.replace(QLatin1String("|Win32"), "|" + project->first("VCPROJ_ARCH"));
} else if (!project->isEmpty("CE_SDK") && !project->isEmpty("CE_ARCH")) { } else if (!project->isEmpty("CE_SDK") && !project->isEmpty("CE_ARCH")) {
QString slnPlatform = QString("|") + project->values("CE_SDK").join(' ') + " (" + project->first("CE_ARCH") + ")"; QString slnPlatform = QString("|") + project->values("CE_SDK").join(' ') + " (" + project->first("CE_ARCH") + ")";
slnConf.replace(QString("|Win32"), slnPlatform); slnConf.replace(QLatin1String("|Win32"), slnPlatform);
} else if (is64Bit) { } else if (is64Bit) {
slnConf.replace(QString("|Win32"), "|x64"); slnConf.replace(QLatin1String("|Win32"), QLatin1String("|x64"));
} }
t << slnConf; t << slnConf;
@ -1706,12 +1706,12 @@ QString VcprojGenerator::replaceExtraCompilerVariables(
if(defines.isEmpty()) if(defines.isEmpty())
defines.append(varGlue("PRL_EXPORT_DEFINES"," -D"," -D","") + defines.append(varGlue("PRL_EXPORT_DEFINES"," -D"," -D","") +
varGlue("DEFINES"," -D"," -D","")); varGlue("DEFINES"," -D"," -D",""));
ret.replace("$(DEFINES)", defines.first().toQString()); ret.replace(QLatin1String("$(DEFINES)"), defines.first().toQString());
ProStringList &incpath = project->values("VCPROJ_MAKEFILE_INCPATH"); ProStringList &incpath = project->values("VCPROJ_MAKEFILE_INCPATH");
if(incpath.isEmpty() && !this->var("MSVCPROJ_INCPATH").isEmpty()) if(incpath.isEmpty() && !this->var("MSVCPROJ_INCPATH").isEmpty())
incpath.append(this->var("MSVCPROJ_INCPATH")); incpath.append(this->var("MSVCPROJ_INCPATH"));
ret.replace("$(INCPATH)", incpath.join(' ')); ret.replace(QLatin1String("$(INCPATH)"), incpath.join(' '));
return ret; return ret;
} }

6
qmake/generators/win32/winmakefile.cpp
View File

@ -401,7 +401,7 @@ void Win32MakefileGenerator::processRcFileVar()
project->values("RC_FILE").first() = fi.absoluteFilePath(); project->values("RC_FILE").first() = fi.absoluteFilePath();
} }
resFile.replace(".rc", Option::res_ext); resFile.replace(QLatin1String(".rc"), Option::res_ext);
project->values("RES_FILE").prepend(fileInfo(resFile).fileName()); project->values("RES_FILE").prepend(fileInfo(resFile).fileName());
QString resDestDir; QString resDestDir;
if (project->isActiveConfig("staticlib")) if (project->isActiveConfig("staticlib"))
@ -771,8 +771,8 @@ QString Win32MakefileGenerator::escapeFilePath(const QString &path) const
QString Win32MakefileGenerator::cQuoted(const QString &str) QString Win32MakefileGenerator::cQuoted(const QString &str)
{ {
QString ret = str; QString ret = str;
ret.replace(QLatin1Char('\\'), QStringLiteral("\\\\")); ret.replace(QLatin1Char('\\'), QLatin1String("\\\\"));
ret.replace(QLatin1Char('"'), QStringLiteral("\\\"")); ret.replace(QLatin1Char('"'), QLatin1String("\\\""));
ret.prepend(QLatin1Char('"')); ret.prepend(QLatin1Char('"'));
ret.append(QLatin1Char('"')); ret.append(QLatin1Char('"'));
return ret; return ret;

8
qmake/generators/xmloutput.cpp
View File

@ -140,11 +140,11 @@ QString XmlOutput::doConversion(const QString &text)
} }
if (conversion == XMLConversion) { if (conversion == XMLConversion) {
output.replace('\"', "&quot;"); output.replace('\"', QLatin1String("&quot;"));
output.replace('\'', "&apos;"); output.replace('\'', QLatin1String("&apos;"));
} else if (conversion == EscapeConversion) { } else if (conversion == EscapeConversion) {
output.replace('\"', "\\\""); output.replace('\"', QLatin1String("\\\""));
output.replace('\'', "\\\'"); output.replace('\'', QLatin1String("\\\'"));
} }
return output; return output;
} }

2
qmake/main.cpp
View File

@ -130,7 +130,7 @@ static int doSed(int argc, char **argv)
SedSubst subst; SedSubst subst;
subst.from = QRegExp(phases.at(0), matchcase); subst.from = QRegExp(phases.at(0), matchcase);
subst.to = phases.at(1); subst.to = phases.at(1);
subst.to.replace("\\\\", "\\"); // QString::replace(rx, sub) groks \1, but not \\. subst.to.replace(QLatin1String("\\\\"), QLatin1String("\\")); // QString::replace(rx, sub) groks \1, but not \\.
substs << subst; substs << subst;
} }
} else if (argv[i][0] == '-' && argv[i][1] != 0) { } else if (argv[i][0] == '-' && argv[i][1] != 0) {