From 08c852be434352f15a62ba00819e1e3bd4c38376 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20L=C3=B6hning?= Date: Thu, 6 May 2021 13:40:53 +0200 Subject: [PATCH] qmake: Clear caches before exiting To not scare sanitizers and their users. Change-Id: I51de5d6a5a358b3cf1355aeb6cc826a6ac021243 Reviewed-by: Alexey Edelev Reviewed-by: Joerg Bornemann --- qmake/cachekeys.h | 1 + qmake/project.cpp | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/qmake/cachekeys.h b/qmake/cachekeys.h index 26a95e4f27..2d2fd63951 100644 --- a/qmake/cachekeys.h +++ b/qmake/cachekeys.h @@ -29,6 +29,7 @@ #ifndef CACHEKEYS_H #define CACHEKEYS_H +#include "option.h" #include "project.h" #include #include diff --git a/qmake/project.cpp b/qmake/project.cpp index 15870395ae..066ac1838f 100644 --- a/qmake/project.cpp +++ b/qmake/project.cpp @@ -28,6 +28,7 @@ #include "project.h" +#include "cachekeys.h" #include "option.h" #include @@ -52,8 +53,10 @@ QMakeProject::QMakeProject(QMakeProject *p) bool QMakeProject::boolRet(VisitReturn vr) { - if (vr == ReturnError) + if (vr == ReturnError) { + qmakeClearCaches(); exit(3); + } Q_ASSERT(vr == ReturnTrue || vr == ReturnFalse); return vr != ReturnFalse; }