diff options
| -rw-r--r-- | qmake/generators/win32/cesdkhandler.cpp | 6 | ||||
| -rw-r--r-- | qmake/generators/win32/cesdkhandler.h | 4 | ||||
| -rw-r--r-- | src/corelib/global/qlibraryinfo.h | 2 | ||||
| -rw-r--r-- | src/corelib/tools/qcollator_p.h | 4 | ||||
| -rw-r--r-- | src/corelib/tools/qvector.h | 3 | ||||
| -rw-r--r-- | tools/configure/configureapp.cpp | 2 | ||||
| -rw-r--r-- | tools/configure/environment.cpp | 13 | ||||
| -rw-r--r-- | tools/configure/tools.cpp | 6 | ||||
| -rw-r--r-- | tools/configure/tools.h | 6 |
9 files changed, 23 insertions, 23 deletions
diff --git a/qmake/generators/win32/cesdkhandler.cpp b/qmake/generators/win32/cesdkhandler.cpp index de6a55112b..7b9ac0cf8f 100644 --- a/qmake/generators/win32/cesdkhandler.cpp +++ b/qmake/generators/win32/cesdkhandler.cpp @@ -41,9 +41,9 @@ #include "cesdkhandler.h" -#include <QtCore/QFile> -#include <QtCore/QDebug> -#include <QtCore/QXmlStreamReader> +#include <qfile.h> +#include <qdebug.h> +#include <qxmlstream.h> QT_BEGIN_NAMESPACE diff --git a/qmake/generators/win32/cesdkhandler.h b/qmake/generators/win32/cesdkhandler.h index 8d35694e5d..061963f1b3 100644 --- a/qmake/generators/win32/cesdkhandler.h +++ b/qmake/generators/win32/cesdkhandler.h @@ -42,8 +42,8 @@ #ifndef CE_SDK_HANDLER_INCL #define CE_SDK_HANDLER_INCL -#include <QStringList> -#include <QDir> +#include <qstringlist.h> +#include <qdir.h> QT_BEGIN_NAMESPACE diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h index 1b7ff2bfa3..c04358f6b9 100644 --- a/src/corelib/global/qlibraryinfo.h +++ b/src/corelib/global/qlibraryinfo.h @@ -43,7 +43,7 @@ #define QLIBRARYINFO_H #include <QtCore/qstring.h> -#include <QtCore/QDate> +#include <QtCore/qdatetime.h> QT_BEGIN_HEADER diff --git a/src/corelib/tools/qcollator_p.h b/src/corelib/tools/qcollator_p.h index 7339927065..54fc5ce8fb 100644 --- a/src/corelib/tools/qcollator_p.h +++ b/src/corelib/tools/qcollator_p.h @@ -42,8 +42,8 @@ #ifndef QCOLLATOR_P_H #define QCOLLATOR_P_H -#include <QString> -#include <QLocale> +#include <QtCore/qstring.h> +#include <QtCore/qlocale.h> QT_BEGIN_HEADER diff --git a/src/corelib/tools/qvector.h b/src/corelib/tools/qvector.h index e52fb9a1be..1cf6a169c0 100644 --- a/src/corelib/tools/qvector.h +++ b/src/corelib/tools/qvector.h @@ -787,8 +787,7 @@ Q_DECLARE_MUTABLE_SEQUENTIAL_ITERATOR(Vector) #ifdef Q_CC_MSVC QT_BEGIN_INCLUDE_NAMESPACE -#include <QtCore/QPointF> -#include <QtCore/QPoint> +#include <QtCore/qpoint.h> QT_END_INCLUDE_NAMESPACE #if defined(QT_BUILD_CORE_LIB) diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index ac2d56d768..79abf2fd40 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -45,7 +45,7 @@ # include "tools.h" #endif -#include <QDate> +#include <qdatetime.h> #include <qdir.h> #include <qdiriterator.h> #include <qtemporaryfile.h> diff --git a/tools/configure/environment.cpp b/tools/configure/environment.cpp index cf8ed9611b..d40e883e2f 100644 --- a/tools/configure/environment.cpp +++ b/tools/configure/environment.cpp @@ -41,15 +41,16 @@ #include "environment.h" +#include <qdebug.h> +#include <qstringlist.h> +#include <qmap.h> +#include <qdir.h> +#include <qfile.h> +#include <qfileinfo.h> + #include <process.h> #include <errno.h> #include <iostream> -#include <qdebug.h> -#include <QDir> -#include <QStringList> -#include <QMap> -#include <QFile> -#include <QFileInfo> //#define CONFIGURE_DEBUG_EXECUTE //#define CONFIGURE_DEBUG_CP_DIR diff --git a/tools/configure/tools.cpp b/tools/configure/tools.cpp index b3b21d8349..c3f54937da 100644 --- a/tools/configure/tools.cpp +++ b/tools/configure/tools.cpp @@ -41,9 +41,9 @@ #include "tools.h" -#include <QDir> -#include <QFile> -#include <QByteArray> +#include <qdir.h> +#include <qfile.h> +#include <qbytearray.h> // std stuff ------------------------------------ diff --git a/tools/configure/tools.h b/tools/configure/tools.h index e882953733..76912eedc8 100644 --- a/tools/configure/tools.h +++ b/tools/configure/tools.h @@ -42,9 +42,9 @@ #ifndef _TOOLS_H_ #define _TOOLS_H_ -#include <QString> -#include <QStringList> -#include <QMap> +#include <qstring.h> +#include <qstringlist.h> +#include <qmap.h> class Tools |