summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2018-04-18 12:45:39 +0200
committerJoerg Bornemann <joerg.bornemann@qt.io>2018-04-19 05:25:44 +0000
commit0d3b268f3880dea9555601fbd4d559201c239b7e (patch)
tree2c586607cdd6c3fcfe1a4e960f7dd498221b604f
parenta3926bb9f1eb6884f718edc4d9c9a5cffd03b0c3 (diff)
downloadqtscript-0d3b268f3880dea9555601fbd4d559201c239b7e.tar.gz
Make more includes bootstrap-compatible
This amends commit fb7fdcbd. Change-Id: Ic537339ecfdc7054126f6fa280732add73984b12 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
-rw-r--r--src/3rdparty/javascriptcore/JavaScriptCore/wtf/qt/MainThreadQt.cpp4
-rw-r--r--src/script/parser/qscriptast_p.h2
-rw-r--r--src/script/parser/qscriptlexer_p.h2
3 files changed, 4 insertions, 4 deletions
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/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