diff options
| author | Jake Petroules <jake.petroules@petroules.com> | 2014-01-08 14:36:16 -0500 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@petroules.com> | 2014-01-14 17:41:47 +0100 |
| commit | 49a051bd4b320aff32066181932dc27a4eea63c5 (patch) | |
| tree | a8f5c6e56bb275d2ae8c83179065623385d1395a /src/lib/corelib/buildgraph/executor.cpp | |
| parent | cf706560d394e582a897d2a69e79ce5740d2459d (diff) | |
Prepare for using QT_NO_CAST_FROM/TO_ASCII.
Change-Id: Ib39e49e896cbddf5a5bd851088500991d962355a
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'src/lib/corelib/buildgraph/executor.cpp')
| -rw-r--r-- | src/lib/corelib/buildgraph/executor.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/corelib/buildgraph/executor.cpp b/src/lib/corelib/buildgraph/executor.cpp index fe546c97b..3938e961b 100644 --- a/src/lib/corelib/buildgraph/executor.cpp +++ b/src/lib/corelib/buildgraph/executor.cpp @@ -505,7 +505,7 @@ void Executor::buildArtifact(Artifact *artifact) Artifact *output = *it; QDir outDir = QFileInfo(output->filePath()).absoluteDir(); if (!outDir.exists()) - outDir.mkpath("."); + outDir.mkpath(QLatin1String(".")); } } @@ -547,7 +547,7 @@ void Executor::buildArtifact(Artifact *artifact) m_processingJobs.insert(job, artifact); Q_ASSERT_X(artifact->product, Q_FUNC_INFO, - qPrintable(QString("Generated artifact '%1' belongs to no product.") + qPrintable(QString::fromLatin1("Generated artifact '%1' belongs to no product.") .arg(QDir::toNativeSeparators(artifact->filePath())))); job->run(artifact->transformer.data(), artifact->product); @@ -724,7 +724,7 @@ void Executor::addExecutorJobs(int jobNumber) for (int i = 1; i <= jobNumber; i++) { ExecutorJob *job = new ExecutorJob(m_logger, this); job->setMainThreadScriptEngine(m_evalContext->engine()); - job->setObjectName(QString(QLatin1String("J%1")).arg(i)); + job->setObjectName(QString::fromLatin1("J%1").arg(i)); m_availableJobs.append(job); connect(job, SIGNAL(reportCommandDescription(QString,QString)), this, SIGNAL(reportCommandDescription(QString,QString)), Qt::QueuedConnection); @@ -744,7 +744,7 @@ void Executor::runAutoMoc() throw ErrorInfo(Tr::tr("Build canceled%1.").arg(configString())); // HACK call the automoc thingy here only if we have use Qt/core module foreach (const ResolvedModuleConstPtr &m, product->modules) { - if (m->name == "Qt/core") { + if (m->name == QLatin1String("Qt/core")) { autoMocApplied = true; m_autoMoc->apply(product); break; @@ -817,7 +817,7 @@ void Executor::finish() m_logger.qbsInfo() << Tr::tr("Build done%1.").arg(configString()); } else { m_error.append(Tr::tr("The following products could not be built%1: %2.") - .arg(configString(), unbuiltProductNames.join(", "))); + .arg(configString(), unbuiltProductNames.join(QLatin1String(", ")))); } if (m_explicitlyCanceled) |