diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2017-10-23 07:30:35 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2017-10-23 07:31:18 -0700 |
| commit | 8433ee153e9cf1b7a4a536f807b64f988ce6c5cf (patch) | |
| tree | 15eca8a3d36a69b52eb209b66b732ef5031159f2 /src/lib/corelib/buildgraph | |
| parent | 5bb59e74070fdbf12c4b6c943385ef9a480b787c (diff) | |
| parent | 9bbd8bec0491c332572941ad5545e207e9d6e2b8 (diff) | |
| download | qbs-8433ee153e9cf1b7a4a536f807b64f988ce6c5cf.tar.gz | |
Merge 1.10 into master
Change-Id: Ie23e92d1adbd73591444f725106301a63465f63d
Diffstat (limited to 'src/lib/corelib/buildgraph')
| -rw-r--r-- | src/lib/corelib/buildgraph/buildgraphloader.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/corelib/buildgraph/buildgraphloader.cpp b/src/lib/corelib/buildgraph/buildgraphloader.cpp index eec781cf6..765a3ab4f 100644 --- a/src/lib/corelib/buildgraph/buildgraphloader.cpp +++ b/src/lib/corelib/buildgraph/buildgraphloader.cpp @@ -171,10 +171,12 @@ void BuildGraphLoader::loadBuildGraphFromDisk() qCDebug(lcBuildGraph) << "trying to load:" << buildGraphFilePath; try { pool.load(buildGraphFilePath); - } catch (const NoBuildGraphError &e) { + } catch (const NoBuildGraphError &) { if (m_parameters.restoreBehavior() == SetupProjectParameters::RestoreOnly) throw; - m_logger.qbsInfo() << e.toString(); + m_logger.qbsInfo() + << Tr::tr("Build graph does not yet exist for configuration '%1'. " + "Starting from scratch.").arg(m_parameters.configurationName()); return; } catch (const ErrorInfo &loadError) { if (!m_parameters.overrideBuildGraphData()) { |