diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2018-03-22 13:06:21 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2018-04-06 07:14:32 +0000 |
| commit | fb7fdcbdff7a92d7770b648fa2989327cc103edb (patch) | |
| tree | 78ac098f47849da291e5317bca01104eed080b55 | |
| parent | 35160ca46b46fe2c81a0400c455a9c500f14a150 (diff) | |
| download | qtscript-fb7fdcbdff7a92d7770b648fa2989327cc103edb.tar.gz | |
Make style of Qt includes bootstrap build compatible
This makes it easier to build QtScript against a stripped-down version
of Qt.
Change-Id: I492c3376e38f9f75b6a0f521ed4a0c1549c5970f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
6 files changed, 13 insertions, 13 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jsc.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jsc.cpp index 252fb96..30ea5aa 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/jsc.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/jsc.cpp @@ -61,8 +61,8 @@ #endif #if PLATFORM(QT) -#include <QCoreApplication> -#include <QDateTime> +#include <QtCore/qcoreapplication.h> +#include <QtCore/qdatetime.h> #endif using namespace JSC; diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/ThreadSpecific.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/ThreadSpecific.h index 3f0e764..4485ef7 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/ThreadSpecific.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/ThreadSpecific.h @@ -46,7 +46,7 @@ #if USE(PTHREADS) #include <pthread.h> #elif PLATFORM(QT) -#include <QThreadStorage> +#include <QtCore/qthreadstorage.h> #elif OS(WINDOWS) #include <windows.h> #endif diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Vector.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Vector.h index 83eca64..1093a9f 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Vector.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Vector.h @@ -29,7 +29,7 @@ #include <utility> #if PLATFORM(QT) -#include <QDataStream> +#include <QtCore/qdatastream.h> #endif namespace WTF { diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/qt/ThreadingQt.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/qt/ThreadingQt.cpp index 3e5aa59..71de552 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/qt/ThreadingQt.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/qt/ThreadingQt.cpp @@ -36,10 +36,10 @@ #include "MainThread.h" #include "RandomNumberSeed.h" -#include <QCoreApplication> -#include <QMutex> -#include <QThread> -#include <QWaitCondition> +#include <QtCore/qcoreapplication.h> +#include <QtCore/qmutex.h> +#include <QtCore/qthread.h> +#include <QtCore/qwaitcondition.h> namespace WTF { diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/unicode/qt4/UnicodeQt4.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/unicode/qt4/UnicodeQt4.h index eeadfea..d92ee19 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/unicode/qt4/UnicodeQt4.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/unicode/qt4/UnicodeQt4.h @@ -23,8 +23,8 @@ #ifndef WTF_UNICODE_QT4_H #define WTF_UNICODE_QT4_H -#include <QChar> -#include <QString> +#include <QtCore/qchar.h> +#include <QtCore/qstring.h> #include <config.h> diff --git a/src/plugins/script/qtdbus/main.cpp b/src/plugins/script/qtdbus/main.cpp index 52d9262..5b8121f 100644 --- a/src/plugins/script/qtdbus/main.cpp +++ b/src/plugins/script/qtdbus/main.cpp @@ -38,9 +38,9 @@ ****************************************************************************/ #include "main.h" -#include <QDebug> -#include <QMetaMethod> -#include <QScriptExtensionPlugin> +#include <QtCore/qdebug.h> +#include <QtCore/qmetamethod.h> +#include <QtScript/qscriptextensionplugin.h> #ifndef QT_NO_DBUS |