diff options
Diffstat (limited to 'src/tools/qdoc/qmlparser')
-rw-r--r-- | src/tools/qdoc/qmlparser/qqmljs.g | 10 | ||||
-rw-r--r-- | src/tools/qdoc/qmlparser/qqmljsast_p.h | 2 | ||||
-rw-r--r-- | src/tools/qdoc/qmlparser/qqmljsastfwd_p.h | 2 | ||||
-rw-r--r-- | src/tools/qdoc/qmlparser/qqmljsengine_p.cpp | 4 | ||||
-rw-r--r-- | src/tools/qdoc/qmlparser/qqmljsengine_p.h | 4 | ||||
-rw-r--r-- | src/tools/qdoc/qmlparser/qqmljslexer.cpp | 6 | ||||
-rw-r--r-- | src/tools/qdoc/qmlparser/qqmljslexer_p.h | 2 | ||||
-rw-r--r-- | src/tools/qdoc/qmlparser/qqmljsparser.cpp | 6 | ||||
-rw-r--r-- | src/tools/qdoc/qmlparser/qqmljsparser_p.h | 4 |
9 files changed, 20 insertions, 20 deletions
diff --git a/src/tools/qdoc/qmlparser/qqmljs.g b/src/tools/qdoc/qmlparser/qqmljs.g index 746fcb24df..5e63bff688 100644 --- a/src/tools/qdoc/qmlparser/qqmljs.g +++ b/src/tools/qdoc/qmlparser/qqmljs.g @@ -124,8 +124,8 @@ ** ****************************************************************************/ -#include <QtCore/QtDebug> -#include <QtCore/QCoreApplication> +#include <qdebug.h> +#include <qcoreapplication.h> #include <string.h> @@ -202,8 +202,8 @@ #include "qqmljsast_p.h" #include "qqmljsengine_p.h" -#include <QtCore/QList> -#include <QtCore/QString> +#include <qlist.h> +#include <qstring.h> QT_QML_BEGIN_NAMESPACE @@ -380,7 +380,7 @@ protected: /. #include "qqmljsparser_p.h" -#include <QVarLengthArray> +#include <qvarlengtharray.h> // // This file is automatically generated from qmljs.g. diff --git a/src/tools/qdoc/qmlparser/qqmljsast_p.h b/src/tools/qdoc/qmlparser/qqmljsast_p.h index 5de94d2ee2..d1014263a0 100644 --- a/src/tools/qdoc/qmlparser/qqmljsast_p.h +++ b/src/tools/qdoc/qmlparser/qqmljsast_p.h @@ -57,7 +57,7 @@ #include "qqmljsglobal_p.h" #include "qqmljsmemorypool_p.h" -#include <QtCore/QString> +#include <qstring.h> QT_QML_BEGIN_NAMESPACE diff --git a/src/tools/qdoc/qmlparser/qqmljsastfwd_p.h b/src/tools/qdoc/qmlparser/qqmljsastfwd_p.h index 602cbeb6cd..8ecf75081b 100644 --- a/src/tools/qdoc/qmlparser/qqmljsastfwd_p.h +++ b/src/tools/qdoc/qmlparser/qqmljsastfwd_p.h @@ -44,7 +44,7 @@ #include "qqmljsglobal_p.h" -#include <QtCore/qglobal.h> +#include <qglobal.h> // // W A R N I N G diff --git a/src/tools/qdoc/qmlparser/qqmljsengine_p.cpp b/src/tools/qdoc/qmlparser/qqmljsengine_p.cpp index 459ba8d7dc..29bac8f521 100644 --- a/src/tools/qdoc/qmlparser/qqmljsengine_p.cpp +++ b/src/tools/qdoc/qmlparser/qqmljsengine_p.cpp @@ -43,8 +43,8 @@ #include "qqmljsglobal_p.h" #include <qnumeric.h> -#include <QHash> -#include <QDebug> +#include <qhash.h> +#include <qdebug.h> QT_QML_BEGIN_NAMESPACE diff --git a/src/tools/qdoc/qmlparser/qqmljsengine_p.h b/src/tools/qdoc/qmlparser/qqmljsengine_p.h index 3cb78de4eb..b633f00fbc 100644 --- a/src/tools/qdoc/qmlparser/qqmljsengine_p.h +++ b/src/tools/qdoc/qmlparser/qqmljsengine_p.h @@ -57,8 +57,8 @@ #include "qqmljsastfwd_p.h" #include "qqmljsmemorypool_p.h" -#include <QString> -#include <QSet> +#include <qstring.h> +#include <qset.h> QT_QML_BEGIN_NAMESPACE diff --git a/src/tools/qdoc/qmlparser/qqmljslexer.cpp b/src/tools/qdoc/qmlparser/qqmljslexer.cpp index 537e4297e0..fd6247bf36 100644 --- a/src/tools/qdoc/qmlparser/qqmljslexer.cpp +++ b/src/tools/qdoc/qmlparser/qqmljslexer.cpp @@ -46,11 +46,11 @@ #ifdef QT_BOOTSTRAPPED #define tr(x, y) QString(QLatin1String(y)) #else -#include <QtCore/QCoreApplication> +#include <qcoreapplication.h> #define tr(x, y) QCoreApplication::translate(x, y) #endif -#include <QtCore/QVarLengthArray> -#include <QtCore/QDebug> +#include <qvarlengtharray.h> +#include <qdebug.h> QT_BEGIN_NAMESPACE Q_CORE_EXPORT double qstrtod(const char *s00, char const **se, bool *ok); diff --git a/src/tools/qdoc/qmlparser/qqmljslexer_p.h b/src/tools/qdoc/qmlparser/qqmljslexer_p.h index 6b51852f5f..827da4aa4f 100644 --- a/src/tools/qdoc/qmlparser/qqmljslexer_p.h +++ b/src/tools/qdoc/qmlparser/qqmljslexer_p.h @@ -55,7 +55,7 @@ #include "qqmljsglobal_p.h" #include "qqmljsgrammar_p.h" -#include <QtCore/QString> +#include <qstring.h> QT_QML_BEGIN_NAMESPACE diff --git a/src/tools/qdoc/qmlparser/qqmljsparser.cpp b/src/tools/qdoc/qmlparser/qqmljsparser.cpp index 431351b8b2..961441a8e7 100644 --- a/src/tools/qdoc/qmlparser/qqmljsparser.cpp +++ b/src/tools/qdoc/qmlparser/qqmljsparser.cpp @@ -39,11 +39,11 @@ ** ****************************************************************************/ -#include <QtCore/QtDebug> +#include <qdebug.h> #ifdef QT_BOOTSTRAPPED #define tr(x, y) QString(QLatin1String(y)) #else -#include <QtCore/QCoreApplication> +#include <qcoreapplication.h> #define tr(x, y) QCoreApplication::translate(x, y) #endif @@ -57,7 +57,7 @@ #include "qqmljsparser_p.h" -#include <QVarLengthArray> +#include <qvarlengtharray.h> // // This file is automatically generated from qmljs.g. diff --git a/src/tools/qdoc/qmlparser/qqmljsparser_p.h b/src/tools/qdoc/qmlparser/qqmljsparser_p.h index ad532c32c7..6d385688bb 100644 --- a/src/tools/qdoc/qmlparser/qqmljsparser_p.h +++ b/src/tools/qdoc/qmlparser/qqmljsparser_p.h @@ -64,8 +64,8 @@ #include "qqmljsast_p.h" #include "qqmljsengine_p.h" -#include <QtCore/QList> -#include <QtCore/QString> +#include <qlist.h> +#include <qstring.h> QT_QML_BEGIN_NAMESPACE |