diff options
author | Martin Smith <martin.smith@qt.io> | 2017-09-08 14:51:59 +0200 |
---|---|---|
committer | Jędrzej Nowacki <jedrzej.nowacki@qt.io> | 2017-09-12 09:38:00 +0000 |
commit | 5a64696264decb561ff6d8b661e783752fdc0b61 (patch) | |
tree | 3c02b343b7c2df911a74c75c8a74bddaa45204cb /src | |
parent | f56c797ef97d035ebcb59311bfc35207846de9e7 (diff) |
Add QTemporaryDir to the bootstrap library
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 <thiago.macieira@intel.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/corelib/io/qtemporarydir.cpp | 6 | ||||
-rw-r--r-- | src/corelib/io/qtemporarydir.h | 2 | ||||
-rw-r--r-- | 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 <QDebug> -#include <QPair> -#include <QRandomGenerator> #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 <QtCore/qdir.h> -#include <QtCore/QScopedPointer> +#include <QtCore/qscopedpointer.h> 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 \ |