aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/corelib/api/projectdata.cpp2
-rw-r--r--src/lib/corelib/api/projectfileupdater.cpp2
-rw-r--r--src/lib/corelib/buildgraph/buildgraph.cpp18
-rw-r--r--src/lib/corelib/buildgraph/buildgraphloader.cpp9
-rw-r--r--src/lib/corelib/buildgraph/emptydirectoriesremover.cpp2
-rw-r--r--src/lib/corelib/buildgraph/executor.cpp10
-rw-r--r--src/lib/corelib/buildgraph/inputartifactscanner.cpp6
-rw-r--r--src/lib/corelib/buildgraph/processcommandexecutor.cpp2
-rw-r--r--src/lib/corelib/buildgraph/productinstaller.cpp4
-rw-r--r--src/lib/corelib/buildgraph/projectbuilddata.cpp4
-rw-r--r--src/lib/corelib/tools/profiling.cpp8
-rw-r--r--src/lib/corelib/tools/scannerpluginmanager.cpp6
-rw-r--r--src/lib/qtprofilesetup/qtprofilesetup.cpp2
13 files changed, 37 insertions, 38 deletions
diff --git a/src/lib/corelib/api/projectdata.cpp b/src/lib/corelib/api/projectdata.cpp
index 915c0ff9d..4363a0ccf 100644
--- a/src/lib/corelib/api/projectdata.cpp
+++ b/src/lib/corelib/api/projectdata.cpp
@@ -847,7 +847,7 @@ static QString mapToString(const QVariantMap &map, const QString &prefix)
if (val.type() == QVariant::Map) {
stringRep += mapToString(val.value<QVariantMap>(), prefix + key + QLatin1Char('.'));
} else {
- stringRep += QString::fromLocal8Bit("%1%2: %3\n")
+ stringRep += QString::fromLatin1("%1%2: %3\n")
.arg(prefix, key, toJSLiteral(val));
}
}
diff --git a/src/lib/corelib/api/projectfileupdater.cpp b/src/lib/corelib/api/projectfileupdater.cpp
index b9725a608..74f084b64 100644
--- a/src/lib/corelib/api/projectfileupdater.cpp
+++ b/src/lib/corelib/api/projectfileupdater.cpp
@@ -470,7 +470,7 @@ void ProjectFileFilesRemover::doApply(QString &fileContent, UiProgram *ast)
QString filesString = QLatin1String("[\n");
foreach (const QString &file, newFilesList) {
filesString += QString(arrayElemIndentation, QLatin1Char(' '));
- filesString += QString::fromLocal8Bit("\"%1\",\n").arg(file);
+ filesString += QString::fromLatin1("\"%1\",\n").arg(file);
}
filesString += QString(bindingIndentation, QLatin1Char(' '));
filesString += QLatin1Char(']');
diff --git a/src/lib/corelib/buildgraph/buildgraph.cpp b/src/lib/corelib/buildgraph/buildgraph.cpp
index 43668e335..3929f676a 100644
--- a/src/lib/corelib/buildgraph/buildgraph.cpp
+++ b/src/lib/corelib/buildgraph/buildgraph.cpp
@@ -252,9 +252,9 @@ void connect(BuildGraphNode *p, BuildGraphNode *c)
if (Artifact *ac = dynamic_cast<Artifact *>(c)) {
for (const Artifact *child : filterByType<Artifact>(p->children)) {
if (child != ac && child->filePath() == ac->filePath()) {
- throw ErrorInfo(QString::fromLocal8Bit("%1 already has a child artifact %2 as "
- "different object.").arg(p->toString(),
- ac->filePath()),
+ throw ErrorInfo(QString::fromLatin1("%1 already has a child artifact %2 as "
+ "different object.").arg(p->toString(),
+ ac->filePath()),
CodeLocation(), true);
}
}
@@ -268,7 +268,7 @@ void loggedConnect(BuildGraphNode *u, BuildGraphNode *v, const Logger &logger)
{
QBS_CHECK(u != v);
if (logger.traceEnabled()) {
- logger.qbsTrace() << QString::fromLocal8Bit("[BG] connect '%1' -> '%2'")
+ logger.qbsTrace() << QString::fromLatin1("[BG] connect '%1' -> '%2'")
.arg(u->toString(), v->toString());
}
connect(u, v);
@@ -308,7 +308,7 @@ bool safeConnect(Artifact *u, Artifact *v, const Logger &logger)
{
QBS_CHECK(u != v);
if (logger.traceEnabled()) {
- logger.qbsTrace() << QString::fromLocal8Bit("[BG] safeConnect: '%1' '%2'")
+ logger.qbsTrace() << QString::fromLatin1("[BG] safeConnect: '%1' '%2'")
.arg(relativeArtifactFileName(u), relativeArtifactFileName(v));
}
@@ -326,7 +326,7 @@ bool safeConnect(Artifact *u, Artifact *v, const Logger &logger)
void disconnect(BuildGraphNode *u, BuildGraphNode *v, const Logger &logger)
{
if (logger.traceEnabled()) {
- logger.qbsTrace() << QString::fromLocal8Bit("[BG] disconnect: '%1' '%2'")
+ logger.qbsTrace() << QString::fromLatin1("[BG] disconnect: '%1' '%2'")
.arg(u->toString(), v->toString());
}
u->children.remove(v);
@@ -348,7 +348,7 @@ void removeGeneratedArtifactFromDisk(const QString &filePath, const Logger &logg
return;
logger.qbsDebug() << "removing " << filePath;
if (!file.remove())
- logger.qbsWarning() << QString::fromLocal8Bit("Cannot remove '%1'.").arg(filePath);
+ logger.qbsWarning() << QString::fromLatin1("Cannot remove '%1'.").arg(filePath);
}
QString relativeArtifactFileName(const Artifact *artifact)
@@ -432,7 +432,7 @@ void insertArtifact(const ResolvedProductPtr &product, Artifact *artifact, const
addArtifactToSet(artifact, product->buildData->artifactsByFileTag);
if (logger.traceEnabled()) {
- logger.qbsTrace() << QString::fromLocal8Bit("[BG] insert artifact '%1'")
+ logger.qbsTrace() << QString::fromLatin1("[BG] insert artifact '%1'")
.arg(artifact->filePath());
}
}
@@ -492,7 +492,7 @@ static void doSanityChecksForProduct(const ResolvedProductConstPtr &product,
QSet<QString> childFilePaths;
for (const Artifact *a : filterByType<Artifact>(output->children)) {
if (childFilePaths.contains(a->filePath())) {
- throw ErrorInfo(QString::fromLocal8Bit("There is more than one artifact for "
+ throw ErrorInfo(QString::fromLatin1("There is more than one artifact for "
"file '%1' in the child list for output '%2'.")
.arg(a->filePath(), output->filePath()), CodeLocation(), true);
}
diff --git a/src/lib/corelib/buildgraph/buildgraphloader.cpp b/src/lib/corelib/buildgraph/buildgraphloader.cpp
index f77f7c62a..72ad5047a 100644
--- a/src/lib/corelib/buildgraph/buildgraphloader.cpp
+++ b/src/lib/corelib/buildgraph/buildgraphloader.cpp
@@ -750,9 +750,8 @@ void BuildGraphLoader::replaceFileDependencyWithArtifact(const ResolvedProductPt
{
if (m_logger.traceEnabled()) {
m_logger.qbsTrace()
- << QString::fromLocal8Bit("[BG] replace file dependency '%1' "
- "with artifact of type '%2'")
- .arg(filedep->filePath()).arg(artifact->artifactType);
+ << QString::fromLatin1("[BG] replace file dependency '%1' with artifact of type '%2'")
+ .arg(filedep->filePath()).arg(artifact->artifactType);
}
foreach (const ResolvedProductPtr &product, fileDepProduct->topLevelProject()->allProducts()) {
if (!product->buildData)
@@ -810,8 +809,8 @@ void BuildGraphLoader::rescueOldBuildData(const ResolvedProductConstPtr &restore
return;
if (m_logger.traceEnabled()) {
- m_logger.qbsTrace() << QString::fromLocal8Bit("[BG] rescue data of "
- "product '%1'").arg(restoredProduct->uniqueName());
+ m_logger.qbsTrace() << QString::fromLatin1("[BG] rescue data of product '%1'")
+ .arg(restoredProduct->uniqueName());
}
QBS_CHECK(newlyResolvedProduct->buildData);
QBS_CHECK(newlyResolvedProduct->buildData->rescuableArtifactData.isEmpty());
diff --git a/src/lib/corelib/buildgraph/emptydirectoriesremover.cpp b/src/lib/corelib/buildgraph/emptydirectoriesremover.cpp
index b92062f25..3f96cf35d 100644
--- a/src/lib/corelib/buildgraph/emptydirectoriesremover.cpp
+++ b/src/lib/corelib/buildgraph/emptydirectoriesremover.cpp
@@ -103,7 +103,7 @@ void EmptyDirectoriesRemover::removeDirIfEmpty()
return;
dir.cdUp();
if (!dir.rmdir(fi.fileName())) {
- m_logger.qbsWarning() << QString::fromLocal8Bit("Cannot remove empty directory '%1'.")
+ m_logger.qbsWarning() << QString::fromLatin1("Cannot remove empty directory '%1'.")
.arg(dirPath);
return;
}
diff --git a/src/lib/corelib/buildgraph/executor.cpp b/src/lib/corelib/buildgraph/executor.cpp
index 42b96eee6..ed8cbc544 100644
--- a/src/lib/corelib/buildgraph/executor.cpp
+++ b/src/lib/corelib/buildgraph/executor.cpp
@@ -434,7 +434,7 @@ void Executor::buildArtifact(Artifact *artifact)
retrieveSourceFileTimestamp(artifact);
if (m_doDebug)
- m_logger.qbsDebug() << QString::fromLocal8Bit("[EXEC] artifact type %1. Skipping.")
+ m_logger.qbsDebug() << QString::fromLatin1("[EXEC] artifact type %1. Skipping.")
.arg(toString(artifact->artifactType));
finishArtifact(artifact);
return;
@@ -703,8 +703,8 @@ void Executor::handleError(const ErrorInfo &error)
void Executor::addExecutorJobs()
{
- m_logger.qbsDebug() << QString::fromLocal8Bit("[EXEC] preparing executor for %1 jobs "
- "in parallel").arg(m_buildOptions.maxJobCount());
+ m_logger.qbsDebug() << QString::fromLatin1("[EXEC] preparing executor for %1 jobs in parallel")
+ .arg(m_buildOptions.maxJobCount());
for (int i = 1; i <= m_buildOptions.maxJobCount(); i++) {
ExecutorJob *job = new ExecutorJob(m_logger, this);
job->setMainThreadScriptEngine(m_evalContext->engine());
@@ -739,8 +739,8 @@ void Executor::rescueOldBuildData(Artifact *artifact, bool *childrenAdded = 0)
const RescuableArtifactData &rad = it.value();
if (m_logger.traceEnabled()) {
- m_logger.qbsTrace() << QString::fromLocal8Bit("[BG] Attempting to rescue data of "
- "artifact '%1'").arg(artifact->fileName());
+ m_logger.qbsTrace() << QString::fromLatin1("[BG] Attempting to rescue data of "
+ "artifact '%1'").arg(artifact->fileName());
}
typedef QPair<Artifact *, bool> ChildArtifactData;
diff --git a/src/lib/corelib/buildgraph/inputartifactscanner.cpp b/src/lib/corelib/buildgraph/inputartifactscanner.cpp
index ff7fd152b..e0d0726c3 100644
--- a/src/lib/corelib/buildgraph/inputartifactscanner.cpp
+++ b/src/lib/corelib/buildgraph/inputartifactscanner.cpp
@@ -164,7 +164,7 @@ void InputArtifactScanner::scan()
if (m_logger.traceEnabled()) {
m_logger.qbsTrace()
- << QString::fromLocal8Bit("[DEPSCAN] inputs for %1 [%2] in product '%3'")
+ << QString::fromLatin1("[DEPSCAN] inputs for %1 [%2] in product '%3'")
.arg(m_artifact->filePath(),
m_artifact->fileTags().toStringList().join(QLatin1String(", ")),
m_artifact->product->name);
@@ -191,7 +191,7 @@ void InputArtifactScanner::scanForFileDependencies(Artifact *inputArtifact)
{
if (m_logger.traceEnabled()) {
m_logger.qbsTrace()
- << QString::fromLocal8Bit("[DEPSCAN] input artifact %1 [%2]")
+ << QString::fromLatin1("[DEPSCAN] input artifact %1 [%2]")
.arg(inputArtifact->filePath(),
inputArtifact->fileTags().toStringList().join(QLatin1String(", ")));
}
@@ -250,7 +250,7 @@ void InputArtifactScanner::scanForScannerFileDependencies(DependencyScanner *sca
InputArtifactScannerContext::ScannerResolvedDependenciesCache &cache)
{
if (m_logger.traceEnabled()) {
- m_logger.qbsTrace() << QString::fromLocal8Bit("[DEPSCAN] file %1")
+ m_logger.qbsTrace() << QString::fromLatin1("[DEPSCAN] file %1")
.arg(fileToBeScanned->filePath());
}
diff --git a/src/lib/corelib/buildgraph/processcommandexecutor.cpp b/src/lib/corelib/buildgraph/processcommandexecutor.cpp
index e797d9fce..49c2cf2f0 100644
--- a/src/lib/corelib/buildgraph/processcommandexecutor.cpp
+++ b/src/lib/corelib/buildgraph/processcommandexecutor.cpp
@@ -126,7 +126,7 @@ void ProcessCommandExecutor::doStart()
const int commandLineLength = m_shellInvocation.length();
if (cmd->responseFileThreshold() >= 0 && commandLineLength > cmd->responseFileThreshold()) {
if (logger().debugEnabled()) {
- logger().qbsDebug() << QString::fromLocal8Bit("[EXEC] Using response file. "
+ logger().qbsDebug() << QString::fromLatin1("[EXEC] Using response file. "
"Threshold is %1. Command line length %2.")
.arg(cmd->responseFileThreshold()).arg(commandLineLength);
}
diff --git a/src/lib/corelib/buildgraph/productinstaller.cpp b/src/lib/corelib/buildgraph/productinstaller.cpp
index 9f9ba2c44..b59ad1c4c 100644
--- a/src/lib/corelib/buildgraph/productinstaller.cpp
+++ b/src/lib/corelib/buildgraph/productinstaller.cpp
@@ -166,7 +166,7 @@ void ProductInstaller::removeInstallRoot()
m_logger.qbsInfo() << Tr::tr("Would remove install root '%1'.").arg(nativeInstallRoot);
return;
}
- m_logger.qbsDebug() << QString::fromLocal8Bit("Removing install root '%1'.")
+ m_logger.qbsDebug() << QString::fromLatin1("Removing install root '%1'.")
.arg(nativeInstallRoot);
QString errorMessage;
@@ -195,7 +195,7 @@ void ProductInstaller::copyFile(const Artifact *artifact)
.arg(nativeFilePath, nativeTargetDir);
return;
}
- m_logger.qbsDebug() << QString::fromLocal8Bit("Copying file '%1' into target directory '%2'.")
+ m_logger.qbsDebug() << QString::fromLatin1("Copying file '%1' into target directory '%2'.")
.arg(nativeFilePath, nativeTargetDir);
if (!QDir::root().mkpath(targetDir)) {
diff --git a/src/lib/corelib/buildgraph/projectbuilddata.cpp b/src/lib/corelib/buildgraph/projectbuilddata.cpp
index 716a06f04..0ffb43feb 100644
--- a/src/lib/corelib/buildgraph/projectbuilddata.cpp
+++ b/src/lib/corelib/buildgraph/projectbuilddata.cpp
@@ -229,7 +229,7 @@ void ProjectBuildData::insertFileDependency(FileDependency *dependency)
static void disconnectArtifactChildren(Artifact *artifact, const Logger &logger)
{
if (logger.traceEnabled()) {
- logger.qbsTrace() << QString::fromLocal8Bit("[BG] disconnectChildren: '%1'")
+ logger.qbsTrace() << QString::fromLatin1("[BG] disconnectChildren: '%1'")
.arg(relativeArtifactFileName(artifact));
}
foreach (BuildGraphNode * const child, artifact->children)
@@ -241,7 +241,7 @@ static void disconnectArtifactChildren(Artifact *artifact, const Logger &logger)
static void disconnectArtifactParents(Artifact *artifact, const Logger &logger)
{
if (logger.traceEnabled()) {
- logger.qbsTrace() << QString::fromLocal8Bit("[BG] disconnectParents: '%1'")
+ logger.qbsTrace() << QString::fromLatin1("[BG] disconnectParents: '%1'")
.arg(relativeArtifactFileName(artifact));
}
foreach (BuildGraphNode * const parent, artifact->parents) {
diff --git a/src/lib/corelib/tools/profiling.cpp b/src/lib/corelib/tools/profiling.cpp
index ede35e2fa..5d9e66f75 100644
--- a/src/lib/corelib/tools/profiling.cpp
+++ b/src/lib/corelib/tools/profiling.cpp
@@ -112,13 +112,13 @@ QString elapsedTimeString(qint64 elapsedTimeInMs)
s -= m*60;
const qint64 h = m/60;
m -= h*60;
- QString timeString = QString::fromLocal8Bit("%1ms").arg(ms);
+ QString timeString = QString::fromLatin1("%1ms").arg(ms);
if (h || m || s)
- timeString.prepend(QString::fromLocal8Bit("%1s, ").arg(s));
+ timeString.prepend(QString::fromLatin1("%1s, ").arg(s));
if (h || m)
- timeString.prepend(QString::fromLocal8Bit("%1m, ").arg(m));
+ timeString.prepend(QString::fromLatin1("%1m, ").arg(m));
if (h)
- timeString.prepend(QString::fromLocal8Bit("%1h, ").arg(h));
+ timeString.prepend(QString::fromLatin1("%1h, ").arg(h));
return timeString;
}
diff --git a/src/lib/corelib/tools/scannerpluginmanager.cpp b/src/lib/corelib/tools/scannerpluginmanager.cpp
index a5a8ecb50..83c1dfcaa 100644
--- a/src/lib/corelib/tools/scannerpluginmanager.cpp
+++ b/src/lib/corelib/tools/scannerpluginmanager.cpp
@@ -85,7 +85,7 @@ void ScannerPluginManager::loadPlugins(const QStringList &pluginPaths, const Log
filters << QLatin1String("*.so");
foreach (const QString &pluginPath, pluginPaths) {
- logger.qbsTrace() << QString::fromLocal8Bit("pluginmanager: loading plugins from '%1'.")
+ logger.qbsTrace() << QString::fromLatin1("pluginmanager: loading plugins from '%1'.")
.arg(QDir::toNativeSeparators(pluginPath));
QDirIterator it(pluginPath, filters, QDir::Files);
while (it.hasNext()) {
@@ -111,8 +111,8 @@ void ScannerPluginManager::loadPlugins(const QStringList &pluginPaths, const Log
continue;
}
- logger.qbsTrace() << QString::fromLocal8Bit("pluginmanager: scanner plugin '%1' "
- "loaded.").arg(QDir::toNativeSeparators(fileName));
+ logger.qbsTrace() << QString::fromLatin1("pluginmanager: scanner plugin '%1' loaded.")
+ .arg(QDir::toNativeSeparators(fileName));
for (int i = 0; plugins[i] != 0; ++i)
m_scannerPlugins[FileTag(plugins[i]->fileTag)] += plugins[i];
diff --git a/src/lib/qtprofilesetup/qtprofilesetup.cpp b/src/lib/qtprofilesetup/qtprofilesetup.cpp
index 23aa658af..8e15ac01a 100644
--- a/src/lib/qtprofilesetup/qtprofilesetup.cpp
+++ b/src/lib/qtprofilesetup/qtprofilesetup.cpp
@@ -203,7 +203,7 @@ static void createModules(Profile &profile, Settings *settings,
const QList<QtModuleInfo> modules = qtEnvironment.qtMajorVersion < 5
? allQt4Modules(qtEnvironment)
: allQt5Modules(profile, qtEnvironment);
- const QString profileBaseDir = QString::fromLocal8Bit("%1/profiles/%2")
+ const QString profileBaseDir = QString::fromLatin1("%1/profiles/%2")
.arg(QFileInfo(settings->fileName()).dir().absolutePath(), profile.name());
const QString qbsQtModuleBaseDir = profileBaseDir + QLatin1String("/modules/Qt");
QStringList allFiles;
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-24 22:49:07 +0000