Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6

9 files changed, 29 insertions, 100 deletions

diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h
index e4f7ba9..a4282e1 100644
--- a/src/corelib/tools/qsharedpointer_impl.h
+++ b/src/corelib/tools/qsharedpointer_impl.h
@@ -626,6 +626,10 @@ public:
 
     inline QSharedPointer<T> toStrongRef() const { return QSharedPointer<T>(*this); }
 
+#if defined(QWEAKPOINTER_ENABLE_ARROW)
+    inline T *operator->() const { return data(); }
+#endif
+
 private:
 
 #if defined(Q_NO_TEMPLATE_FRIENDS)
diff --git a/src/network/access/qnetworkdiskcache.cpp b/src/network/access/qnetworkdiskcache.cpp
index f1a0098b..3ae6f01 100644
--- a/src/network/access/qnetworkdiskcache.cpp
+++ b/src/network/access/qnetworkdiskcache.cpp
@@ -482,7 +482,7 @@ void QNetworkDiskCache::setMaximumCacheSize(qint64 size)
     Cleans the cache so that its size is under the maximum cache size.
     Returns the current size of the cache.
 
-    When the current size of the cache is greater then the maximumCacheSize()
+    When the current size of the cache is greater than the maximumCacheSize()
     older cache files are removed until the total size is less then 90% of
     maximumCacheSize() starting with the oldest ones first using the file
     creation date to determine how old a cache file is.
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro
index 0314958..390cc11 100644
--- a/src/s60installs/s60installs.pro
+++ b/src/s60installs/s60installs.pro
@@ -6,6 +6,7 @@ symbian: {
 
     SUBDIRS=
     # WARNING: Changing TARGET name will break Symbian SISX upgrade functionality
+    # DO NOT TOUCH TARGET VARIABLE IF YOU ARE NOT SURE WHAT YOU ARE DOING    
     TARGET = "Qt for S60"
     TARGET.UID3 = 0x2001E61C
     VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
@@ -25,17 +26,13 @@ symbian: {
         qts60plugin_5_0.dll
 
 
-    # TODO: This should be conditional in PKG file, see commented code below
-    # However we don't yet have such mechanism in place
-    contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) {
-        contains(CONFIG, system-sqlite): qtlibraries.sources += sqlite3.dll
-    }
-
-    #; EXISTS statement does not resolve !. Lets check the most common drives
-    #IF NOT EXISTS("c:\sys\bin\sqlite3.dll") AND NOT EXISTS("e:\sys\bin\sqlite3.dll") AND NOT EXISTS("z:\sys\bin\sqlite3.dll")
-    #"\Epoc32\release\armv5\UREL\sqlite3.dll"-"!:\sys\bin\sqlite3.dll"
-    #ENDIF
-
+    sqlitedeployment = \
+        "; EXISTS statement does not resolve!. Lets check the most common drives" \
+        "IF NOT EXISTS(\"c:\\sys\\bin\\sqlite3.dll\") AND NOT EXISTS(\"e:\\sys\\bin\\sqlite3.dll\") AND NOT EXISTS(\"z:\\sys\\bin\\sqlite3.dll\")" \
+        "\"$${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET)/sqlite3.dll\"-\"!:\\sys\\bin\\sqlite3.dll\"" \
+        "ENDIF"
+    qtlibraries.pkg_postrules = sqlitedeployment
+        
     qtlibraries.path = /sys/bin
 
     vendorinfo = \
diff --git a/src/script/api/qscriptengineagent.cpp b/src/script/api/qscriptengineagent.cpp
index 193ee21..cf60bcb 100644
--- a/src/script/api/qscriptengineagent.cpp
+++ b/src/script/api/qscriptengineagent.cpp
@@ -142,6 +142,17 @@ void QScriptEngineAgentPrivate::detach()
     JSC::Debugger::detach(engine->originalGlobalObject());
 }
 
+void QScriptEngineAgentPrivate::returnEvent(const JSC::DebuggerCallFrame& frame, intptr_t sourceID, int lineno)
+{
+    Q_UNUSED(frame);
+    Q_UNUSED(lineno);
+#if ENABLE(JIT)
+    functionExit(JSC::JSValue(), sourceID);
+#else
+    Q_UNUSED(sourceID);
+#endif
+}
+
 void QScriptEngineAgentPrivate::exceptionThrow(const JSC::DebuggerCallFrame& frame, intptr_t sourceID, bool hasHandler)
 {
     JSC::CallFrame *oldFrame = engine->currentFrame;
diff --git a/src/script/api/qscriptengineagent_p.h b/src/script/api/qscriptengineagent_p.h
index 9ef1eaf..ba49af5 100644
--- a/src/script/api/qscriptengineagent_p.h
+++ b/src/script/api/qscriptengineagent_p.h
@@ -110,12 +110,7 @@ public:
         q_ptr->contextPush();
         q_ptr->functionEntry(sourceID);
     };
-    virtual void returnEvent(const JSC::DebuggerCallFrame& frame, intptr_t sourceID, int lineno)
-    {
-        Q_UNUSED(frame);
-        Q_UNUSED(sourceID);
-        Q_UNUSED(lineno);
-    }
+    virtual void returnEvent(const JSC::DebuggerCallFrame& frame, intptr_t sourceID, int lineno);
     virtual void willExecuteProgram(const JSC::DebuggerCallFrame& frame, intptr_t sourceID, int lineno)
     {
         Q_UNUSED(frame);
diff --git a/src/script/bridge/qscriptobject_p.h b/src/script/bridge/qscriptobject_p.h
index 3ae7146..c427202 100644
--- a/src/script/bridge/qscriptobject_p.h
+++ b/src/script/bridge/qscriptobject_p.h
@@ -99,7 +99,7 @@ public:
 
     static WTF::PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype)
     {
-        return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType, JSC::ImplementsHasInstance));
+        return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType, JSC::ImplementsHasInstance | JSC::OverridesHasInstance));
     }
 
     JSC::JSValue data() const;
diff --git a/src/script/script.pro b/src/script/script.pro
index 301386d..a03b652 100644
--- a/src/script/script.pro
+++ b/src/script/script.pro
@@ -13,8 +13,6 @@ include(../qbase.pri)
 # Disable a few warnings on Windows.
 win32-msvc*: QMAKE_CXXFLAGS += -wd4291 -wd4344 -wd4503 -wd4800 -wd4819 -wd4996 -wd4396 -wd4099
 
-# disable JIT for now
-DEFINES += ENABLE_JIT=0
 # FIXME: shared the statically built JavaScriptCore
 
 # Fetch the base WebKit directory from the WEBKITDIR environment variable;
diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp
index 5b778d2..44f5b6d 100644
--- a/src/svg/qsvghandler.cpp
+++ b/src/svg/qsvghandler.cpp
@@ -82,7 +82,6 @@ struct QSvgAttributes
     QSvgAttributes(const QXmlStreamAttributes &xmlAttributes, QSvgHandler *handler);
 
     QStringRef value(const QLatin1String &name) const;
-    QStringRef value(const QString &namespaceUri, const QLatin1String &name) const;
 
     QXmlStreamAttributes m_xmlAttributes;
     QVector<QSvgCssAttribute> m_cssAttributes;
@@ -110,20 +109,6 @@ QStringRef QSvgAttributes::value(const QLatin1String &name) const
     return v;
 }
 
-QStringRef QSvgAttributes::value(const QString &namespaceUri, const QLatin1String &name) const
-{
-    QStringRef v = m_xmlAttributes.value(namespaceUri, name);
-    if (v.isEmpty()) {
-        for (int i = 0; i < m_cssAttributes.count(); ++i) {
-            if (m_cssAttributes.at(i).name == name) {
-                v = m_cssAttributes.at(i).value;
-                break;
-            }
-        }
-    }
-    return v;
-}
-
 static inline QString someId(const QXmlStreamAttributes &attributes)
 {
     QString id = attributes.value(QLatin1String("id")).toString();
@@ -2698,9 +2683,9 @@ static bool parseStopNode(QSvgStyleProperty *parent,
 
     QSvgGradientStyle *style =
         static_cast<QSvgGradientStyle*>(parent);
-    QString offsetStr   = attrs.value(QString(), QLatin1String("offset")).toString();
-    QString colorStr    = attrs.value(QString(), QLatin1String("stop-color")).toString();
-    QString opacityStr  = attrs.value(QString(), QLatin1String("stop-opacity")).toString();
+    QString offsetStr   = attrs.value(QLatin1String("offset")).toString();
+    QString colorStr    = attrs.value(QLatin1String("stop-color")).toString();
+    QString opacityStr  = attrs.value(QLatin1String("stop-opacity")).toString();
     QColor color;
 
     bool ok = true;
diff --git a/src/xmlpatterns/parser/qquerytransformparser.cpp b/src/xmlpatterns/parser/qquerytransformparser.cpp
index 2e45817..3f747ff 100644
--- a/src/xmlpatterns/parser/qquerytransformparser.cpp
+++ b/src/xmlpatterns/parser/qquerytransformparser.cpp
@@ -39,16 +39,6 @@
 **
 ****************************************************************************/
 
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-
 /* A Bison parser, made by GNU Bison 2.3a.  */
 
 /* Skeleton implementation for Bison's Yacc-like parsers in C
@@ -123,57 +113,6 @@
 /* Line 164 of yacc.c.  */
 #line 22 "querytransformparser.ypp"
 
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtXmlPatterns module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://qt.nokia.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-
 #include <limits>
 
 #include <QUrl>