diff options
10 files changed, 18 insertions, 18 deletions
diff --git a/.qmake.conf b/.qmake.conf index 7908937..7a7d5ac 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -3,4 +3,4 @@ android|boot2qt: CONFIG -= headersclean DEFINES += QT_NO_FOREACH -MODULE_VERSION = 5.11.1 +MODULE_VERSION = 5.12.0 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/MainThreadQt.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/qt/MainThreadQt.cpp index 744d3d5..2326ace 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/qt/MainThreadQt.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/qt/MainThreadQt.cpp @@ -31,8 +31,8 @@ #include "config.h" #include "MainThread.h" -#include <QtCore/QObject> -#include <QtCore/QCoreApplication> +#include <QtCore/qobject.h> +#include <QtCore/qcoreapplication.h> 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 diff --git a/src/script/parser/qscriptast_p.h b/src/script/parser/qscriptast_p.h index a089d1d..062cb39 100644 --- a/src/script/parser/qscriptast_p.h +++ b/src/script/parser/qscriptast_p.h @@ -35,7 +35,7 @@ // We mean it. // -#include <QtCore/QString> +#include <QtCore/qstring.h> #include "qscriptastvisitor_p.h" diff --git a/src/script/parser/qscriptlexer_p.h b/src/script/parser/qscriptlexer_p.h index 4b7429b..72e1a84 100644 --- a/src/script/parser/qscriptlexer_p.h +++ b/src/script/parser/qscriptlexer_p.h @@ -35,7 +35,7 @@ // We mean it. // -#include <QtCore/QString> +#include <QtCore/qstring.h> QT_BEGIN_NAMESPACE |