diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2016-09-13 14:25:58 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2016-09-22 11:26:45 +0000 |
| commit | 68ec3971e9f826dc16c0c4638f586347af5389c3 (patch) | |
| tree | 6896d95702a6067dfa48507b8d2c3fecc1aec918 /tools | |
| parent | 045bcaa2bbae646ad2fc723e8386254214574d1e (diff) | |
Clean up includes
This will hopefully enable us to build qscxmlc with force_bootstrap on
macOS.
Change-Id: Ib5d9494fae86b9bb12625aadb9ae3fac0a234520
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qscxmlc/generator.cpp | 1 | ||||
| -rw-r--r-- | tools/qscxmlc/generator.h | 6 | ||||
| -rw-r--r-- | tools/qscxmlc/moc.h | 11 | ||||
| -rw-r--r-- | tools/qscxmlc/scxmlcppdumper.cpp | 15 |
4 files changed, 16 insertions, 17 deletions
diff --git a/tools/qscxmlc/generator.cpp b/tools/qscxmlc/generator.cpp index 561bc05..9082efa 100644 --- a/tools/qscxmlc/generator.cpp +++ b/tools/qscxmlc/generator.cpp @@ -37,6 +37,7 @@ #include <QtCore/qplugin.h> #include <private/qmetaobject_p.h> //for the flags. +#include <stdio.h> QT_BEGIN_NAMESPACE diff --git a/tools/qscxmlc/generator.h b/tools/qscxmlc/generator.h index b22b9e3..21d82d3 100644 --- a/tools/qscxmlc/generator.h +++ b/tools/qscxmlc/generator.h @@ -30,9 +30,9 @@ #define GENERATOR_H #include "moc.h" -#include <QHash> -#include <QVector> -#include <QIODevice> +#include <QtCore/qhash.h> +#include <QtCore/qvector.h> +#include <QtCore/qiodevice.h> QT_BEGIN_NAMESPACE diff --git a/tools/qscxmlc/moc.h b/tools/qscxmlc/moc.h index 5149454..36cff5f 100644 --- a/tools/qscxmlc/moc.h +++ b/tools/qscxmlc/moc.h @@ -29,13 +29,10 @@ #ifndef MOC_H #define MOC_H -#include <qstringlist.h> -#include <qmap.h> -#include <qpair.h> -#include <qjsondocument.h> -#include <qjsonarray.h> -#include <qjsonobject.h> -#include <stdio.h> +#include <QtCore/qmap.h> +#include <QtCore/qpair.h> +#include <QtCore/qjsondocument.h> +#include <QtCore/qjsonarray.h> #include <ctype.h> QT_BEGIN_NAMESPACE diff --git a/tools/qscxmlc/scxmlcppdumper.cpp b/tools/qscxmlc/scxmlcppdumper.cpp index f4e6f8a..a8941d5 100644 --- a/tools/qscxmlc/scxmlcppdumper.cpp +++ b/tools/qscxmlc/scxmlcppdumper.cpp @@ -26,17 +26,18 @@ ** ****************************************************************************/ -#include <QtScxml/private/qscxmlexecutablecontent_p.h> #include "scxmlcppdumper.h" +#include "generator.h" + +#include <QtScxml/private/qscxmlexecutablecontent_p.h> + +#include <QtCore/qfileinfo.h> +#include <QtCore/qbuffer.h> +#include <QtCore/qfile.h> +#include <QtCore/qresource.h> #include <algorithm> #include <functional> -#include <QFileInfo> -#include <QBuffer> -#include <QFile> -#include <QResource> - -#include "generator.h" QT_BEGIN_NAMESPACE |