Merge "Merge remote-tracking branch 'origin/dev' into wip/scenegraphng"wip/scenegraphng

1 files changed, 0 insertions, 11 deletions

diff --git a/src/qml/jsruntime/qv4string.cpp b/src/qml/jsruntime/qv4string.cpp
index 68d65f2e24..223f4a4769 100644
--- a/src/qml/jsruntime/qv4string.cpp
+++ b/src/qml/jsruntime/qv4string.cpp
@@ -39,19 +39,15 @@
 
 #include "qv4string_p.h"
 #include "qv4value_p.h"
-#ifndef V4_BOOTSTRAP
 #include "qv4identifiertable_p.h"
 #include "qv4runtime_p.h"
 #include "qv4objectproto_p.h"
 #include "qv4stringobject_p.h"
-#endif
 #include <QtCore/QHash>
 #include <QtCore/private/qnumeric_p.h>
 
 using namespace QV4;
 
-#ifndef V4_BOOTSTRAP
-
 void Heap::StringOrSymbol::markObjects(Heap::Base *that, MarkStack *markStack)
 {
     StringOrSymbol *s = static_cast<StringOrSymbol *>(that);
@@ -254,10 +250,3 @@ qint64 String::virtualGetLength(const Managed *m)
 {
     return static_cast<const String *>(m)->d()->length();
 }
-
-#endif // V4_BOOTSTRAP
-
-uint String::toArrayIndex(const QString &str)
-{
-    return QV4::String::toArrayIndex(str.constData(), str.constData() + str.length());
-}