From b8367d1c0846455e9055aed7ff5a0e438531a9ae Mon Sep 17 00:00:00 2001
From: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
Date: Mon, 23 Nov 2009 14:04:37 +0100
Subject: Mac: added some useful comments only

---
 src/gui/kernel/qcocoaapplicationdelegate_mac.mm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/gui/kernel/qcocoaapplicationdelegate_mac.mm b/src/gui/kernel/qcocoaapplicationdelegate_mac.mm
index 37dcc67..304e5d3 100644
--- a/src/gui/kernel/qcocoaapplicationdelegate_mac.mm
+++ b/src/gui/kernel/qcocoaapplicationdelegate_mac.mm
@@ -178,6 +178,9 @@ static void cleanupCocoaApplicationDelegate()
     return [[qtMenuLoader retain] autorelease];
 }
 
+// This function will only be called when NSApp is actually running. Before
+// that, the kAEQuitApplication apple event will be sendt to 
+// QApplicationPrivate::globalAppleEventProcessor in qapplication_mac.mm
 - (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender
 {
     Q_UNUSED(sender);
-- 
cgit v0.12


From da40c39eb802a40a9108406d1665d9d9b19a7b3c Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@nokia.com>
Date: Mon, 23 Nov 2009 14:05:12 +0100
Subject: Updated WebKit from /home/shausman/src/webkit/trunk to
 qtwebkit/qtwebkit-4.6 ( efa69b6181ce5c045097351cdcf6c158da3f4888 )

Changes in WebKit/qt since the last update:

++ b/WebKit/qt/ChangeLog
2009-11-19  Olivier Goffart  <ogoffart@trolltech.com>

        Reviewed by Simon Hausmann.

        [Qt] Normalize signal and slot signatures.

        * Api/qgraphicswebview.cpp:
        (QGraphicsWebView::setPage):
        * Api/qwebview.cpp:
        (QWebView::setPage):
        * WebCoreSupport/FrameLoaderClientQt.cpp:
        (WebCore::FrameLoaderClientQt::setFrame):
        * docs/webkitsnippets/qtwebkit_qwebinspector_snippet.cpp:
        (wrapInFunction):
        * tests/qwebframe/tst_qwebframe.cpp:
        * tests/qwebpage/tst_qwebpage.cpp:
        (tst_QWebPage::modified):
        (tst_QWebPage::database):
---
 src/3rdparty/webkit/JavaScriptCore/ChangeLog          | 17 +++++++++++++++++
 .../webkit/JavaScriptCore/runtime/StringPrototype.cpp |  5 +++++
 src/3rdparty/webkit/VERSION                           |  2 +-
 src/3rdparty/webkit/WebCore/ChangeLog                 |  9 +++++++++
 src/3rdparty/webkit/WebKit/qt/ChangeLog               | 19 +++++++++++++++++++
 5 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/src/3rdparty/webkit/JavaScriptCore/ChangeLog b/src/3rdparty/webkit/JavaScriptCore/ChangeLog
index 304f9ef..382a8c7 100644
--- a/src/3rdparty/webkit/JavaScriptCore/ChangeLog
+++ b/src/3rdparty/webkit/JavaScriptCore/ChangeLog
@@ -1,3 +1,20 @@
+2009-11-23  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Symbian] Fix lastIndexOf() for Symbian
+        https://bugs.webkit.org/show_bug.cgi?id=31773
+
+        Symbian soft floating point library has problems with operators
+        comparing NaN to numbers. Without a workaround lastIndexOf() 
+        function does not work.
+
+        Patch developed by David Leong.
+
+        * runtime/StringPrototype.cpp:
+        (JSC::stringProtoFuncLastIndexOf):Add an extra test 
+        to check for NaN for Symbian.
+
 2009-11-18  Harald Fernengel  <harald.fernengel@nokia.com>
 
         Reviewed by Simon Hausmann.
diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/StringPrototype.cpp b/src/3rdparty/webkit/JavaScriptCore/runtime/StringPrototype.cpp
index a0713b8..a0cc9f1 100644
--- a/src/3rdparty/webkit/JavaScriptCore/runtime/StringPrototype.cpp
+++ b/src/3rdparty/webkit/JavaScriptCore/runtime/StringPrototype.cpp
@@ -469,6 +469,11 @@ JSValue JSC_HOST_CALL stringProtoFuncLastIndexOf(ExecState* exec, JSObject*, JSV
         dpos = 0;
     else if (!(dpos <= len)) // true for NaN
         dpos = len;
+#if PLATFORM(SYMBIAN)
+    // Work around for broken NaN compare operator
+    else if (isnan(dpos))
+        dpos = len;
+#endif
     return jsNumber(exec, s.rfind(u2, static_cast<int>(dpos)));
 }
 
diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION
index f40dda4..5818e83 100644
--- a/src/3rdparty/webkit/VERSION
+++ b/src/3rdparty/webkit/VERSION
@@ -8,4 +8,4 @@ The commit imported was from the
 
 and has the sha1 checksum
 
-        7bdf90f753d25fb1b5628b0980827df11110ad5a
+        efa69b6181ce5c045097351cdcf6c158da3f4888
diff --git a/src/3rdparty/webkit/WebCore/ChangeLog b/src/3rdparty/webkit/WebCore/ChangeLog
index 6daf411..9644470 100644
--- a/src/3rdparty/webkit/WebCore/ChangeLog
+++ b/src/3rdparty/webkit/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2009-11-19  Olivier Goffart  <ogoffart@trolltech.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Normalize signal and slot signatures.
+
+        * platform/graphics/qt/MediaPlayerPrivatePhonon.cpp:
+        (WebCore::MediaPlayerPrivate::MediaPlayerPrivate):
+
 2009-11-18  Benjamin Poulain  <benjamin.poulain@nokia.com>
 
         Reviewed by Simon Hausmann.
diff --git a/src/3rdparty/webkit/WebKit/qt/ChangeLog b/src/3rdparty/webkit/WebKit/qt/ChangeLog
index 457e9c2..2408dd4 100644
--- a/src/3rdparty/webkit/WebKit/qt/ChangeLog
+++ b/src/3rdparty/webkit/WebKit/qt/ChangeLog
@@ -1,3 +1,22 @@
+2009-11-19  Olivier Goffart  <ogoffart@trolltech.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Normalize signal and slot signatures.
+
+        * Api/qgraphicswebview.cpp:
+        (QGraphicsWebView::setPage):
+        * Api/qwebview.cpp:
+        (QWebView::setPage):
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::FrameLoaderClientQt::setFrame):
+        * docs/webkitsnippets/qtwebkit_qwebinspector_snippet.cpp:
+        (wrapInFunction):
+        * tests/qwebframe/tst_qwebframe.cpp:
+        * tests/qwebpage/tst_qwebpage.cpp:
+        (tst_QWebPage::modified):
+        (tst_QWebPage::database):
+
 2009-11-18  Paul Olav Tvete  <paul.tvete@nokia.com>
 
         Reviewed by Simon Hausmann.
-- 
cgit v0.12


From 20594620667864c48745254abb54dbce442aa6f4 Mon Sep 17 00:00:00 2001
From: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
Date: Fri, 13 Nov 2009 18:09:23 +0100
Subject: Mac: remove superflucious call

The line removed in the patch is done so as a result of
change 639b9c0286f0f2d5e50121df8d4125f029074510. That change
made the interrupt do an extra round in the event dispatcher.
---
 src/gui/dialogs/qcolordialog_mac.mm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/gui/dialogs/qcolordialog_mac.mm b/src/gui/dialogs/qcolordialog_mac.mm
index 5f074c0..53d2e1e 100644
--- a/src/gui/dialogs/qcolordialog_mac.mm
+++ b/src/gui/dialogs/qcolordialog_mac.mm
@@ -336,7 +336,6 @@ QT_USE_NAMESPACE
         }
     }
 
-    QAbstractEventDispatcher::instance()->interrupt();
     if (mResultCode == NSCancelButton)
         mPriv->colorDialog()->reject();
     else
-- 
cgit v0.12


From 896d4a4d5c9f9dc3831a23b81d39ff00e6f6d33f Mon Sep 17 00:00:00 2001
From: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
Date: Sat, 14 Nov 2009 10:59:35 +0100
Subject: Cocoa: native dialogs might hang the application on close

This patch implements the same fix as
639b9c0286f0f2d5e50121df8d4125f029074510, but when someone spins
the event dispatcher manually (calling processEvents themselves).

Rev-By: MortenS
---
 src/gui/kernel/qeventdispatcher_mac.mm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/gui/kernel/qeventdispatcher_mac.mm b/src/gui/kernel/qeventdispatcher_mac.mm
index 427f0b0..e0eebfd 100644
--- a/src/gui/kernel/qeventdispatcher_mac.mm
+++ b/src/gui/kernel/qeventdispatcher_mac.mm
@@ -572,7 +572,7 @@ bool QEventDispatcherMac::processEvents(QEventLoop::ProcessEventsFlags flags)
                 while (!d->interrupt && [NSApp runModalSession:session] == NSRunContinuesResponse)
                     qt_mac_waitForMoreModalSessionEvents();
                 if (!d->interrupt && session == d->currentModalSessionCached) {
-                    // Someone called e.g. [NSApp stopModal:] from outside the event
+                    // INVARIANT: Someone called e.g. [NSApp stopModal:] from outside the event
                     // dispatcher (e.g to stop a native dialog). But that call wrongly stopped
                     // 'session' as well. As a result, we need to restart all internal sessions:
                     d->temporarilyStopAllModalSessions();
@@ -596,7 +596,13 @@ bool QEventDispatcherMac::processEvents(QEventLoop::ProcessEventsFlags flags)
                 if (NSModalSession session = d->currentModalSession()) {
                     if (flags & QEventLoop::WaitForMoreEvents)
                         qt_mac_waitForMoreModalSessionEvents();
-                    [NSApp runModalSession:session];
+                    NSInteger status = [NSApp runModalSession:session];
+                    if (status != NSRunContinuesResponse && session == d->currentModalSessionCached) {
+                        // INVARIANT: Someone called e.g. [NSApp stopModal:] from outside the event
+                        // dispatcher (e.g to stop a native dialog). But that call wrongly stopped
+                        // 'session' as well. As a result, we need to restart all internal sessions:
+                        d->temporarilyStopAllModalSessions();
+                    }
                     retVal = true;
                     break;
                 } else {
-- 
cgit v0.12


From 8644ff560002c4ae786e5b1f11450c1b1f80e7e8 Mon Sep 17 00:00:00 2001
From: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
Date: Mon, 23 Nov 2009 13:14:30 +0100
Subject: Mac: Make gestures available when building Qt against SDK < 10.6

We build the release packages for Carbon against the 10.4 SDK.
This means that the constants used for dealing with gestures are
missing, and currently the implementation will be ifdeffed out.
This patch defines these constants when building with an
SDK < 10.6. Gestures will therefore work when running applications
on 10.6. The same fix is also implemented for cocoa.

Rev-By: MortenS
---
 src/gui/kernel/qcocoaview_mac.mm |  8 ++++++--
 src/gui/kernel/qwidget_mac.mm    | 25 +++++++++++++++++++------
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/src/gui/kernel/qcocoaview_mac.mm b/src/gui/kernel/qcocoaview_mac.mm
index 72eedad..0445a16 100644
--- a/src/gui/kernel/qcocoaview_mac.mm
+++ b/src/gui/kernel/qcocoaview_mac.mm
@@ -64,12 +64,16 @@
 
 #include <qdebug.h>
 
-@interface NSEvent (DeviceDelta)
+@interface NSEvent (Qt_Compile_Leopard_DeviceDelta)
   - (CGFloat)deviceDeltaX;
   - (CGFloat)deviceDeltaY;
   - (CGFloat)deviceDeltaZ;
 @end
 
+@interface NSEvent (Qt_Compile_Leopard_Gestures)
+  - (CGFloat)magnification;
+@end
+
 QT_BEGIN_NAMESPACE
 
 Q_GLOBAL_STATIC(DnDParams, qMacDnDParams);
@@ -893,6 +897,7 @@ extern "C" {
     bool all = qwidget->testAttribute(Qt::WA_TouchPadAcceptSingleTouchEvents);
     qt_translateRawTouchEvent(qwidget, QTouchEvent::TouchPad, QCocoaTouch::getCurrentTouchPointList(event, all));
 }
+#endif // MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
 
 - (void)magnifyWithEvent:(NSEvent *)event;
 {
@@ -963,7 +968,6 @@ extern "C" {
     qNGEvent.position = flipPoint(p).toPoint();
     qt_sendSpontaneousEvent(qwidget, &qNGEvent);
 }
-#endif // MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
 
 - (void)frameDidChange:(NSNotification *)note
 {
diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm
index 71f0077..0d9f9ee 100644
--- a/src/gui/kernel/qwidget_mac.mm
+++ b/src/gui/kernel/qwidget_mac.mm
@@ -725,6 +725,23 @@ static OSWindowRef qt_mac_create_window(QWidget *, WindowClass wclass, WindowAtt
     return window;
 }
 
+#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6
+/* We build the release package against the 10.4 SDK.
+   So, to enable gestures for applications running on
+   10.6+, we define the missing constants here: */
+enum {
+    kEventClassGesture              = 'gest',
+    kEventGestureStarted            = 1,
+    kEventGestureEnded              = 2,
+    kEventGestureMagnify            = 4,
+    kEventGestureSwipe              = 5,
+    kEventGestureRotate             = 6,
+    kEventParamRotationAmount       = 'rota',
+    kEventParamSwipeDirection       = 'swip',
+    kEventParamMagnificationAmount  = 'magn'
+};
+#endif
+
 // window events
 static EventTypeSpec window_events[] = {
     { kEventClassWindow, kEventWindowClose },
@@ -741,13 +758,11 @@ static EventTypeSpec window_events[] = {
     { kEventClassWindow, kEventWindowGetRegion },
     { kEventClassWindow, kEventWindowGetClickModality },
     { kEventClassWindow, kEventWindowTransitionCompleted },
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
     { kEventClassGesture, kEventGestureStarted },
     { kEventClassGesture, kEventGestureEnded },
     { kEventClassGesture, kEventGestureMagnify },
     { kEventClassGesture, kEventGestureSwipe },
     { kEventClassGesture, kEventGestureRotate },
-#endif
     { kEventClassMouse, kEventMouseDown }
 };
 static EventHandlerUPP mac_win_eventUPP = 0;
@@ -1036,7 +1051,6 @@ OSStatus QWidgetPrivate::qt_window_event(EventHandlerCallRef er, EventRef event,
         handled_event = false;
         break; }
 
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
     case kEventClassGesture: {
         // First, find the widget that was under
         // the mouse when the gesture happened:
@@ -1064,7 +1078,7 @@ OSStatus QWidgetPrivate::qt_window_event(EventHandlerCallRef er, EventRef event,
                 break;
             case kEventGestureRotate: {
                 CGFloat amount;
-                if (GetEventParameter(event, kEventParamRotationAmount, typeCGFloat, 0,
+                if (GetEventParameter(event, kEventParamRotationAmount, 'cgfl', 0,
                             sizeof(amount), 0, &amount) != noErr) {
                     handled_event = false;
                     break;
@@ -1091,7 +1105,7 @@ OSStatus QWidgetPrivate::qt_window_event(EventHandlerCallRef er, EventRef event,
                 break; }
             case kEventGestureMagnify: {
                 CGFloat amount;
-                if (GetEventParameter(event, kEventParamMagnificationAmount, typeCGFloat, 0,
+                if (GetEventParameter(event, kEventParamMagnificationAmount, 'cgfl', 0,
                             sizeof(amount), 0, &amount) != noErr) {
                     handled_event = false;
                     break;
@@ -1103,7 +1117,6 @@ OSStatus QWidgetPrivate::qt_window_event(EventHandlerCallRef er, EventRef event,
 
         QApplication::sendSpontaneousEvent(widget, &qNGEvent);
     break; }
-#endif // gestures
 
     default:
         handled_event = false;
-- 
cgit v0.12


From 23002374d11598b26b6585e78dc073071a13f0ec Mon Sep 17 00:00:00 2001
From: Kent Hansen <kent.hansen@nokia.com>
Date: Mon, 23 Nov 2009 15:26:36 +0100
Subject: Don't crash in eval() function when QtScript debugger is attached

The built-in eval() function bypasses the script registration
performed by QScriptEngine::evaluate(), so if we get an
atStatement() callback from JSC from that script, the
scriptID-to-sourceProvider lookup will fail.

In this case, just return from atStatement() without delivering
the positionChange() callback to the QScriptEngineAgent, since
the agent will not have received the scriptLoad() callback for
that script anyway.

This is a change in behavior from 4.5, but we consider it
the minimum-impact fix at this point to keep 4.6.0 from
crashing. The only downside is that debugging will
effectively be "disabled" for the script passed to eval(),
but that's a lot better than crashing.

Task-number: QTBUG-6108
Reviewed-by: Jedrzej Nowacki
---
 src/script/api/qscriptengineagent.cpp              | 10 ++++++--
 .../qscriptengineagent/tst_qscriptengineagent.cpp  | 28 ++++++++++++++++++++++
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/src/script/api/qscriptengineagent.cpp b/src/script/api/qscriptengineagent.cpp
index e7998b7..a2af514 100644
--- a/src/script/api/qscriptengineagent.cpp
+++ b/src/script/api/qscriptengineagent.cpp
@@ -154,7 +154,10 @@ void QScriptEngineAgentPrivate::exceptionCatch(const JSC::DebuggerCallFrame& fra
 void QScriptEngineAgentPrivate::atStatement(const JSC::DebuggerCallFrame& frame, intptr_t sourceID, int lineno, int column)
 {
     QScript::UStringSourceProviderWithFeedback *source = engine->loadedScripts.value(sourceID);
-    Q_ASSERT(source != 0);
+    if (!source) {
+        // QTBUG-6108: We don't have the source for this script, so ignore.
+        return;
+    }
     column = source->columnNumberFromOffset(column);
     JSC::CallFrame *oldFrame = engine->currentFrame;
     int oldAgentLineNumber = engine->agentLineNumber;
@@ -183,7 +186,10 @@ void QScriptEngineAgentPrivate::didReachBreakpoint(const JSC::DebuggerCallFrame&
 {
     if (q_ptr->supportsExtension(QScriptEngineAgent::DebuggerInvocationRequest)) {
         QScript::UStringSourceProviderWithFeedback *source = engine->loadedScripts.value(sourceID);
-        Q_ASSERT(source != 0);
+        if (!source) {
+            // QTBUG-6108: We don't have the source for this script, so ignore.
+            return;
+        }
         column = source->columnNumberFromOffset(column);
         JSC::CallFrame *oldFrame = engine->currentFrame;
         int oldAgentLineNumber = engine->agentLineNumber;
diff --git a/tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp b/tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp
index 032c34b..77ccdb3 100644
--- a/tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp
+++ b/tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp
@@ -114,6 +114,7 @@ private slots:
     void evaluateProgram();
     void evaluateProgram_SyntaxError();
     void evaluateNullProgram();
+    void QTBUG6108();
 
 private:
     double m_testProperty;
@@ -2306,5 +2307,32 @@ void tst_QScriptEngineAgent::evaluateNullProgram()
     QCOMPARE(spy->count(), 0);
 }
 
+void tst_QScriptEngineAgent::QTBUG6108()
+{
+    QScriptEngine eng;
+    ScriptEngineSpy *spy = new ScriptEngineSpy(&eng);
+    eng.evaluate("eval('a = 1')");
+    QCOMPARE(spy->count(), 5);
+
+    QCOMPARE(spy->at(0).type, ScriptEngineEvent::ScriptLoad);
+    QVERIFY(spy->at(0).scriptId != -1);
+
+    QCOMPARE(spy->at(1).type, ScriptEngineEvent::FunctionEntry);
+    QVERIFY(spy->at(1).scriptId != -1);
+    QCOMPARE(spy->at(1).scriptId, spy->at(0).scriptId);
+
+    QCOMPARE(spy->at(2).type, ScriptEngineEvent::PositionChange);
+    QVERIFY(spy->at(2).scriptId != -1);
+    QCOMPARE(spy->at(2).scriptId, spy->at(0).scriptId);
+    QCOMPARE(spy->at(2).lineNumber, 1);
+
+    QCOMPARE(spy->at(3).type, ScriptEngineEvent::FunctionExit);
+    QVERIFY(spy->at(3).scriptId != -1);
+    QCOMPARE(spy->at(3).scriptId, spy->at(0).scriptId);
+
+    QCOMPARE(spy->at(4).type, ScriptEngineEvent::ScriptUnload);
+    QCOMPARE(spy->at(4).scriptId, spy->at(0).scriptId);
+}
+
 QTEST_MAIN(tst_QScriptEngineAgent)
 #include "tst_qscriptengineagent.moc"
-- 
cgit v0.12


From 1514917196835887c4d4c93cf2522d1a70285c16 Mon Sep 17 00:00:00 2001
From: Jens Bache-Wiig <jbache@trolltech.com>
Date: Mon, 23 Nov 2009 17:03:38 +0100
Subject: Fixes:    Fuzzy standard icons with Ubuntu Humanity theme Task:    
 QTBUG-6121 RevBy:    thorbjorn Details: This icon theme is a bit special in
 that it uses svg icons even for fixed size entries such as 16x16 icons. An
 optimization in the icon loader explicitly ignores svgs for such entries so
 we simply have to remove this check. In addition the actualSize had to be
 altered to never return a size bigger than the requested size. Otherwise
 certain menu elements will be bigger than intended.

---
 src/gui/image/qiconloader.cpp | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/gui/image/qiconloader.cpp b/src/gui/image/qiconloader.cpp
index 15af7a2..ad9bdd0 100644
--- a/src/gui/image/qiconloader.cpp
+++ b/src/gui/image/qiconloader.cpp
@@ -249,21 +249,19 @@ QThemeIconEntries QIconLoader::findIconHelper(const QString &themeName,
         const QIconDirInfo &dirInfo = subDirs.at(i);
         QString subdir = dirInfo.path;
         QDir currentDir(contentDir + subdir);
-
-        if (dirInfo.type == QIconDirInfo::Scalable && m_supportsSvg &&
-            currentDir.exists(iconName + svgext)) {
-            ScalableEntry *iconEntry = new ScalableEntry;
-            iconEntry->dir = dirInfo;
-            iconEntry->filename = currentDir.filePath(iconName + svgext);
-            entries.append(iconEntry);
-
-        } else if (currentDir.exists(iconName + pngext)) {
+        if (currentDir.exists(iconName + pngext)) {
             PixmapEntry *iconEntry = new PixmapEntry;
             iconEntry->dir = dirInfo;
             iconEntry->filename = currentDir.filePath(iconName + pngext);
             // Notice we ensure that pixmap entries allways come before
             // scalable to preserve search order afterwards
             entries.prepend(iconEntry);
+        } else if (m_supportsSvg &&
+            currentDir.exists(iconName + svgext)) {
+            ScalableEntry *iconEntry = new ScalableEntry;
+            iconEntry->dir = dirInfo;
+            iconEntry->filename = currentDir.filePath(iconName + svgext);
+            entries.append(iconEntry);
         }
     }
 
@@ -444,10 +442,8 @@ QIconLoaderEngineEntry *QIconLoaderEngine::entryForSize(const QSize &size)
 
 /*
  * Returns the actual icon size. For scalable svg's this is equivalent
- * to the requested size. Otherwise the closest match is returned.
- *
- * todo: the spec is a bit fuzzy in this area, but we should probably
- * allow scaling down pixmap icons as well.
+ * to the requested size. Otherwise the closest match is returned but
+ * we can never return a bigger size than the requested size.
  *
  */
 QSize QIconLoaderEngine::actualSize(const QSize &size, QIcon::Mode mode,
@@ -460,8 +456,10 @@ QSize QIconLoaderEngine::actualSize(const QSize &size, QIcon::Mode mode,
         const QIconDirInfo &dir = entry->dir;
         if (dir.type == QIconDirInfo::Scalable)
             return size;
-        else
-            return QSize(dir.size, dir.size);
+        else {
+            int result = qMin<int>(dir.size, qMin(size.width(), size.height()));
+            return QSize(result, result);
+        }
     }
     return QIconEngineV2::actualSize(size, mode, state);
 }
-- 
cgit v0.12


From 664b77d83677281cddcedd90f7c172d443523487 Mon Sep 17 00:00:00 2001
From: Kent Hansen <kent.hansen@nokia.com>
Date: Mon, 23 Nov 2009 18:36:14 +0100
Subject: Add references to JIRA tasks for expected test failures

These are behavioral differences between QtScript in 4.6 and 4.5,
and so should have tasks to figure out whether anyone actually
depend on the behavior.
---
 tests/auto/qscriptable/tst_qscriptable.cpp               | 2 +-
 tests/auto/qscriptcontext/tst_qscriptcontext.cpp         | 2 +-
 tests/auto/qscriptcontextinfo/tst_qscriptcontextinfo.cpp | 6 +++---
 tests/auto/qscriptengine/tst_qscriptengine.cpp           | 8 ++++----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/auto/qscriptable/tst_qscriptable.cpp b/tests/auto/qscriptable/tst_qscriptable.cpp
index 90f1db8..c0945d8 100644
--- a/tests/auto/qscriptable/tst_qscriptable.cpp
+++ b/tests/auto/qscriptable/tst_qscriptable.cpp
@@ -332,7 +332,7 @@ void tst_QScriptable::thisObject()
     {
         QVERIFY(!m_scriptable.oofThisObject().isValid());
         m_engine.evaluate("o.oof = 123");
-        QEXPECT_FAIL("", "Setter doesn't get called when it's in the prototype", Continue);
+        QEXPECT_FAIL("", "QTBUG-5749: Setter doesn't get called when it's in the prototype", Continue);
         QVERIFY(m_scriptable.oofThisObject().strictlyEquals(m_engine.evaluate("o")));
     }
     {
diff --git a/tests/auto/qscriptcontext/tst_qscriptcontext.cpp b/tests/auto/qscriptcontext/tst_qscriptcontext.cpp
index a0af214..4ecd887 100644
--- a/tests/auto/qscriptcontext/tst_qscriptcontext.cpp
+++ b/tests/auto/qscriptcontext/tst_qscriptcontext.cpp
@@ -1114,7 +1114,7 @@ void tst_QScriptContext::calledAsConstructor()
         QVERIFY(!fun3.property("calledAsConstructor").toBool());
         eng.evaluate("new test();");
         if (qt_script_isJITEnabled())
-            QEXPECT_FAIL("", "calledAsConstructor is not correctly set for JS functions when JIT is enabled", Continue);
+            QEXPECT_FAIL("", "QTBUG-6132: calledAsConstructor is not correctly set for JS functions when JIT is enabled", Continue);
         QVERIFY(fun3.property("calledAsConstructor").toBool());
     }
 
diff --git a/tests/auto/qscriptcontextinfo/tst_qscriptcontextinfo.cpp b/tests/auto/qscriptcontextinfo/tst_qscriptcontextinfo.cpp
index fe69c07..09ef820 100644
--- a/tests/auto/qscriptcontextinfo/tst_qscriptcontextinfo.cpp
+++ b/tests/auto/qscriptcontextinfo/tst_qscriptcontextinfo.cpp
@@ -249,13 +249,13 @@ void tst_QScriptContextInfo::qtFunction()
             QCOMPARE(info.functionEndLineNumber(), -1);
             QCOMPARE(info.functionStartLineNumber(), -1);
             if (x == 0)
-                QEXPECT_FAIL("", "QScriptContextInfo doesn't pick the correct meta-index for overloaded slots", Continue);
+                QEXPECT_FAIL("", "QTBUG-6133: QScriptContextInfo doesn't pick the correct meta-index for overloaded slots", Continue);
             QCOMPARE(info.functionParameterNames().size(), pnames.size());
             if (x == 0)
-                QEXPECT_FAIL("", "QScriptContextInfo doesn't pick the correct meta-index for overloaded slots", Continue);
+                QEXPECT_FAIL("", "QTBUG-6133: QScriptContextInfo doesn't pick the correct meta-index for overloaded slots", Continue);
             QCOMPARE(info.functionParameterNames(), pnames);
             if (x == 0)
-                QEXPECT_FAIL("", "QScriptContextInfo doesn't pick the correct meta-index for overloaded slots", Continue);
+                QEXPECT_FAIL("", "QTBUG-6133: QScriptContextInfo doesn't pick the correct meta-index for overloaded slots", Continue);
             QCOMPARE(info.functionMetaIndex(), metaObject()->indexOfMethod(sig));
         }
 
diff --git a/tests/auto/qscriptengine/tst_qscriptengine.cpp b/tests/auto/qscriptengine/tst_qscriptengine.cpp
index 8eaad78..0887a68 100644
--- a/tests/auto/qscriptengine/tst_qscriptengine.cpp
+++ b/tests/auto/qscriptengine/tst_qscriptengine.cpp
@@ -1148,7 +1148,7 @@ void tst_QScriptEngine::globalObjectProperties()
         QScriptValue::PropertyFlags flags = QScriptValue::ReadOnly | QScriptValue::SkipInEnumeration;
         global.setProperty(name, val, flags);
         QVERIFY(global.property(name).equals(val));
-        QEXPECT_FAIL("", "custom Global Object properties don't retain attributes", Continue);
+        QEXPECT_FAIL("", "QTBUG-6134: custom Global Object properties don't retain attributes", Continue);
         QCOMPARE(global.propertyFlags(name), flags);
         global.setProperty(name, QScriptValue());
         QVERIFY(!global.property(name).isValid());
@@ -2033,7 +2033,7 @@ void tst_QScriptEngine::valueConversion()
         QScriptValue val = qScriptValueFromValue(&eng, in);
         QVERIFY(val.isRegExp());
         QRegExp out = val.toRegExp();
-        QEXPECT_FAIL("", "JSC-based back-end doesn't preserve QRegExp::patternSyntax (always uses RegExp2)", Continue);
+        QEXPECT_FAIL("", "QTBUG-6136: JSC-based back-end doesn't preserve QRegExp::patternSyntax (always uses RegExp2)", Continue);
         QCOMPARE(out.patternSyntax(), in.patternSyntax());
         QCOMPARE(out.pattern(), in.pattern());
         QCOMPARE(out.caseSensitivity(), in.caseSensitivity());
@@ -2050,7 +2050,7 @@ void tst_QScriptEngine::valueConversion()
         in.setMinimal(true);
         QScriptValue val = qScriptValueFromValue(&eng, in);
         QVERIFY(val.isRegExp());
-        QEXPECT_FAIL("", "JSC-based back-end doesn't preserve QRegExp::minimal (always false)", Continue);
+        QEXPECT_FAIL("", "QTBUG-6136: JSC-based back-end doesn't preserve QRegExp::minimal (always false)", Continue);
         QCOMPARE(val.toRegExp().isMinimal(), in.isMinimal());
     }
 }
@@ -3045,7 +3045,7 @@ void tst_QScriptEngine::errorConstructors()
             eng.clearExceptions();
             QVERIFY(ret.toString().startsWith(name));
             if (x != 0)
-                QEXPECT_FAIL("", "JSC doesn't assign lineNumber when errors are not thrown", Continue);
+                QEXPECT_FAIL("", "QTBUG-6138: JSC doesn't assign lineNumber when errors are not thrown", Continue);
             QCOMPARE(ret.property("lineNumber").toInt32(), i+2);
         }
     }
-- 
cgit v0.12


From 0ea7b40128bde00868bbab040b337fbc59cc0287 Mon Sep 17 00:00:00 2001
From: Kent Hansen <kent.hansen@nokia.com>
Date: Mon, 23 Nov 2009 20:00:21 +0100
Subject: Add reference to JIRA task for expected test failure

---
 tests/auto/qscriptengine/tst_qscriptengine.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/auto/qscriptengine/tst_qscriptengine.cpp b/tests/auto/qscriptengine/tst_qscriptengine.cpp
index 0887a68..3505b5d 100644
--- a/tests/auto/qscriptengine/tst_qscriptengine.cpp
+++ b/tests/auto/qscriptengine/tst_qscriptengine.cpp
@@ -2505,7 +2505,7 @@ void tst_QScriptEngine::stacktrace()
     QVERIFY(eng.hasUncaughtException());
     QVERIFY(result.isError());
 
-    QEXPECT_FAIL("", "", Abort);
+    QEXPECT_FAIL("", "QTBUG-6139: uncaughtExceptionBacktrace() doesn't give the full backtrace", Abort);
     QCOMPARE(eng.uncaughtExceptionBacktrace(), backtrace);
     QVERIFY(eng.hasUncaughtException());
     QVERIFY(result.strictlyEquals(eng.uncaughtException()));
-- 
cgit v0.12


From cf89e30f6885efb4b63f01e4459f8b277cb52113 Mon Sep 17 00:00:00 2001
From: Kent Hansen <kent.hansen@nokia.com>
Date: Mon, 23 Nov 2009 20:04:52 +0100
Subject: update autotest to match 4.6 behavior

In 4.6 the Global Object no longer has an arguments property
with undefined value; there should be no such property.
---
 tests/auto/qscriptengine/tst_qscriptengine.cpp | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/tests/auto/qscriptengine/tst_qscriptengine.cpp b/tests/auto/qscriptengine/tst_qscriptengine.cpp
index 3505b5d..3bc2443 100644
--- a/tests/auto/qscriptengine/tst_qscriptengine.cpp
+++ b/tests/auto/qscriptengine/tst_qscriptengine.cpp
@@ -3063,14 +3063,19 @@ void tst_QScriptEngine::argumentsProperty()
 {
     {
         QScriptEngine eng;
-        QEXPECT_FAIL("", "", Continue);
-        QVERIFY(eng.evaluate("arguments").isUndefined());
+        {
+            QScriptValue ret = eng.evaluate("arguments");
+            QVERIFY(ret.isError());
+            QCOMPARE(ret.toString(), QString::fromLatin1("ReferenceError: Can't find variable: arguments"));
+        }
         eng.evaluate("arguments = 10");
-        QScriptValue ret = eng.evaluate("arguments");
-        QVERIFY(ret.isNumber());
-        QCOMPARE(ret.toInt32(), 10);
-        QEXPECT_FAIL("", "", Continue);
-        QVERIFY(!eng.evaluate("delete arguments").toBoolean());
+        {
+            QScriptValue ret = eng.evaluate("arguments");
+            QVERIFY(ret.isNumber());
+            QCOMPARE(ret.toInt32(), 10);
+        }
+        QVERIFY(eng.evaluate("delete arguments").toBoolean());
+        QVERIFY(!eng.globalObject().property("arguments").isValid());
     }
     {
         QScriptEngine eng;
@@ -3081,11 +3086,11 @@ void tst_QScriptEngine::argumentsProperty()
     }
     {
         QScriptEngine eng;
+        QVERIFY(!eng.globalObject().property("arguments").isValid());
         QScriptValue ret = eng.evaluate("(function() { arguments = 456; return arguments; })()");
         QVERIFY(ret.isNumber());
         QCOMPARE(ret.toInt32(), 456);
-        QEXPECT_FAIL("", "", Continue);
-        QVERIFY(eng.evaluate("arguments").isUndefined());
+        QVERIFY(!eng.globalObject().property("arguments").isValid());
     }
 
     {
-- 
cgit v0.12


From 8d4238fa695ed4998692c7cee861df0470a5cc06 Mon Sep 17 00:00:00 2001
From: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
Date: Tue, 24 Nov 2009 09:51:11 +0100
Subject: Namespace build fails for webkit example

Forward declarations outside namespace scope will
fail in this case.

Reviewed-by: brad
---
 examples/webkit/domtraversal/window.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/examples/webkit/domtraversal/window.h b/examples/webkit/domtraversal/window.h
index 5988df9..2795976 100644
--- a/examples/webkit/domtraversal/window.h
+++ b/examples/webkit/domtraversal/window.h
@@ -46,7 +46,9 @@
 #include <QUrl>
 #include <QWebElement>
 
+QT_BEGIN_NAMESPACE
 class QTreeWidgetItem;
+QT_END_NAMESPACE
 
 //! [Window class definition]
 #include "ui_window.h"
-- 
cgit v0.12


From 32ea1aedcf1f588da1ac112bb615088d954b84e1 Mon Sep 17 00:00:00 2001
From: Markus Goetz <Markus.Goetz@nokia.com>
Date: Fri, 20 Nov 2009 14:21:15 +0100
Subject: Fix QWindowsSystemProxy::init

Seems like WinHttpGetIEProxyConfigForCurrentUser can return more
than one proxy even if this is not documented.

Task-number: QTBUG-5981
Reviewed-by: Peter Hartmann
---
 src/network/kernel/qnetworkproxy_win.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/network/kernel/qnetworkproxy_win.cpp b/src/network/kernel/qnetworkproxy_win.cpp
index 6f92424..0e2dd2b 100644
--- a/src/network/kernel/qnetworkproxy_win.cpp
+++ b/src/network/kernel/qnetworkproxy_win.cpp
@@ -291,7 +291,10 @@ void QWindowsSystemProxy::init()
             GlobalFree(ieProxyConfig.lpszAutoConfigUrl);
         }
         if (ieProxyConfig.lpszProxy) {
-            proxyServerList << QString::fromWCharArray(ieProxyConfig.lpszProxy);
+            // http://msdn.microsoft.com/en-us/library/aa384250%28VS.85%29.aspx speaks only about a "proxy URL",
+            // not multiple URLs. However we tested this and it can return multiple URLs. So we use splitSpaceSemicolon
+            // on it.
+            proxyServerList = splitSpaceSemicolon(QString::fromWCharArray(ieProxyConfig.lpszProxy));
             GlobalFree(ieProxyConfig.lpszProxy);
         }
         if (ieProxyConfig.lpszProxyBypass) {
-- 
cgit v0.12


From 8010d279fa9ee4c47bd4c1fb2cc50ad9ca08f945 Mon Sep 17 00:00:00 2001
From: Markus Goetz <Markus.Goetz@nokia.com>
Date: Tue, 24 Nov 2009 10:37:15 +0100
Subject: Fix accept call in q3process

Use QT_SOCKLEN_T like we do on all other places
where accept() is called.

Task-number: QTBUG-6141
Reviewed-by: mstormo
---
 src/qt3support/other/q3process_unix.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/qt3support/other/q3process_unix.cpp b/src/qt3support/other/q3process_unix.cpp
index 955b65f..32a68e0 100644
--- a/src/qt3support/other/q3process_unix.cpp
+++ b/src/qt3support/other/q3process_unix.cpp
@@ -249,7 +249,7 @@ int qnx6SocketPairReplacement (int socketFD[2]) {
 	if (errno != EINPROGRESS) { BAILOUT };
 
     // Accept connection
-    socketFD[0] = accept(tmpSocket, (struct sockaddr *)NULL, (size_t *)NULL);
+    socketFD[0] = accept(tmpSocket, (struct sockaddr *)NULL, (QT_SOCKLEN_T *)NULL);
     if(socketFD[0] == -1) { BAILOUT };
 
     // We're done
-- 
cgit v0.12


From 0d20ec8604b318ceafd6c35dfe1d73519bf024d3 Mon Sep 17 00:00:00 2001
From: Peter Hartmann <peter.hartmann@nokia.com>
Date: Tue, 24 Nov 2009 10:16:13 +0100
Subject: QNetworkCookieJar: don't do path checking when receiving cookies

Actually, the RFC 2109 says cookies should not be stored if the path
attribute is not a prefix of the request URI the cookie comes from.
However, all browsers allow it anyway; with the demo browser e.g.
logging in to wordpress.com was not possible.
We still do path checking when sending cookies, i.e. in
QNetworkCookieJar::cookiesForUrl().

Reviewed-by: Markus Goetz
Task-number: QTBUG-5815
---
 src/network/access/qnetworkcookiejar.cpp           |  7 ++++---
 .../qnetworkcookiejar/tst_qnetworkcookiejar.cpp    | 23 ++++++++++++++++++++--
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/src/network/access/qnetworkcookiejar.cpp b/src/network/access/qnetworkcookiejar.cpp
index 19f7217..f826115 100644
--- a/src/network/access/qnetworkcookiejar.cpp
+++ b/src/network/access/qnetworkcookiejar.cpp
@@ -192,9 +192,10 @@ bool QNetworkCookieJar::setCookiesFromUrl(const QList<QNetworkCookie> &cookieLis
         // validate the cookie & set the defaults if unset
         if (cookie.path().isEmpty())
             cookie.setPath(defaultPath);
-        else if (!isParentPath(pathAndFileName, cookie.path()))
-            continue;           // not accepted
-
+        // don't do path checking. See http://bugreports.qt.nokia.com/browse/QTBUG-5815
+//        else if (!isParentPath(pathAndFileName, cookie.path())) {
+//            continue;           // not accepted
+//        }
         if (cookie.domain().isEmpty()) {
             cookie.setDomain(defaultDomain);
         } else {
diff --git a/tests/auto/qnetworkcookiejar/tst_qnetworkcookiejar.cpp b/tests/auto/qnetworkcookiejar/tst_qnetworkcookiejar.cpp
index ff7e78e..b52c515 100644
--- a/tests/auto/qnetworkcookiejar/tst_qnetworkcookiejar.cpp
+++ b/tests/auto/qnetworkcookiejar/tst_qnetworkcookiejar.cpp
@@ -168,13 +168,16 @@ void tst_QNetworkCookieJar::setCookiesFromUrl_data()
     cookie.setDomain("something.completely.different");
     QTest::newRow("security-domain-1") << preset << cookie << "http://www.foo.tld" << result << false;
 
-    cookie.setDomain("www.foo.tld");
+    // we want the cookie to be accepted although the path does not match, see QTBUG-5815
+    cookie.setDomain(".foo.tld");
     cookie.setPath("/something");
-    QTest::newRow("security-path-1") << preset << cookie << "http://www.foo.tld" << result << false;
+    result += cookie;
+    QTest::newRow("security-path-1") << preset << cookie << "http://www.foo.tld" << result << true;
 
     // setting the defaults:
     finalCookie = cookie;
     finalCookie.setPath("/something/");
+    finalCookie.setDomain("www.foo.tld");
     cookie.setPath("");
     cookie.setDomain("");
     result.clear();
@@ -285,6 +288,22 @@ void tst_QNetworkCookieJar::cookiesForUrl_data()
     QTest::newRow("exp-match-4") << allCookies << "http://qt.nokia.com/web" << result;
     QTest::newRow("exp-match-4") << allCookies << "http://qt.nokia.com/web/" << result;
     QTest::newRow("exp-match-6") << allCookies << "http://qt.nokia.com/web/content" << result;
+
+    // path matching
+    allCookies.clear();
+    QNetworkCookie anotherCookie;
+    anotherCookie.setName("a");
+    anotherCookie.setPath("/web");
+    anotherCookie.setDomain(".nokia.com");
+    allCookies += anotherCookie;
+    result.clear();
+    QTest::newRow("path-unmatch-1") << allCookies << "http://nokia.com/" << result;
+    QTest::newRow("path-unmatch-2") << allCookies << "http://nokia.com/something/else" << result;
+    result += anotherCookie;
+    QTest::newRow("path-match-1") << allCookies << "http://nokia.com/web" << result;
+    QTest::newRow("path-match-2") << allCookies << "http://nokia.com/web/" << result;
+    QTest::newRow("path-match-3") << allCookies << "http://nokia.com/web/content" << result;
+
 }
 
 void tst_QNetworkCookieJar::cookiesForUrl()
-- 
cgit v0.12


From ac48a6c4f360631e83841be24113d7da495aae4b Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Tue, 24 Nov 2009 11:11:27 +0100
Subject: Fix build on AIX: all of the .a file is linked into the program.

The qlibraryinfo.cpp is only needed by lrelease. It has a hack for
qmake_libraryInfoFile(), which doesn't work on AIX. So don't put
qlibraryinfo.cpp in libbootstrap.a, but instead build directly for
lrelease.

Reviewed-by: thiago
---
 src/tools/bootstrap/bootstrap.pro    | 10 +++-------
 tools/linguist/lrelease/lrelease.pro |  7 +++++++
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro
index 722981c..0dbb90f 100644
--- a/src/tools/bootstrap/bootstrap.pro
+++ b/src/tools/bootstrap/bootstrap.pro
@@ -30,8 +30,7 @@ win32:DEFINES += QT_NODLL
 
 INCLUDEPATH += $$QT_BUILD_TREE/include \
             $$QT_BUILD_TREE/include/QtCore \
-            $$QT_BUILD_TREE/include/QtXml \
-            $$QT_BUILD_TREE/src/corelib/global   # qlibraryinfo.cpp includes qconfig.cpp
+            $$QT_BUILD_TREE/include/QtXml
 
 DEPENDPATH += $$INCLUDEPATH \
               ../../corelib/global \
@@ -49,7 +48,6 @@ SOURCES += \
            ../../corelib/codecs/qtsciicodec.cpp \
            ../../corelib/codecs/qutfcodec.cpp \
            ../../corelib/global/qglobal.cpp \
-           ../../corelib/global/qlibraryinfo.cpp \
            ../../corelib/global/qmalloc.cpp \
            ../../corelib/global/qnumeric.cpp \
            ../../corelib/io/qabstractfileengine.cpp \
@@ -65,7 +63,6 @@ SOURCES += \
            ../../corelib/io/qtemporaryfile.cpp \
            ../../corelib/io/qtextstream.cpp \
            ../../corelib/io/qurl.cpp \
-           ../../corelib/io/qsettings.cpp \
            ../../corelib/kernel/qmetatype.cpp \
            ../../corelib/kernel/qvariant.cpp \
            ../../corelib/tools/qbitarray.cpp \
@@ -90,12 +87,11 @@ unix:SOURCES += ../../corelib/io/qfsfileengine_unix.cpp \
                 ../../corelib/io/qfsfileengine_iterator_unix.cpp
 
 win32:SOURCES += ../../corelib/io/qfsfileengine_win.cpp \
-                 ../../corelib/io/qfsfileengine_iterator_win.cpp \
-                 ../../corelib/io/qsettings_win.cpp
+                 ../../corelib/io/qfsfileengine_iterator_win.cpp
 
 macx: {
    QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4 #enables weak linking for 10.4 (exported)
-   SOURCES += ../../corelib/kernel/qcore_mac.cpp ../../corelib/io/qsettings_mac.cpp
+   SOURCES += ../../corelib/kernel/qcore_mac.cpp
    LIBS += -framework CoreServices
 }
 
diff --git a/tools/linguist/lrelease/lrelease.pro b/tools/linguist/lrelease/lrelease.pro
index e4c18ee..b13c03e 100644
--- a/tools/linguist/lrelease/lrelease.pro
+++ b/tools/linguist/lrelease/lrelease.pro
@@ -5,6 +5,13 @@ DESTDIR         = ../../../bin
 DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII
 SOURCES += main.cpp
 
+INCLUDEPATH += $$QT_BUILD_TREE/src/corelib/global # qlibraryinfo.cpp includes qconfig.cpp
+SOURCES += \
+    $$QT_SOURCE_TREE/src/corelib/global/qlibraryinfo.cpp \
+    $$QT_SOURCE_TREE/src/corelib/io/qsettings.cpp
+win32:SOURCES += $$QT_SOURCE_TREE/src/corelib/io/qsettings_win.cpp
+macx:SOURCES += $$QT_SOURCE_TREE/src/corelib/io/qsettings_mac.cpp
+
 include(../../../src/tools/bootstrap/bootstrap.pri)
 include(../shared/formats.pri)
 include(../shared/proparser.pri)
-- 
cgit v0.12


From a0c8e134a284d45520dd3a229e68dbcd155299e6 Mon Sep 17 00:00:00 2001
From: Jason Barron <jbarron@trolltech.com>
Date: Tue, 24 Nov 2009 15:52:38 +0100
Subject: Fix softkeys for QDialogButtonBoxes created without a parent.

Inthe case where a QDialogButtonBox was created without a parent, for
example in the FTP example, the softkeys that are automatically created
inside the button box were not being added to the right widget when the
button box was given a parent (or added to a layout) later.

This patch resolves that issue by handling the ParentChange event and
then adding the softkeys at this point.

Task-number: QTBUG-6086
Reviewed-by: axis
---
 src/gui/widgets/qdialogbuttonbox.cpp               | 24 +++++++++
 .../auto/qdialogbuttonbox/tst_qdialogbuttonbox.cpp | 60 ++++++++++++++++------
 2 files changed, 68 insertions(+), 16 deletions(-)

diff --git a/src/gui/widgets/qdialogbuttonbox.cpp b/src/gui/widgets/qdialogbuttonbox.cpp
index 2ee5751..0e859f1 100644
--- a/src/gui/widgets/qdialogbuttonbox.cpp
+++ b/src/gui/widgets/qdialogbuttonbox.cpp
@@ -1215,6 +1215,30 @@ bool QDialogButtonBox::event(QEvent *event)
     }else if (event->type() == QEvent::LanguageChange) {
         d->retranslateStrings();
     }
+#ifdef QT_SOFTKEYS_ENABLED
+    else if (event->type() == QEvent::ParentChange) {
+        QWidget *dialog = 0;
+        QWidget *p = this;
+        while (p && !p->isWindow()) {
+            p = p->parentWidget();
+            if ((dialog = qobject_cast<QDialog *>(p)))
+                break;
+        }
+
+        // If the parent changes, then move the softkeys
+        for (QHash<QAbstractButton *, QAction *>::const_iterator it = d->softKeyActions.constBegin();
+            it != d->softKeyActions.constEnd(); ++it) {
+            QAction *current = it.value();
+            QList<QWidget *> widgets = current->associatedWidgets();
+            foreach (QWidget *w, widgets)
+                w->removeAction(current);
+            if (dialog)
+                dialog->addAction(current);
+            else
+                addAction(current);
+        }
+    }
+#endif
 
     return QWidget::event(event);
 }
diff --git a/tests/auto/qdialogbuttonbox/tst_qdialogbuttonbox.cpp b/tests/auto/qdialogbuttonbox/tst_qdialogbuttonbox.cpp
index 936ebf7..2c49fc8 100644
--- a/tests/auto/qdialogbuttonbox/tst_qdialogbuttonbox.cpp
+++ b/tests/auto/qdialogbuttonbox/tst_qdialogbuttonbox.cpp
@@ -111,6 +111,9 @@ private slots:
     void testDefaultButton_data();
     void testDefaultButton();
     void testS60SoftKeys();
+#ifdef QT_SOFTKEYS_ENABLED
+    void testSoftKeyReparenting();
+#endif
 
     void task191642_default();
 private:
@@ -715,6 +718,17 @@ void tst_QDialogButtonBox::testDefaultButton_data()
     QTest::newRow("third accept explicit after add") << 0 << 2 << 2;
 }
 
+static int softKeyCount(QWidget *widget)
+{
+    int softkeyCount = 0;
+    QList<QAction *> actions = widget->actions();
+    foreach (QAction *action, actions) {
+        if (action->softKeyRole() != QAction::NoSoftKey)
+            softkeyCount++;
+    }
+    return softkeyCount;
+}
+
 void tst_QDialogButtonBox::testS60SoftKeys()
 {
 #ifdef Q_WS_S60
@@ -722,33 +736,47 @@ void tst_QDialogButtonBox::testS60SoftKeys()
     QDialogButtonBox buttonBox(&dialog);
     buttonBox.setStandardButtons(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
     dialog.show();
-    
-    int softkeyCount = 0;
-    QList<QAction *> actions = dialog.actions();
-    foreach (QAction *action, actions) {
-        if (action->softKeyRole() != QAction::NoSoftKey)
-            softkeyCount++;
-    }
-    QCOMPARE( softkeyCount, 2);
+
+    QCOMPARE( softKeyCount(&dialog), 2);
 
     QDialog dialog2(0);
     QDialogButtonBox buttonBox2(&dialog2);
     buttonBox2.setStandardButtons(QDialogButtonBox::Cancel);
     dialog2.show();
 
-    int softkeyCount2 = 0;
-    QList<QAction *> actions2 = dialog2.actions();
-    foreach (QAction *action, actions2) {
-        if (action->softKeyRole() != QAction::NoSoftKey)
-            softkeyCount2++;
-    }
-    QCOMPARE( softkeyCount2, 1);
-    
+    QCOMPARE( softKeyCount(&dialog2), 1);
+
 #else
     QSKIP("S60-specific test", SkipAll );
 #endif
 }
 
+#ifdef QT_SOFTKEYS_ENABLED
+void tst_QDialogButtonBox::testSoftKeyReparenting()
+{
+    QDialog dialog;
+    QDialogButtonBox *buttonBox = new QDialogButtonBox;
+    buttonBox->addButton(QDialogButtonBox::Ok);
+    buttonBox->addButton(QDialogButtonBox::Cancel);
+
+    QCOMPARE(softKeyCount(&dialog), 0);
+    QCOMPARE(softKeyCount(buttonBox), 2);
+
+    // Were the softkeys re-parented correctly?
+    dialog.setLayout(new QVBoxLayout);
+    dialog.layout()->addWidget(buttonBox);
+    QCOMPARE(softKeyCount(&dialog), 2);
+    QCOMPARE(softKeyCount(buttonBox), 0);
+
+    // Softkeys are only added to QDialog, not QWidget
+    QWidget *nested = new QWidget;
+    nested->setLayout(new QVBoxLayout);
+    nested->layout()->addWidget(buttonBox);
+    QCOMPARE(softKeyCount(nested), 0);
+    QCOMPARE(softKeyCount(buttonBox), 2);
+}
+#endif
+
 void tst_QDialogButtonBox::testDefaultButton()
 {
     QFETCH(int, whenToSetDefault);
-- 
cgit v0.12


From 80e9b7cdeeb1b1e85e724b4ed1903e0923005c79 Mon Sep 17 00:00:00 2001
From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Wed, 25 Nov 2009 10:16:26 +1000
Subject: Fix links to docs in INSTALL and README

The names of the doc directories on the doc site don't include the patch
version number.

Task-number: QTBUG-6043
Reviewed-by: Trust Me
---
 INSTALL     | 14 +++++++-------
 dist/README |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/INSTALL b/INSTALL
index b62f21d..7279f06 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,14 +1,14 @@
         INSTALLING Qt Source Package Version %VERSION%.
 
 For full installation instructions for each supported platform, please
-see http://qt.nokia.com/doc/%VERSION%/installation.html, the file 
+see http://qt.nokia.com/doc/%SHORTVERSION%/installation.html, the file 
 doc/html/installation.html in this package, or follow one of the following
 links:
 
-Embedded Linux:   http://qt.nokia.com/doc/%VERSION%/qt-embedded-install.html
-Mac OS X:         http://qt.nokia.com/doc/%VERSION%/install-mac.html
-Windows:          http://qt.nokia.com/doc/%VERSION%/install-win.html
-Windows CE:       http://qt.nokia.com/doc/%VERSION%/install-wince.html
-X11 Platforms:    http://qt.nokia.com/doc/%VERSION%/install-x11.html
-Symbian Platform: http://qt.nokia.com/doc/%VERSION%/install-symbian.html
+Embedded Linux:   http://qt.nokia.com/doc/%SHORTVERSION%/qt-embedded-install.html
+Mac OS X:         http://qt.nokia.com/doc/%SHORTVERSION%/install-mac.html
+Windows:          http://qt.nokia.com/doc/%SHORTVERSION%/install-win.html
+Windows CE:       http://qt.nokia.com/doc/%SHORTVERSION%/install-wince.html
+X11 Platforms:    http://qt.nokia.com/doc/%SHORTVERSION%/install-x11.html
+Symbian Platform: http://qt.nokia.com/doc/%SHORTVERSION%/install-symbian.html
 
diff --git a/dist/README b/dist/README
index 529d2bd..e7dfb19 100644
--- a/dist/README
+++ b/dist/README
@@ -52,7 +52,7 @@ documentation is available at http://qt.nokia.com/doc/.
 SUPPORTED PLATFORMS
 
 For a complete list of supported platforms, see
-http://qt.nokia.com/doc/%VERSION%/supported-platforms.html.
+http://qt.nokia.com/doc/%SHORTVERSION%/supported-platforms.html.
 
 
 COMMERCIAL EDITIONS
@@ -65,7 +65,7 @@ the QtCore, QtGui (except QGraphicsView), QtTest, QtDBus and
 Qt3Support modules.
 
 For a full listing of the contents of each module, please refer to 
-http://qt.nokia.com/doc/%VERSION%/modules.html
+http://qt.nokia.com/doc/%SHORTVERSION%/modules.html
 
 
 HOW TO REPORT A BUG
-- 
cgit v0.12


From c71c46430317b70e784f0952d0aac048775ad842 Mon Sep 17 00:00:00 2001
From: Olivier Goffart <ogoffart@trolltech.com>
Date: Tue, 24 Nov 2009 09:34:48 +0100
Subject: Fix QFile::map in Linux 64bit

On 64bit, qint64(size_t(-1)) = -1

Reviewed-by: Joao
Reviewed-by: Thiago
(cherry picked from commit 829d9e10ad3d26fb2fddef01c8e36352018c3fec)
---
 src/corelib/io/qfsfileengine_unix.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/corelib/io/qfsfileengine_unix.cpp b/src/corelib/io/qfsfileengine_unix.cpp
index 35737b3..8cbf6a3 100644
--- a/src/corelib/io/qfsfileengine_unix.cpp
+++ b/src/corelib/io/qfsfileengine_unix.cpp
@@ -1245,7 +1245,7 @@ uchar *QFSFileEnginePrivate::map(qint64 offset, qint64 size, QFile::MemoryMapFla
     }
 
     if (offset < 0 || offset != qint64(QT_OFF_T(offset))
-            || size < 0 || size > qint64(size_t(-1))) {
+            || size < 0 || quint64(size) > quint64(size_t(-1))) {
         q->setError(QFile::UnspecifiedError, qt_error_string(int(EINVAL)));
         return 0;
     }
-- 
cgit v0.12


From 106121a74bca32a6411b9ca968ee415f8bdfbff1 Mon Sep 17 00:00:00 2001
From: Denis Dzyubenko <denis.dzyubenko@nokia.com>
Date: Mon, 23 Nov 2009 17:56:03 +0100
Subject: Fixes implicit grabbing in Qt/Cocoa

When delivering mouse events in Qt/Cocoa set the implicit mouse grabber and
deliver the event to it and do not try to propagate the event to the parent
view.

Reviewed-by: Prasanth
(cherry picked from commit aae81f370f6afede95064bc75eb7ee6ac13b1c30)
---
 src/gui/kernel/qcocoaview_mac.mm       | 51 ++++++++++++++--------------------
 src/gui/kernel/qt_cocoa_helpers_mac.mm |  8 ++++++
 2 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/src/gui/kernel/qcocoaview_mac.mm b/src/gui/kernel/qcocoaview_mac.mm
index 72eedad..bf6bf4a 100644
--- a/src/gui/kernel/qcocoaview_mac.mm
+++ b/src/gui/kernel/qcocoaview_mac.mm
@@ -79,6 +79,7 @@ extern bool qt_sendSpontaneousEvent(QObject *, QEvent *); // qapplication.cpp
 extern OSViewRef qt_mac_nativeview_for(const QWidget *w); // qwidget_mac.mm
 extern const QStringList& qEnabledDraggedTypes(); // qmime_mac.cpp
 extern QPointer<QWidget> qt_mouseover; //qapplication_mac.mm
+extern QPointer<QWidget> qt_button_down; //qapplication_mac.cpp
 
 Qt::MouseButton cocoaButton2QtButton(NSInteger buttonNum)
 {
@@ -691,6 +692,9 @@ extern "C" {
 
 - (void)mouseDown:(NSEvent *)theEvent
 {
+    if (!qt_button_down)
+        qt_button_down = qwidget;
+
     qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseButtonPress, Qt::LeftButton);
     // Don't call super here. This prevents us from getting the mouseUp event,
     // which we need to send even if the mouseDown event was not accepted.
@@ -700,75 +704,62 @@ extern "C" {
 
 - (void)mouseUp:(NSEvent *)theEvent
 {
-    bool mouseOK = qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseButtonRelease, Qt::LeftButton);
+    qt_button_down = 0;
 
-    if (!mouseOK)
-        [super mouseUp:theEvent];
+    qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseButtonRelease, Qt::LeftButton);
 }
 
 - (void)rightMouseDown:(NSEvent *)theEvent
 {
-    bool mouseOK = qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseButtonPress, Qt::RightButton);
+    if (!qt_button_down)
+        qt_button_down = qwidget;
 
-    if (!mouseOK)
-        [super rightMouseDown:theEvent];
+    qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseButtonPress, Qt::RightButton);
 }
 
 - (void)rightMouseUp:(NSEvent *)theEvent
 {
-    bool mouseOK = qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseButtonRelease, Qt::RightButton);
+    qt_button_down = 0;
 
-    if (!mouseOK)
-        [super rightMouseUp:theEvent];
+    qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseButtonRelease, Qt::RightButton);
 }
 
 - (void)otherMouseDown:(NSEvent *)theEvent
 {
-    Qt::MouseButton mouseButton = cocoaButton2QtButton([theEvent buttonNumber]);
-    bool mouseOK = qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseButtonPress, mouseButton);
+    if (!qt_button_down)
+        qt_button_down = qwidget;
 
-    if (!mouseOK)
-        [super otherMouseDown:theEvent];
+    Qt::MouseButton mouseButton = cocoaButton2QtButton([theEvent buttonNumber]);
+    qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseButtonPress, mouseButton);
 }
 
 - (void)otherMouseUp:(NSEvent *)theEvent
 {
-    Qt::MouseButton mouseButton = cocoaButton2QtButton([theEvent buttonNumber]);
-    bool mouseOK = qt_mac_handleMouseEvent(self, theEvent,  QEvent::MouseButtonRelease, mouseButton);
-
-    if (!mouseOK)
-        [super otherMouseUp:theEvent];
+    qt_button_down = 0;
 
+    Qt::MouseButton mouseButton = cocoaButton2QtButton([theEvent buttonNumber]);
+    qt_mac_handleMouseEvent(self, theEvent,  QEvent::MouseButtonRelease, mouseButton);
 }
 
 - (void)mouseDragged:(NSEvent *)theEvent
 {
     qMacDnDParams()->view = self;
     qMacDnDParams()->theEvent = theEvent;
-    bool mouseOK = qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseMove, Qt::NoButton);
-
-    if (!mouseOK)
-        [super mouseDragged:theEvent];
+    qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseMove, Qt::NoButton);
 }
 
 - (void)rightMouseDragged:(NSEvent *)theEvent
 {
     qMacDnDParams()->view = self;
     qMacDnDParams()->theEvent = theEvent;
-    bool mouseOK = qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseMove, Qt::NoButton);
-
-    if (!mouseOK)
-        [super rightMouseDragged:theEvent];
+    qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseMove, Qt::NoButton);
 }
 
 - (void)otherMouseDragged:(NSEvent *)theEvent
 {
     qMacDnDParams()->view = self;
     qMacDnDParams()->theEvent = theEvent;
-    bool mouseOK = qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseMove, Qt::NoButton);
-
-    if (!mouseOK)
-        [super otherMouseDragged:theEvent];
+    qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseMove, Qt::NoButton);
 }
 
 - (void)scrollWheel:(NSEvent *)theEvent
diff --git a/src/gui/kernel/qt_cocoa_helpers_mac.mm b/src/gui/kernel/qt_cocoa_helpers_mac.mm
index c0fb8aa..2bf1465 100644
--- a/src/gui/kernel/qt_cocoa_helpers_mac.mm
+++ b/src/gui/kernel/qt_cocoa_helpers_mac.mm
@@ -899,6 +899,14 @@ bool qt_mac_handleMouseEvent(void * /* NSView * */view, void * /* NSEvent * */ev
             widgetToGetMouse =
                 [static_cast<QT_MANGLE_NAMESPACE(QCocoaView) *>(tmpView) qt_qwidget];
         }
+    } else {
+        extern QPointer<QWidget> qt_button_down; //qapplication_mac.cpp
+        if (!mac_mouse_grabber && qt_button_down) {
+            // if there is no explicit grabber, and the mouse was grabbed
+            // implicitely (i.e. a mousebutton was pressed)
+            widgetToGetMouse = qt_button_down;
+            tmpView = qt_mac_nativeview_for(widgetToGetMouse);
+        }
     }
 
     NSPoint localPoint = [tmpView convertPoint:windowPoint fromView:nil];
-- 
cgit v0.12


From d51c590b8443d5d6dadf76a678439c990213d848 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Wed, 25 Nov 2009 09:21:04 +0100
Subject: StandardDialogs example: Fix warning about QKeySequence::mnemonic.

... with several '&'.
Task-number: QTBUG-5667
Reviewed-by: Gabriel
---
 examples/dialogs/standarddialogs/dialog.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/dialogs/standarddialogs/dialog.cpp b/examples/dialogs/standarddialogs/dialog.cpp
index 6e06190..270fdd0 100644
--- a/examples/dialogs/standarddialogs/dialog.cpp
+++ b/examples/dialogs/standarddialogs/dialog.cpp
@@ -124,7 +124,7 @@ Dialog::Dialog(QWidget *parent)
     errorLabel = new QLabel;
     errorLabel->setFrameStyle(frameStyle);
     QPushButton *errorButton =
-            new QPushButton(tr("QErrorMessage::show&M&essage()"));
+            new QPushButton(tr("QErrorMessage::showM&essage()"));
 
     connect(integerButton, SIGNAL(clicked()), this, SLOT(setInteger()));
     connect(doubleButton, SIGNAL(clicked()), this, SLOT(setDouble()));
-- 
cgit v0.12