diff options
author | Robert Löhning <robert.loehning@qt.io> | 2021-05-06 13:40:53 +0200 |
---|---|---|
committer | Robert Löhning <robert.loehning@qt.io> | 2021-05-06 23:49:20 +0200 |
commit | 08c852be434352f15a62ba00819e1e3bd4c38376 (patch) | |
tree | 2275c0e00f26a092a97c77d593b304546de8b2eb | |
parent | 5fa80f6cd792d0f7ead782037b9870796de05acb (diff) | |
download | qtbase-08c852be434352f15a62ba00819e1e3bd4c38376.tar.gz |
qmake: Clear caches before exiting
To not scare sanitizers and their users.
Change-Id: I51de5d6a5a358b3cf1355aeb6cc826a6ac021243
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
-rw-r--r-- | qmake/cachekeys.h | 1 | ||||
-rw-r--r-- | qmake/project.cpp | 5 |
2 files changed, 5 insertions, 1 deletions
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 <qstring.h> #include <qstringlist.h> 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 <qmakeevaluator_p.h> @@ -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; } |