aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/corelib/api/internaljobs.cpp
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@theqtcompany.com>2015-04-09 18:19:48 +0200
committerJoerg Bornemann <joerg.bornemann@theqtcompany.com>2015-04-27 09:15:34 +0000
commit2a0772a19c6b47f1441dc45e91cca78f98e0ed83 (patch)
treed27f56f076ba5c0ba2db19b429a643e1e163e03b /src/lib/corelib/api/internaljobs.cpp
parent4d4d48599c40b3021f2c6ecb4a044e16a3dd63cf (diff)
take application name into account when locking the build graph
QLockFile stores the pid and the process name in the lock file. If the process name is different from the process name that currently has this pid, then the pid got reused. In that case we can safely remove the lock file. Change-Id: I99401e4d04c61f84a0039331a4d02a8c5038ce35 Task-number: QBS-773 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Diffstat (limited to 'src/lib/corelib/api/internaljobs.cpp')
-rw-r--r--src/lib/corelib/api/internaljobs.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/corelib/api/internaljobs.cpp b/src/lib/corelib/api/internaljobs.cpp
index 382122d8b..bde4a77f4 100644
--- a/src/lib/corelib/api/internaljobs.cpp
+++ b/src/lib/corelib/api/internaljobs.cpp
@@ -239,7 +239,8 @@ void InternalSetupProjectJob::start()
m_existingProject.clear();
if (!m_existingProject) {
bgLocker = new BuildGraphLocker(ProjectBuildData::deriveBuildGraphFilePath(buildDir,
- projectId));
+ projectId),
+ logger());
}
execute();
if (m_existingProject)