From 5a64696264decb561ff6d8b661e783752fdc0b61 Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Fri, 8 Sep 2017 14:51:59 +0200 Subject: [PATCH] Add QTemporaryDir to the bootstrap library MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit clang-qdoc must be compilable using the bootstrap library, but clang-qdoc uses QTemporaryDir, which is not there. This change adds it. This also required changing some camelcase includes to their lower case equivalents. Change-Id: I8d03864f56e4bf474c3fdcde5e744ed31fea7fc3 Reviewed-by: Thiago Macieira Reviewed-by: Jędrzej Nowacki --- src/corelib/io/qtemporarydir.cpp | 6 +++--- src/corelib/io/qtemporarydir.h | 2 +- src/tools/bootstrap/bootstrap.pro | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/corelib/io/qtemporarydir.cpp b/src/corelib/io/qtemporarydir.cpp index 2779246c5b..ed52472ab3 100644 --- a/src/corelib/io/qtemporarydir.cpp +++ b/src/corelib/io/qtemporarydir.cpp @@ -42,12 +42,12 @@ #ifndef QT_NO_TEMPORARYFILE +#include "qdebug.h" #include "qdiriterator.h" +#include "qpair.h" #include "qplatformdefs.h" +#include "qrandom.h" #include "private/qtemporaryfile_p.h" -#include -#include -#include #if defined(QT_BUILD_CORE_LIB) #include "qcoreapplication.h" diff --git a/src/corelib/io/qtemporarydir.h b/src/corelib/io/qtemporarydir.h index 3f6b70a2eb..5864ce5cfc 100644 --- a/src/corelib/io/qtemporarydir.h +++ b/src/corelib/io/qtemporarydir.h @@ -41,7 +41,7 @@ #define QTEMPORARYDIR_H #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro index dedb4ff138..c9f0e876ef 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro @@ -45,6 +45,7 @@ SOURCES += \ ../../corelib/io/qiodevice.cpp \ ../../corelib/io/qfiledevice.cpp \ ../../corelib/io/qresource.cpp \ + ../../corelib/io/qtemporarydir.cpp \ ../../corelib/io/qtemporaryfile.cpp \ ../../corelib/io/qtextstream.cpp \ ../../corelib/io/qsavefile.cpp \