From 3a1280c5b51488599c98e6c0fabef41464dd857f Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@theqtcompany.com>
Date: Wed, 20 May 2015 13:43:42 +0200
Subject: Clean up directories created as part of dry run builds.

We always need to create a lock file, which in turn can cause
directories to be created. Remove these afterwards if no other files
were created within them.

Task-number: QTCREATORBUG-14482
Change-Id: If990614fbe53444addb45aa6d9490e9128c354d2
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
---
 src/lib/corelib/tools/buildgraphlocker.h | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'src/lib/corelib/tools/buildgraphlocker.h')

diff --git a/src/lib/corelib/tools/buildgraphlocker.h b/src/lib/corelib/tools/buildgraphlocker.h
index a378b7c47..327aa57ef 100644
--- a/src/lib/corelib/tools/buildgraphlocker.h
+++ b/src/lib/corelib/tools/buildgraphlocker.h
@@ -31,12 +31,11 @@
 #ifndef QBS_BUILDGRAPHLOCKER_H
 #define QBS_BUILDGRAPHLOCKER_H
 
-#include <QLockFile>
 #include <logging/logger.h>
 
-QT_BEGIN_NAMESPACE
-class QString;
-QT_END_NAMESPACE
+#include <QLockFile>
+#include <QQueue>
+#include <QString>
 
 namespace qbs {
 namespace Internal {
@@ -48,8 +47,12 @@ public:
     ~BuildGraphLocker();
 
 private:
+    void rememberCreatedDirectories(const QString &buildDir);
+    void removeEmptyCreatedDirectories();
+
     QLockFile m_lockFile;
     Logger m_logger;
+    QQueue<QString> m_createdParentDirs;
 };
 
 } // namespace Internal
-- 
cgit v1.2.3