Merge commit 'qt/4.6' into mmfphonon

Conflicts:
	demos/embedded/fluidlauncher/config_s60/config.xml
	demos/embedded/fluidlauncher/fluidlauncher.pro
	src/corelib/io/io.pri
	src/gui/kernel/qapplication_s60.cpp
	src/gui/kernel/qwidget_s60.cpp
	src/s60installs/qt_libs.pro

1 files changed, 137 insertions, 0 deletions

diff --git a/src/3rdparty/webkit/WebCore/generated/JSCanvasUnsignedByteArray.cpp b/src/3rdparty/webkit/WebCore/generated/JSCanvasUnsignedByteArray.cpp
new file mode 100644
index 0000000..52f4c36
--- /dev/null
+++ b/src/3rdparty/webkit/WebCore/generated/JSCanvasUnsignedByteArray.cpp
@@ -0,0 +1,137 @@
+/*
+    This file is part of the WebKit open source project.
+    This file has been generated by generate-bindings.pl. DO NOT MODIFY!
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+*/
+
+#include "config.h"
+
+#if ENABLE(3D_CANVAS)
+
+#include "JSCanvasUnsignedByteArray.h"
+
+#include "CanvasUnsignedByteArray.h"
+#include <runtime/PropertyNameArray.h>
+#include <wtf/GetPtr.h>
+
+using namespace JSC;
+
+namespace WebCore {
+
+ASSERT_CLASS_FITS_IN_CELL(JSCanvasUnsignedByteArray);
+
+/* Hash table for prototype */
+
+static const HashTableValue JSCanvasUnsignedByteArrayPrototypeTableValues[1] =
+{
+    { 0, 0, 0, 0 }
+};
+
+static JSC_CONST_HASHTABLE HashTable JSCanvasUnsignedByteArrayPrototypeTable =
+#if ENABLE(PERFECT_HASH_SIZE)
+    { 0, JSCanvasUnsignedByteArrayPrototypeTableValues, 0 };
+#else
+    { 1, 0, JSCanvasUnsignedByteArrayPrototypeTableValues, 0 };
+#endif
+
+const ClassInfo JSCanvasUnsignedByteArrayPrototype::s_info = { "CanvasUnsignedByteArrayPrototype", 0, &JSCanvasUnsignedByteArrayPrototypeTable, 0 };
+
+JSObject* JSCanvasUnsignedByteArrayPrototype::self(ExecState* exec, JSGlobalObject* globalObject)
+{
+    return getDOMPrototype<JSCanvasUnsignedByteArray>(exec, globalObject);
+}
+
+const ClassInfo JSCanvasUnsignedByteArray::s_info = { "CanvasUnsignedByteArray", &JSCanvasArray::s_info, 0, 0 };
+
+JSCanvasUnsignedByteArray::JSCanvasUnsignedByteArray(PassRefPtr<Structure> structure, JSDOMGlobalObject* globalObject, PassRefPtr<CanvasUnsignedByteArray> impl)
+    : JSCanvasArray(structure, globalObject, impl)
+{
+}
+
+JSObject* JSCanvasUnsignedByteArray::createPrototype(ExecState* exec, JSGlobalObject* globalObject)
+{
+    return new (exec) JSCanvasUnsignedByteArrayPrototype(JSCanvasUnsignedByteArrayPrototype::createStructure(JSCanvasArrayPrototype::self(exec, globalObject)));
+}
+
+bool JSCanvasUnsignedByteArray::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot)
+{
+    bool ok;
+    unsigned index = propertyName.toUInt32(&ok, false);
+    if (ok && index < static_cast<CanvasUnsignedByteArray*>(impl())->length()) {
+        slot.setValue(getByIndex(exec, index));
+        return true;
+    }
+    return Base::getOwnPropertySlot(exec, propertyName, slot);
+}
+
+bool JSCanvasUnsignedByteArray::getOwnPropertyDescriptor(ExecState* exec, const Identifier& propertyName, PropertyDescriptor& descriptor)
+{
+    bool ok;
+    unsigned index = propertyName.toUInt32(&ok, false);
+    if (ok && index < static_cast<CanvasUnsignedByteArray*>(impl())->length()) {
+        descriptor.setDescriptor(getByIndex(exec, index), DontDelete);
+        return true;
+    }
+    return Base::getOwnPropertyDescriptor(exec, propertyName, descriptor);
+}
+
+bool JSCanvasUnsignedByteArray::getOwnPropertySlot(ExecState* exec, unsigned propertyName, PropertySlot& slot)
+{
+    if (propertyName < static_cast<CanvasUnsignedByteArray*>(impl())->length()) {
+        slot.setValue(getByIndex(exec, propertyName));
+        return true;
+    }
+    return getOwnPropertySlot(exec, Identifier::from(exec, propertyName), slot);
+}
+
+void JSCanvasUnsignedByteArray::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot)
+{
+    bool ok;
+    unsigned index = propertyName.toUInt32(&ok, false);
+    if (ok) {
+        indexSetter(exec, index, value);
+        return;
+    }
+    Base::put(exec, propertyName, value, slot);
+}
+
+void JSCanvasUnsignedByteArray::put(ExecState* exec, unsigned propertyName, JSValue value)
+{
+    indexSetter(exec, propertyName, value);
+    return;
+}
+
+void JSCanvasUnsignedByteArray::getOwnPropertyNames(ExecState* exec, PropertyNameArray& propertyNames)
+{
+    for (unsigned i = 0; i < static_cast<CanvasUnsignedByteArray*>(impl())->length(); ++i)
+        propertyNames.add(Identifier::from(exec, i));
+     Base::getOwnPropertyNames(exec, propertyNames);
+}
+
+
+JSValue JSCanvasUnsignedByteArray::getByIndex(ExecState* exec, unsigned index)
+{
+    return jsNumber(exec, static_cast<CanvasUnsignedByteArray*>(impl())->item(index));
+}
+CanvasUnsignedByteArray* toCanvasUnsignedByteArray(JSC::JSValue value)
+{
+    return value.inherits(&JSCanvasUnsignedByteArray::s_info) ? static_cast<JSCanvasUnsignedByteArray*>(asObject(value))->impl() : 0;
+}
+
+}
+
+#endif // ENABLE(3D_CANVAS)