summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/v4/debugging.h2
-rw-r--r--src/v4/llvm_runtime.cpp2
-rw-r--r--src/v4/qmljs_engine.h2
-rw-r--r--src/v4/qv4codegen.cpp2
-rw-r--r--src/v4/qv4context.cpp (renamed from src/v4/qmljs_environment.cpp)2
-rw-r--r--src/v4/qv4context.h (renamed from src/v4/qmljs_environment.h)0
-rw-r--r--src/v4/qv4functionobject.h2
-rw-r--r--src/v4/qv4globalobject.cpp2
-rw-r--r--src/v4/qv4object.h2
-rw-r--r--src/v4/qv4regexpobject.h2
-rw-r--r--src/v4/v4.pro4
-rw-r--r--tools/v4/main.cpp2
12 files changed, 12 insertions, 12 deletions
diff --git a/src/v4/debugging.h b/src/v4/debugging.h
index ee749de3..ee7a66d2 100644
--- a/src/v4/debugging.h
+++ b/src/v4/debugging.h
@@ -32,7 +32,7 @@
#include "qv4global.h"
#include "qmljs_engine.h"
-#include "qmljs_environment.h"
+#include "qv4context.h"
#include <QHash>
diff --git a/src/v4/llvm_runtime.cpp b/src/v4/llvm_runtime.cpp
index c0c5415e..2e4abb2d 100644
--- a/src/v4/llvm_runtime.cpp
+++ b/src/v4/llvm_runtime.cpp
@@ -40,7 +40,7 @@
****************************************************************************/
#include "qmljs_runtime.h"
-#include "qmljs_environment.h"
+#include "qv4context.h"
#include "qmljs_engine.h"
#include <stdio.h>
#include <setjmp.h>
diff --git a/src/v4/qmljs_engine.h b/src/v4/qmljs_engine.h
index 056e5bb9..41e74b0e 100644
--- a/src/v4/qmljs_engine.h
+++ b/src/v4/qmljs_engine.h
@@ -44,7 +44,7 @@
#include "qv4global.h"
#include "qv4isel_p.h"
#include "qv4object.h"
-#include "qmljs_environment.h"
+#include "qv4context.h"
#include <setjmp.h>
#include <wtf/PassRefPtr.h>
diff --git a/src/v4/qv4codegen.cpp b/src/v4/qv4codegen.cpp
index dbccda42..85a9f51b 100644
--- a/src/v4/qv4codegen.cpp
+++ b/src/v4/qv4codegen.cpp
@@ -50,7 +50,7 @@
#include <QtCore/QStack>
#include <private/qqmljsast_p.h>
#include <qmljs_runtime.h>
-#include <qmljs_environment.h>
+#include <qv4context.h>
#include <cmath>
#include <iostream>
#include <cassert>
diff --git a/src/v4/qmljs_environment.cpp b/src/v4/qv4context.cpp
index bbb354da..fc59a534 100644
--- a/src/v4/qmljs_environment.cpp
+++ b/src/v4/qv4context.cpp
@@ -41,7 +41,7 @@
#include <QString>
#include "debugging.h"
-#include <qmljs_environment.h>
+#include <qv4context.h>
#include <qv4object.h>
#include <qv4objectproto.h>
#include "qv4mm.h"
diff --git a/src/v4/qmljs_environment.h b/src/v4/qv4context.h
index 63c97daf..63c97daf 100644
--- a/src/v4/qmljs_environment.h
+++ b/src/v4/qv4context.h
diff --git a/src/v4/qv4functionobject.h b/src/v4/qv4functionobject.h
index 640f334e..e3146147 100644
--- a/src/v4/qv4functionobject.h
+++ b/src/v4/qv4functionobject.h
@@ -44,7 +44,7 @@
#include "qv4global.h"
#include "qmljs_runtime.h"
#include "qmljs_engine.h"
-#include "qmljs_environment.h"
+#include "qv4context.h"
#include "qv4object.h"
#include "qv4string.h"
#include "qv4codegen_p.h"
diff --git a/src/v4/qv4globalobject.cpp b/src/v4/qv4globalobject.cpp
index 143b5406..6a0b5e82 100644
--- a/src/v4/qv4globalobject.cpp
+++ b/src/v4/qv4globalobject.cpp
@@ -42,7 +42,7 @@
#include "qv4globalobject.h"
#include "qv4mm.h"
#include "qmljs_value.h"
-#include "qmljs_environment.h"
+#include "qv4context.h"
#include <private/qqmljsengine_p.h>
#include <private/qqmljslexer_p.h>
diff --git a/src/v4/qv4object.h b/src/v4/qv4object.h
index 11034cff..4f34a614 100644
--- a/src/v4/qv4object.h
+++ b/src/v4/qv4object.h
@@ -44,7 +44,7 @@
#include "qv4global.h"
#include "qmljs_runtime.h"
#include "qmljs_engine.h"
-#include "qmljs_environment.h"
+#include "qv4context.h"
#include "qv4sparsearray.h"
#include "qv4string.h"
#include "qv4codegen_p.h"
diff --git a/src/v4/qv4regexpobject.h b/src/v4/qv4regexpobject.h
index c9cdb809..36550f2f 100644
--- a/src/v4/qv4regexpobject.h
+++ b/src/v4/qv4regexpobject.h
@@ -43,7 +43,7 @@
#include "qmljs_runtime.h"
#include "qmljs_engine.h"
-#include "qmljs_environment.h"
+#include "qv4context.h"
#include "qv4functionobject.h"
#include "qv4string.h"
#include "qv4codegen_p.h"
diff --git a/src/v4/v4.pro b/src/v4/v4.pro
index 80444b89..ab111f76 100644
--- a/src/v4/v4.pro
+++ b/src/v4/v4.pro
@@ -19,7 +19,7 @@ SOURCES += \
qv4codegen.cpp \
qv4jsir.cpp \
qmljs_engine.cpp \
- qmljs_environment.cpp \
+ qv4context.cpp \
qmljs_runtime.cpp \
qmljs_value.cpp \
qv4syntaxchecker.cpp \
@@ -56,7 +56,7 @@ HEADERS += \
qv4codegen_p.h \
qv4jsir_p.h \
qmljs_engine.h \
- qmljs_environment.h \
+ qv4context.h \
qmljs_runtime.h \
qmljs_math.h \
qmljs_value.h \
diff --git a/tools/v4/main.cpp b/tools/v4/main.cpp
index 55e10716..939682a1 100644
--- a/tools/v4/main.cpp
+++ b/tools/v4/main.cpp
@@ -57,7 +57,7 @@
#include "private/qv4objectproto.h"
#include "private/qv4isel_p.h"
#include "private/qv4mm.h"
-#include "private/qmljs_environment.h"
+#include "private/qv4context.h"
#include <QtCore>
#include <private/qqmljsengine_p.h>