3 files changed, 3 insertions, 5 deletions
diff --git a/src/qml/compiler/qv4codegen.cpp b/src/qml/compiler/qv4codegen.cpp
index 3c669c9b1a..edd479a0bd 100644
--- a/src/qml/compiler/qv4codegen.cpp
+++ b/src/qml/compiler/qv4codegen.cpp
@@ -47,7 +47,7 @@
 #include <private/qqmljsast_p.h>
 #include <private/qqmljslexer_p.h>
 #include <private/qqmljsparser_p.h>
-#include <private/qv4string_p.h>
+#include <private/qv4stringtoarrayindex_p.h>
 #include <private/qv4value_p.h>
 #include <private/qv4compilercontext_p.h>
 #include <private/qv4compilercontrolflow_p.h>
@@ -1245,7 +1245,7 @@ bool Codegen::visit(ArrayMemberExpression *ast)
         return false;
     if (AST::StringLiteral *str = AST::cast<AST::StringLiteral *>(ast->expression)) {
         QString s = str->value.toString();
-        uint arrayIndex = QV4::String::toArrayIndex(s);
+        uint arrayIndex = stringToArrayIndex(s);
         if (arrayIndex == UINT_MAX) {
             setExprResult(Reference::fromMember(base, str->value.toString()));
             return false;
@@ -2515,7 +2515,7 @@ bool Codegen::visit(ObjectPattern *ast)
         if (cname || p->type != PatternProperty::Literal)
             break;
         QString name = p->name->asString();
-        uint arrayIndex = QV4::String::toArrayIndex(name);
+        uint arrayIndex = stringToArrayIndex(name);
         if (arrayIndex != UINT_MAX)
             break;
         if (members.contains(name))
diff --git a/src/qml/compiler/qv4compiler.cpp b/src/qml/compiler/qv4compiler.cpp
index 123d77f788..4a54e5a44b 100644
--- a/src/qml/compiler/qv4compiler.cpp
+++ b/src/qml/compiler/qv4compiler.cpp
@@ -40,7 +40,6 @@
 #include <qv4compiler_p.h>
 #include <qv4compileddata_p.h>
 #include <qv4codegen_p.h>
-#include <private/qv4string_p.h>
 #include <private/qv4value_p.h>
 #include <private/qv4alloca_p.h>
 #include <private/qqmljslexer_p.h>
diff --git a/src/qml/compiler/qv4compilerscanfunctions.cpp b/src/qml/compiler/qv4compilerscanfunctions.cpp
index 8984b6931e..ef67a11a70 100644
--- a/src/qml/compiler/qv4compilerscanfunctions.cpp
+++ b/src/qml/compiler/qv4compilerscanfunctions.cpp
@@ -49,7 +49,6 @@
 #include <private/qqmljsast_p.h>
 #include <private/qv4compilercontext_p.h>
 #include <private/qv4codegen_p.h>
-#include <private/qv4string_p.h>
 
 QT_USE_NAMESPACE
 using namespace QV4;