Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Mac: add missing .mm file
  Mac: add missing header file
  Allow QTextDocument to resolve URLs to the current working dir.
  Revert "Revert "Use QUrl::isLocalFile and fix the scheme checking in local URLs.""
  Revert "Revert "QUrl::fromLocalFile: fix silly mistake: it's fromNativeSeparators, not to""
  Revert "Revert "[QNAM FTP] Check for the "ftp" scheme case-insensitively""
  Revert "Revert "Improve QUrl handling of local file paths""
  Cocoa: remove warnings
  Autotest, Mac: added more native key event testing
  Cocoa: Glyph for "Enter" is wrong in QKeySequence
  Cocoa: QShortcut(Qt::Key_Enter) does not show in the menu bar
  Cocoa: Add support for native application event filter

19 files changed, 533 insertions, 233 deletions

diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp
index 79a8ce4..aac1f10 100644
--- a/src/corelib/io/qurl.cpp
+++ b/src/corelib/io/qurl.cpp
@@ -5987,19 +5987,22 @@ bool QUrl::isDetached() const
 
 
 /*!
-    Returns a QUrl representation of \a localFile, interpreted as a
-    local file.
+    Returns a QUrl representation of \a localFile, interpreted as a local
+    file. This function accepts paths separated by slashes as well as the
+    native separator for this platform.
 
-    \sa toLocalFile()
+    This function also accepts paths with a doubled leading slash (or
+    backslash) to indicate a remote file, as in
+    "//servername/path/to/file.txt". Note that only certain platforms can
+    actually open this file using QFile::open().
+
+    \sa toLocalFile(), isLocalFile(), QDir::toNativeSeparators
 */
 QUrl QUrl::fromLocalFile(const QString &localFile)
 {
     QUrl url;
     url.setScheme(QLatin1String("file"));
-    QString deslashified = localFile;
-    deslashified.replace(QLatin1Char('\\'), QLatin1Char('/'));
-
-
+    QString deslashified = QDir::fromNativeSeparators(localFile);
 
     // magic for drives on windows
     if (deslashified.length() > 1 && deslashified.at(1) == QLatin1Char(':') && deslashified.at(0) != QLatin1Char('/')) {
@@ -6018,35 +6021,61 @@ QUrl QUrl::fromLocalFile(const QString &localFile)
 }
 
 /*!
-    Returns the path of this URL formatted as a local file path.
+    Returns the path of this URL formatted as a local file path. The path
+    returned will use forward slashes, even if it was originally created
+    from one with backslashes.
 
-    \sa fromLocalFile()
+    If this URL contains a non-empty hostname, it will be encoded in the
+    returned value in the form found on SMB networks (for example,
+    "//servername/path/to/file.txt").
+
+    \sa fromLocalFile(), isLocalFile()
 */
 QString QUrl::toLocalFile() const
 {
-    if (!d) return QString();
-    if (!QURL_HASFLAG(d->stateFlags, QUrlPrivate::Parsed)) d->parse();
+    // the call to isLocalFile() also ensures that we're parsed
+    if (!isLocalFile())
+        return QString();
 
     QString tmp;
     QString ourPath = path();
-    if (d->scheme.isEmpty() || QString::compare(d->scheme, QLatin1String("file"), Qt::CaseInsensitive) == 0) {
 
-        // magic for shared drive on windows
-        if (!d->host.isEmpty()) {
-            tmp = QLatin1String("//") + d->host + (ourPath.length() > 0 && ourPath.at(0) != QLatin1Char('/')
-                                                  ? QLatin1Char('/') + ourPath :  ourPath);
-        } else {
-            tmp = ourPath;
-            // magic for drives on windows
-            if (ourPath.length() > 2 && ourPath.at(0) == QLatin1Char('/') && ourPath.at(2) == QLatin1Char(':'))
-                tmp.remove(0, 1);
-        }
+    // magic for shared drive on windows
+    if (!d->host.isEmpty()) {
+        tmp = QLatin1String("//") + d->host + (ourPath.length() > 0 && ourPath.at(0) != QLatin1Char('/')
+                                               ? QLatin1Char('/') + ourPath :  ourPath);
+    } else {
+        tmp = ourPath;
+        // magic for drives on windows
+        if (ourPath.length() > 2 && ourPath.at(0) == QLatin1Char('/') && ourPath.at(2) == QLatin1Char(':'))
+            tmp.remove(0, 1);
     }
 
     return tmp;
 }
 
 /*!
+    \since 4.7
+    Returns true if this URL is pointing to a local file path. A URL is a
+    local file path if the scheme is "file".
+
+    Note that this function considers URLs with hostnames to be local file
+    paths, even if the eventual file path cannot be opened with
+    QFile::open().
+
+    \sa fromLocalFile(), toLocalFile()
+*/
+bool QUrl::isLocalFile() const
+{
+    if (!d) return false;
+    if (!QURL_HASFLAG(d->stateFlags, QUrlPrivate::Parsed)) d->parse();
+
+    if (d->scheme.compare(QLatin1String("file"), Qt::CaseInsensitive) != 0)
+        return false;   // not file
+    return true;
+}
+
+/*!
     Returns true if this URL is a parent of \a childUrl. \a childUrl is a child
     of this URL if the two URLs share the same scheme and authority,
     and this URL's path is a parent of the path of \a childUrl.
diff --git a/src/corelib/io/qurl.h b/src/corelib/io/qurl.h
index 6f8331a..162aa7c 100644
--- a/src/corelib/io/qurl.h
+++ b/src/corelib/io/qurl.h
@@ -183,6 +183,7 @@ public:
 
     static QUrl fromLocalFile(const QString &localfile);
     QString toLocalFile() const;
+    bool isLocalFile() const;
 
     QString toString(FormattingOptions options = None) const;
 
diff --git a/src/gui/dialogs/qnspanelproxy_mac.mm b/src/gui/dialogs/qnspanelproxy_mac.mm
index 0bd5c63..0e8d64d 100644
--- a/src/gui/dialogs/qnspanelproxy_mac.mm
+++ b/src/gui/dialogs/qnspanelproxy_mac.mm
@@ -42,6 +42,7 @@
 #include <qdialogbuttonbox.h>
 #if defined(Q_WS_MAC)
 #include <private/qt_mac_p.h>
+#include <private/qcocoaintrospection_p.h>
 #import <AppKit/AppKit.h>
 #import <Foundation/Foundation.h>
 #import <objc/objc-class.h>
@@ -137,46 +138,6 @@ QT_USE_NAMESPACE
 
 QT_BEGIN_NAMESPACE
 
-void macStartIntercept(SEL originalSel, SEL fakeSel, Class baseClass, Class proxyClass)
-{
-#ifndef QT_MAC_USE_COCOA
-    if (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_5)
-#endif
-    {
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
-        // The following code replaces the _implementation_ for the selector we want to hack
-        // (originalSel) with the implementation found in proxyClass. Then it creates
-        // a new 'backup' method inside baseClass containing the old, original,
-        // implementation (fakeSel). You can let the proxy implementation of originalSel
-        // call fakeSel if needed (similar approach to calling a super class implementation).
-        // fakeSel must also be implemented in proxyClass, as the signature is used
-        // as template for the method one we add into baseClass.
-        // NB: You will typically never create any instances of proxyClass; we use it
-        // only for stealing its contents and put it into baseClass. 
-        Method originalMethod = class_getInstanceMethod(baseClass, originalSel);
-        Method newMethod = class_getInstanceMethod(proxyClass, originalSel);
-        Method fakeMethod = class_getInstanceMethod(proxyClass, fakeSel);
-
-        IMP originalImp = method_setImplementation(originalMethod, method_getImplementation(newMethod));
-        class_addMethod(baseClass, fakeSel, originalImp, method_getTypeEncoding(fakeMethod));
-#endif
-    }
-}
-
-void macStopIntercept(SEL originalSel, SEL fakeSel, Class baseClass, Class /* proxyClass */)
-{
-#ifndef QT_MAC_USE_COCOA
-    if (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_5)
-#endif
-    {
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
-        Method originalMethod = class_getInstanceMethod(baseClass, originalSel);
-        Method fakeMethodInBaseClass = class_getInstanceMethod(baseClass, fakeSel);
-        method_setImplementation(originalMethod, method_getImplementation(fakeMethodInBaseClass));
-#endif
-    }
-}
-
 /*
     Intercept the NSColorPanel constructor if the shared
     color panel doesn't exist yet. What's going on here is
@@ -188,12 +149,18 @@ void macStopIntercept(SEL originalSel, SEL fakeSel, Class baseClass, Class /* pr
 */
 void macStartInterceptNSPanelCtor()
 {
-    macStartIntercept(@selector(initWithContentRect:styleMask:backing:defer:),
-                      @selector(qt_fakeInitWithContentRect:styleMask:backing:defer:),
-                      [NSPanel class], [QT_MANGLE_NAMESPACE(QNSPanelProxy) class]);
-    macStartIntercept(@selector(initWithContentRect:styleMask:backing:defer:screen:),
-                      @selector(qt_fakeInitWithContentRect:styleMask:backing:defer:screen:),
-                      [NSPanel class], [QT_MANGLE_NAMESPACE(QNSPanelProxy) class]);
+    qt_cocoa_change_implementation(
+            [NSPanel class],
+            @selector(initWithContentRect:styleMask:backing:defer:),
+            [QT_MANGLE_NAMESPACE(QNSPanelProxy) class],
+            @selector(initWithContentRect:styleMask:backing:defer:),
+            @selector(qt_fakeInitWithContentRect:styleMask:backing:defer:));
+    qt_cocoa_change_implementation(
+            [NSPanel class],
+            @selector(initWithContentRect:styleMask:backing:defer:screen:),
+            [QT_MANGLE_NAMESPACE(QNSPanelProxy) class],
+            @selector(initWithContentRect:styleMask:backing:defer:screen:),
+            @selector(qt_fakeInitWithContentRect:styleMask:backing:defer:screen:));
 }
 
 /*
@@ -201,12 +168,14 @@ void macStartInterceptNSPanelCtor()
 */
 void macStopInterceptNSPanelCtor()
 {
-    macStopIntercept(@selector(initWithContentRect:styleMask:backing:defer:screen:),
-                     @selector(qt_fakeInitWithContentRect:styleMask:backing:defer:screen:),
-                     [NSPanel class], [QT_MANGLE_NAMESPACE(QNSPanelProxy) class]);
-    macStopIntercept(@selector(initWithContentRect:styleMask:backing:defer:),
-                     @selector(qt_fakeInitWithContentRect:styleMask:backing:defer:),
-                     [NSPanel class], [QT_MANGLE_NAMESPACE(QNSPanelProxy) class]);
+    qt_cocoa_change_back_implementation(
+            [NSPanel class],
+            @selector(initWithContentRect:styleMask:backing:defer:screen:),
+            @selector(qt_fakeInitWithContentRect:styleMask:backing:defer:screen:));
+    qt_cocoa_change_back_implementation(
+            [NSPanel class],
+            @selector(initWithContentRect:styleMask:backing:defer:),
+            @selector(qt_fakeInitWithContentRect:styleMask:backing:defer:));
 }
 
 /*
@@ -216,8 +185,12 @@ void macStopInterceptNSPanelCtor()
 void macStartInterceptWindowTitle(QWidget *window)
 {
     currentWindow = window;
-    macStartIntercept(@selector(setTitle:), @selector(qt_fakeSetTitle:),
-                      [NSWindow class], [QT_MANGLE_NAMESPACE(QNSWindowProxy) class]);
+    qt_cocoa_change_implementation(
+            [NSWindow class],
+            @selector(setTitle:),
+            [QT_MANGLE_NAMESPACE(QNSWindowProxy) class],
+            @selector(setTitle:),
+            @selector(qt_fakeSetTitle:));
 }
 
 /*
@@ -226,8 +199,10 @@ void macStartInterceptWindowTitle(QWidget *window)
 void macStopInterceptWindowTitle()
 {
     currentWindow = 0;
-    macStopIntercept(@selector(setTitle:), @selector(qt_fakeSetTitle:),
-                     [NSWindow class], [QT_MANGLE_NAMESPACE(QNSWindowProxy) class]);
+    qt_cocoa_change_back_implementation(
+            [NSWindow class],
+            @selector(setTitle:),
+            @selector(qt_fakeSetTitle:));
 }
 
 /*
diff --git a/src/gui/kernel/kernel.pri b/src/gui/kernel/kernel.pri
index 6fd45ad..b6cc2ac 100644
--- a/src/gui/kernel/kernel.pri
+++ b/src/gui/kernel/kernel.pri
@@ -213,7 +213,8 @@ embedded {
                 qcocoaapplicationdelegate_mac_p.h \
                 qmacgesturerecognizer_mac_p.h \
                 qmultitouch_mac_p.h \
-                qcocoasharedwindowmethods_mac_p.h
+                qcocoasharedwindowmethods_mac_p.h \
+                qcocoaintrospection_p.h
 
         OBJECTIVE_SOURCES += \
                 kernel/qcursor_mac.mm \
@@ -233,7 +234,8 @@ embedded {
                 kernel/qeventdispatcher_mac.mm \
                 kernel/qcocoawindowcustomthemeframe_mac.mm \
                 kernel/qmacgesturerecognizer_mac.mm \
-                kernel/qmultitouch_mac.mm
+                kernel/qmultitouch_mac.mm \
+                kernel/qcocoaintrospection_mac.mm
 
         HEADERS += \
                 kernel/qt_cocoa_helpers_mac_p.h \
diff --git a/src/gui/kernel/qapplication.h b/src/gui/kernel/qapplication.h
index c21b982..ebb329b 100644
--- a/src/gui/kernel/qapplication.h
+++ b/src/gui/kernel/qapplication.h
@@ -233,6 +233,7 @@ public:
 
 #if defined(Q_WS_MAC)
     virtual bool macEventFilter(EventHandlerCallRef, EventRef);
+    virtual bool macEventFilter(void *);
 #endif
 #if defined(Q_WS_X11)
     virtual bool x11EventFilter(XEvent *);
diff --git a/src/gui/kernel/qapplication_mac.mm b/src/gui/kernel/qapplication_mac.mm
index 321492d..4cd14df 100644
--- a/src/gui/kernel/qapplication_mac.mm
+++ b/src/gui/kernel/qapplication_mac.mm
@@ -1246,6 +1246,8 @@ void qt_init(QApplicationPrivate *priv, int)
     // Cocoa application delegate
 #ifdef QT_MAC_USE_COCOA
     NSApplication *cocoaApp = [QNSApplication sharedApplication];
+    qt_redirectNSApplicationSendEvent();
+
     QMacCocoaAutoReleasePool pool;
     NSObject *oldDelegate = [cocoaApp delegate];
     QT_MANGLE_NAMESPACE(QCocoaApplicationDelegate) *newDelegate = [QT_MANGLE_NAMESPACE(QCocoaApplicationDelegate) sharedDelegate];
@@ -2611,7 +2613,7 @@ OSStatus QApplicationPrivate::globalAppleEventProcessor(const AppleEvent *ae, Ap
 /*!
     \fn bool QApplication::macEventFilter(EventHandlerCallRef caller, EventRef event)
 
-    \warning This virtual function is only implemented under Mac OS X when against Carbon.
+    \warning This virtual function is only used under Mac OS X when Qt is based on Carbon.
 
     If you create an application that inherits QApplication and reimplement
     this function, you get direct access to all Carbon Events that Qt registers
@@ -2622,14 +2624,7 @@ OSStatus QApplicationPrivate::globalAppleEventProcessor(const AppleEvent *ae, Ap
     Return false for normal event dispatching. The default
     implementation returns false.
 
-    Cocoa uses a different event system which means this function is NOT CALLED
-    when building Qt against Cocoa. If you want similar functionality subclass
-    NSApplication and reimplement the sendEvent: message to handle all the
-    NSEvents. You also will need to to instantiate your custom NSApplication
-    before creating a QApplication. See \l
-    {http://developer.apple.com/documentation/Cocoa/Reference/ApplicationKit/Classes/NSApplication_Class/Reference/Reference.html}{Apple's
-    NSApplication Reference} for more information.
-
+    \sa macEventFilter(void *nsevent)
 */
 bool QApplication::macEventFilter(EventHandlerCallRef, EventRef)
 {
@@ -2637,6 +2632,29 @@ bool QApplication::macEventFilter(EventHandlerCallRef, EventRef)
 }
 
 /*!
+    \fn bool QApplication::macEventFilter(void *nsevent)
+
+    \warning This virtual function is only used under Mac OS X when Qt is based on Cocoa.
+
+    If you create an application that inherits QApplication and reimplement
+    this function, you get direct access to all NSEvents that Qt receives
+    from Cocoa.
+    \a nsevent is of type NSEvent *:
+
+    NSEvent *e = static_cast<NSEvent *>(nsevent);
+
+    Return true if you want to stop the event from being processed.
+    Return false for normal event dispatching. The default
+    implementation returns false.
+
+    \sa macEventFilter(EventHandlerCallRef caller, EventRef event)
+*/
+bool QApplication::macEventFilter(void * /*NSEvent*/)
+{
+    return false;
+}
+
+/*!
     \internal
 */
 void QApplicationPrivate::openPopup(QWidget *popup)
@@ -3110,11 +3128,7 @@ void onApplicationChangedActivation( bool activated )
         }
 
         if (!app->activeWindow()) {
-#if QT_MAC_USE_COCOA
-            OSWindowRef wp    = [NSApp keyWindow];
-#else
-            OSWindowRef wp = ActiveNonFloatingWindow();
-#endif
+            OSWindowRef wp = [NSApp keyWindow];
             if (QWidget *tmp_w = qt_mac_find_window(wp))
                 app->setActiveWindow(tmp_w);
         }
diff --git a/src/gui/kernel/qcocoaapplication_mac.mm b/src/gui/kernel/qcocoaapplication_mac.mm
index 4962863..5cd32a1 100644
--- a/src/gui/kernel/qcocoaapplication_mac.mm
+++ b/src/gui/kernel/qcocoaapplication_mac.mm
@@ -78,6 +78,7 @@
 #include <private/qcocoaapplication_mac_p.h>
 #include <private/qcocoaapplicationdelegate_mac_p.h>
 #include <private/qt_cocoa_helpers_mac_p.h>
+#include <private/qcocoaintrospection_p.h>
 
 QT_USE_NAMESPACE
 
@@ -116,12 +117,26 @@ QT_USE_NAMESPACE
     quint64 lower = [event data1];
     quint64 upper = [event data2];
     QCocoaPostMessageArgs *args = reinterpret_cast<QCocoaPostMessageArgs *>(lower | (upper << 32));
-    [args->target performSelector:args->selector];
+    switch (args->argCount) {
+    case 0:
+        [args->target performSelector:args->selector];
+        break;
+    case 1:
+        [args->target performSelector:args->selector withObject:args->arg1];
+        break;
+    case 3:
+        [args->target performSelector:args->selector withObject:args->arg1 withObject:args->arg2];
+        break;
+    }
+
     delete args;
 }
 
-- (BOOL)qt_sendEvent:(NSEvent *)event
+- (BOOL)qt_filterEvent:(NSEvent *)event
 {
+    if (qApp->macEventFilter(event))
+        return true;
+
     if ([event type] == NSApplicationDefined) {
         switch ([event subtype]) {
             case QtCocoaEventSubTypePostMessage:
@@ -138,20 +153,55 @@ QT_USE_NAMESPACE
 
 @implementation QNSApplication
 
-// WARNING: If Qt did not create NSApplication (this can e.g.
-// happend if Qt is used as a plugin from a 3rd-party cocoa
-// application), QNSApplication::sendEvent will never be called.
-// SO DO NOT RELY ON THIS FUNCTION BEING AVAILABLE. 
-// Plugin developers that _do_ control the NSApplication sub-class
-// implementation of the 3rd-party application can call qt_sendEvent
-// from the sub-class event handler (like we do here) to work around
-// any issues.
+- (void)qt_sendEvent_original:(NSEvent *)event
+{
+    Q_UNUSED(event);
+    // This method will only be used as a signature
+    // template for the method we add into NSApplication
+    // containing the original [NSApplication sendEvent:] implementation
+}
+
+- (void)qt_sendEvent_replacement:(NSEvent *)event
+{
+    // This method (or its implementation to be precise) will
+    // be called instead of sendEvent if redirection occurs.
+    // 'self' will then be an instance of NSApplication
+    // (and not QNSApplication)
+    if (![NSApp qt_filterEvent:event])
+        [self qt_sendEvent_original:event];
+}
+
 - (void)sendEvent:(NSEvent *)event
 {
-    if (![self qt_sendEvent:event])
+    // This method will be called if
+    // no redirection occurs
+    if (![NSApp qt_filterEvent:event])
         [super sendEvent:event];
 }
 
 @end
 
+QT_BEGIN_NAMESPACE
+
+void qt_redirectNSApplicationSendEvent()
+{
+    if ([NSApp isMemberOfClass:[QNSApplication class]]) {
+        // No need to change implementation since Qt
+        // already controls a subclass of NSApplication
+        return;
+    }
+
+    // Change the implementation of [NSApplication sendEvent] to the
+    // implementation of qt_sendEvent_replacement found in QNSApplication.
+    // And keep the old implementation that gets overwritten inside a new
+    // method 'qt_sendEvent_original' that we add to NSApplication
+    qt_cocoa_change_implementation(
+            [NSApplication class],
+            @selector(sendEvent:),
+            [QNSApplication class],
+            @selector(qt_sendEvent_replacement:),
+            @selector(qt_sendEvent_original:));
+ }
+
+QT_END_NAMESPACE
 #endif
diff --git a/src/gui/kernel/qcocoaapplication_mac_p.h b/src/gui/kernel/qcocoaapplication_mac_p.h
index 5569feb..c89ff36 100644
--- a/src/gui/kernel/qcocoaapplication_mac_p.h
+++ b/src/gui/kernel/qcocoaapplication_mac_p.h
@@ -101,11 +101,17 @@ QT_FORWARD_DECLARE_CLASS(QApplicationPrivate)
 - (int)QT_MANGLE_NAMESPACE(qt_validModesForFontPanel):(NSFontPanel *)fontPanel;
 
 - (void)qt_sendPostedMessage:(NSEvent *)event;
-- (BOOL)qt_sendEvent:(NSEvent *)event;
+- (BOOL)qt_filterEvent:(NSEvent *)event;
 @end
 
 @interface QNSApplication : NSApplication {
 }
 @end
 
+QT_BEGIN_NAMESPACE
+
+void qt_redirectNSApplicationSendEvent();
+
+QT_END_NAMESPACE
+
 #endif
diff --git a/src/gui/kernel/qcocoaintrospection_mac.mm b/src/gui/kernel/qcocoaintrospection_mac.mm
new file mode 100644
index 0000000..9b536b7
--- /dev/null
+++ b/src/gui/kernel/qcocoaintrospection_mac.mm
@@ -0,0 +1,125 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtGui 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 Technology Preview License Agreement accompanying
+** this package.
+**
+** 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.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/****************************************************************************
+**
+** Copyright (c) 2007-2008, Apple, Inc.
+**
+** All rights reserved.
+**
+** Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are met:
+**
+**   * Redistributions of source code must retain the above copyright notice,
+**     this list of conditions and the following disclaimer.
+**
+**   * Redistributions in binary form must reproduce the above copyright notice,
+**     this list of conditions and the following disclaimer in the documentation
+**     and/or other materials provided with the distribution.
+**
+**   * Neither the name of Apple, Inc. nor the names of its contributors
+**     may be used to endorse or promote products derived from this software
+**     without specific prior written permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+** CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+** EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+** PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+** PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+** LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+** NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+** SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+**
+****************************************************************************/
+
+#include <private/qcocoaintrospection_p.h>
+
+QT_BEGIN_NAMESPACE
+
+void qt_cocoa_change_implementation(Class baseClass, SEL originalSel, Class proxyClass, SEL replacementSel, SEL backupSel)
+{
+#ifndef QT_MAC_USE_COCOA
+    if (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_5)
+#endif
+    {
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
+        // The following code replaces the _implementation_ for the selector we want to hack
+        // (originalSel) with the implementation found in proxyClass. Then it creates
+        // a new 'backup' method inside baseClass containing the old, original,
+        // implementation (fakeSel). You can let the proxy implementation of originalSel
+        // call fakeSel if needed (similar approach to calling a super class implementation).
+        // fakeSel must also be implemented in proxyClass, as the signature is used
+        // as template for the method one we add into baseClass.
+        // NB: You will typically never create any instances of proxyClass; we use it
+        // only for stealing its contents and put it into baseClass.
+        if (!replacementSel)
+            replacementSel = originalSel;
+
+        Method originalMethod = class_getInstanceMethod(baseClass, originalSel);
+        Method replacementMethod = class_getInstanceMethod(proxyClass, replacementSel);
+        IMP originalImp = method_setImplementation(originalMethod, method_getImplementation(replacementMethod));
+
+        if (backupSel) {
+            Method backupMethod = class_getInstanceMethod(proxyClass, backupSel);
+            class_addMethod(baseClass, backupSel, originalImp, method_getTypeEncoding(backupMethod));
+        }
+#endif
+    }
+}
+
+void qt_cocoa_change_back_implementation(Class baseClass, SEL originalSel, SEL backupSel)
+{
+#ifndef QT_MAC_USE_COCOA
+    if (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_5)
+#endif
+    {
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
+        Method originalMethod = class_getInstanceMethod(baseClass, originalSel);
+        Method backupMethodInBaseClass = class_getInstanceMethod(baseClass, backupSel);
+        method_setImplementation(originalMethod, method_getImplementation(backupMethodInBaseClass));
+#endif
+    }
+}
+
+QT_END_NAMESPACE
diff --git a/src/gui/kernel/qcocoaintrospection_p.h b/src/gui/kernel/qcocoaintrospection_p.h
new file mode 100644
index 0000000..b9422e8
--- /dev/null
+++ b/src/gui/kernel/qcocoaintrospection_p.h
@@ -0,0 +1,84 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtGui 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 Technology Preview License Agreement accompanying
+** this package.
+**
+** 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.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/****************************************************************************
+**
+** Copyright (c) 2007-2008, Apple, Inc.
+**
+** All rights reserved.
+**
+** Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are met:
+**
+**   * Redistributions of source code must retain the above copyright notice,
+**     this list of conditions and the following disclaimer.
+**
+**   * Redistributions in binary form must reproduce the above copyright notice,
+**     this list of conditions and the following disclaimer in the documentation
+**     and/or other materials provided with the distribution.
+**
+**   * Neither the name of Apple, Inc. nor the names of its contributors
+**     may be used to endorse or promote products derived from this software
+**     without specific prior written permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+** CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+** EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+** PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+** PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+** LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+** NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+** SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+**
+****************************************************************************/
+
+#include <qglobal.h>
+#import <objc/objc-class.h>
+
+QT_BEGIN_NAMESPACE
+
+void qt_cocoa_change_implementation(Class baseClass, SEL originalSel, Class proxyClass, SEL replacementSel = 0, SEL backupSel = 0);
+void qt_cocoa_change_back_implementation(Class baseClass, SEL originalSel, SEL backupSel);
+
+QT_END_NAMESPACE
diff --git a/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h b/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
index 8652816..717cfa5 100644
--- a/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
+++ b/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
@@ -149,17 +149,6 @@ QT_END_NAMESPACE
 
 - (void)sendEvent:(NSEvent *)event
 {
-    if ([event type] == NSApplicationDefined) {
-        switch ([event subtype]) {
-            case QtCocoaEventSubTypePostMessage:
-                [NSApp qt_sendPostedMessage:event];
-                return;
-            default:
-                break;
-        }
-        return;
-    }
-
     QWidget *widget = [[QT_MANGLE_NAMESPACE(QCocoaWindowDelegate) sharedDelegate] qt_qwidgetForWindow:self];
     // Cocoa can hold onto the window after we've disavowed its knowledge. So,
     // if we get sent an event afterwards just have it go through the super's
diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp
index d9a0952..b038fde 100644
--- a/src/gui/kernel/qkeysequence.cpp
+++ b/src/gui/kernel/qkeysequence.cpp
@@ -76,7 +76,7 @@ static const MacSpecialKey entries[NumEntries] = {
     { Qt::Key_Backtab, 0x21E4 },
     { Qt::Key_Backspace, 0x232B },
     { Qt::Key_Return, 0x21B5 },
-    { Qt::Key_Enter, 0x21B5 },
+    { Qt::Key_Enter, 0x2324 },
     { Qt::Key_Delete, 0x2326 },
     { Qt::Key_Home, 0x2196 },
     { Qt::Key_End, 0x2198 },
diff --git a/src/gui/kernel/qt_cocoa_helpers_mac.mm b/src/gui/kernel/qt_cocoa_helpers_mac.mm
index 8cef03c..de4e125 100644
--- a/src/gui/kernel/qt_cocoa_helpers_mac.mm
+++ b/src/gui/kernel/qt_cocoa_helpers_mac.mm
@@ -469,7 +469,6 @@ void qt_dispatchTabletProximityEvent(const ::TabletProximityRec &proxRec)
     qt_sendSpontaneousEvent(qApp, &qtabletProximity);
 }
 
-#ifdef QT_MAC_USE_COCOA
 // Use this method to keep all the information in the TextSegment. As long as it is ordered
 // we are in OK shape, and we can influence that ourselves.
 struct KeyPair
@@ -493,69 +492,107 @@ bool operator<(QChar qchar, const KeyPair &entry)
     return qchar < entry.cocoaKey;
 }
 
+bool operator<(const Qt::Key &key, const KeyPair &entry)
+{
+    return key < entry.qtKey;
+}
+
+bool operator<(const KeyPair &entry, const Qt::Key &key)
+{
+    return entry.qtKey < key;
+}
+
+static bool qtKey2CocoaKeySortLessThan(const KeyPair &entry1, const KeyPair &entry2)
+{
+    return entry1.qtKey < entry2.qtKey;
+}
+
+static const int NumEntries = 59;
+static const KeyPair entries[NumEntries] = {
+    { NSEnterCharacter, Qt::Key_Enter },
+    { NSBackspaceCharacter, Qt::Key_Backspace },
+    { NSTabCharacter, Qt::Key_Tab },
+    { NSNewlineCharacter, Qt::Key_Return },
+    { NSCarriageReturnCharacter, Qt::Key_Return },
+    { NSBackTabCharacter, Qt::Key_Backtab },
+    { NSDeleteCharacter, Qt::Key_Delete },
+    { kEscapeCharCode, Qt::Key_Escape },
+    { NSUpArrowFunctionKey, Qt::Key_Up },
+    { NSDownArrowFunctionKey, Qt::Key_Down },
+    { NSLeftArrowFunctionKey, Qt::Key_Left },
+    { NSRightArrowFunctionKey, Qt::Key_Right },
+    { NSF1FunctionKey, Qt::Key_F1 },
+    { NSF2FunctionKey, Qt::Key_F2 },
+    { NSF3FunctionKey, Qt::Key_F3 },
+    { NSF4FunctionKey, Qt::Key_F4 },
+    { NSF5FunctionKey, Qt::Key_F5 },
+    { NSF6FunctionKey, Qt::Key_F6 },
+    { NSF7FunctionKey, Qt::Key_F7 },
+    { NSF8FunctionKey, Qt::Key_F8 },
+    { NSF9FunctionKey, Qt::Key_F8 },
+    { NSF10FunctionKey, Qt::Key_F10 },
+    { NSF11FunctionKey, Qt::Key_F11 },
+    { NSF12FunctionKey, Qt::Key_F12 },
+    { NSF13FunctionKey, Qt::Key_F13 },
+    { NSF14FunctionKey, Qt::Key_F14 },
+    { NSF15FunctionKey, Qt::Key_F15 },
+    { NSF16FunctionKey, Qt::Key_F16 },
+    { NSF17FunctionKey, Qt::Key_F17 },
+    { NSF18FunctionKey, Qt::Key_F18 },
+    { NSF19FunctionKey, Qt::Key_F19 },
+    { NSF20FunctionKey, Qt::Key_F20 },
+    { NSF21FunctionKey, Qt::Key_F21 },
+    { NSF22FunctionKey, Qt::Key_F22 },
+    { NSF23FunctionKey, Qt::Key_F23 },
+    { NSF24FunctionKey, Qt::Key_F24 },
+    { NSF25FunctionKey, Qt::Key_F25 },
+    { NSF26FunctionKey, Qt::Key_F26 },
+    { NSF27FunctionKey, Qt::Key_F27 },
+    { NSF28FunctionKey, Qt::Key_F28 },
+    { NSF29FunctionKey, Qt::Key_F29 },
+    { NSF30FunctionKey, Qt::Key_F30 },
+    { NSF31FunctionKey, Qt::Key_F31 },
+    { NSF32FunctionKey, Qt::Key_F32 },
+    { NSF33FunctionKey, Qt::Key_F33 },
+    { NSF34FunctionKey, Qt::Key_F34 },
+    { NSF35FunctionKey, Qt::Key_F35 },
+    { NSInsertFunctionKey, Qt::Key_Insert },
+    { NSDeleteFunctionKey, Qt::Key_Delete },
+    { NSHomeFunctionKey, Qt::Key_Home },
+    { NSEndFunctionKey, Qt::Key_End },
+    { NSPageUpFunctionKey, Qt::Key_PageUp },
+    { NSPageDownFunctionKey, Qt::Key_PageDown },
+    { NSPrintScreenFunctionKey, Qt::Key_Print },
+    { NSScrollLockFunctionKey, Qt::Key_ScrollLock },
+    { NSPauseFunctionKey, Qt::Key_Pause },
+    { NSSysReqFunctionKey, Qt::Key_SysReq },
+    { NSMenuFunctionKey, Qt::Key_Menu },
+    { NSHelpFunctionKey, Qt::Key_Help },
+};
+static const KeyPair * const end = entries + NumEntries;
+
+QChar qtKey2CocoaKey(Qt::Key key)
+{
+    // The first time this function is called, create a reverse
+    // looup table sorted on Qt Key rather than Cocoa key:
+    static QVector<KeyPair> rev_entries(NumEntries);
+    static bool mustInit = true;
+    if (mustInit){
+        mustInit = false;
+        for (int i=0; i<NumEntries; ++i)
+            rev_entries[i] = entries[i];
+        qSort(rev_entries.begin(), rev_entries.end(), qtKey2CocoaKeySortLessThan);
+    }
+    const QVector<KeyPair>::iterator i
+            = qBinaryFind(rev_entries.begin(), rev_entries.end(), key);
+    if (i == rev_entries.end())
+        return QChar();
+    return i->cocoaKey;
+}
+
+#ifdef QT_MAC_USE_COCOA
 static Qt::Key cocoaKey2QtKey(QChar keyCode)
 {
-    static const int NumEntries = 57;
-    static const KeyPair entries[NumEntries] = {
-        { NSEnterCharacter, Qt::Key_Enter },
-        { NSTabCharacter, Qt::Key_Tab },
-        { NSCarriageReturnCharacter, Qt::Key_Return },
-        { NSBackTabCharacter, Qt::Key_Backtab },
-        { kEscapeCharCode, Qt::Key_Escape },
-        { NSDeleteCharacter, Qt::Key_Backspace },
-        { NSUpArrowFunctionKey, Qt::Key_Up },
-        { NSDownArrowFunctionKey, Qt::Key_Down },
-        { NSLeftArrowFunctionKey, Qt::Key_Left },
-        { NSRightArrowFunctionKey, Qt::Key_Right },
-        { NSF1FunctionKey, Qt::Key_F1 },
-        { NSF2FunctionKey, Qt::Key_F2 },
-        { NSF3FunctionKey, Qt::Key_F3 },
-        { NSF4FunctionKey, Qt::Key_F4 },
-        { NSF5FunctionKey, Qt::Key_F5 },
-        { NSF6FunctionKey, Qt::Key_F6 },
-        { NSF7FunctionKey, Qt::Key_F7 },
-        { NSF8FunctionKey, Qt::Key_F8 },
-        { NSF9FunctionKey, Qt::Key_F8 },
-        { NSF10FunctionKey, Qt::Key_F10 },
-        { NSF11FunctionKey, Qt::Key_F11 },
-        { NSF12FunctionKey, Qt::Key_F12 },
-        { NSF13FunctionKey, Qt::Key_F13 },
-        { NSF14FunctionKey, Qt::Key_F14 },
-        { NSF15FunctionKey, Qt::Key_F15 },
-        { NSF16FunctionKey, Qt::Key_F16 },
-        { NSF17FunctionKey, Qt::Key_F17 },
-        { NSF18FunctionKey, Qt::Key_F18 },
-        { NSF19FunctionKey, Qt::Key_F19 },
-        { NSF20FunctionKey, Qt::Key_F20 },
-        { NSF21FunctionKey, Qt::Key_F21 },
-        { NSF22FunctionKey, Qt::Key_F22 },
-        { NSF23FunctionKey, Qt::Key_F23 },
-        { NSF24FunctionKey, Qt::Key_F24 },
-        { NSF25FunctionKey, Qt::Key_F25 },
-        { NSF26FunctionKey, Qt::Key_F26 },
-        { NSF27FunctionKey, Qt::Key_F27 },
-        { NSF28FunctionKey, Qt::Key_F28 },
-        { NSF29FunctionKey, Qt::Key_F29 },
-        { NSF30FunctionKey, Qt::Key_F30 },
-        { NSF31FunctionKey, Qt::Key_F31 },
-        { NSF32FunctionKey, Qt::Key_F32 },
-        { NSF33FunctionKey, Qt::Key_F33 },
-        { NSF34FunctionKey, Qt::Key_F34 },
-        { NSF35FunctionKey, Qt::Key_F35 },
-        { NSInsertFunctionKey, Qt::Key_Insert },
-        { NSDeleteFunctionKey, Qt::Key_Delete },
-        { NSHomeFunctionKey, Qt::Key_Home },
-        { NSEndFunctionKey, Qt::Key_End },
-        { NSPageUpFunctionKey, Qt::Key_PageUp },
-        { NSPageDownFunctionKey, Qt::Key_PageDown },
-        { NSPrintScreenFunctionKey, Qt::Key_Print },
-        { NSScrollLockFunctionKey, Qt::Key_ScrollLock },
-        { NSPauseFunctionKey, Qt::Key_Pause },
-        { NSSysReqFunctionKey, Qt::Key_SysReq },
-        { NSMenuFunctionKey, Qt::Key_Menu },
-        { NSHelpFunctionKey, Qt::Key_Help },
-    };
-    static const KeyPair * const end = entries + NumEntries;
     const KeyPair *i = qBinaryFind(entries, end, keyCode);
     if (i == end)
         return Qt::Key(keyCode.unicode());
@@ -1201,7 +1238,7 @@ void qt_mac_replaceDrawRect(void * /*OSWindowRef */window, QWidgetPrivate *widge
         // We have the original method here. Proceed and swap the methods.
         method_exchangeImplementations(m1, m0);
         widget->originalDrawMethod = false;
-        [window display];
+        [theWindow display];
     }
 }
 
@@ -1224,7 +1261,7 @@ void qt_mac_replaceDrawRectOriginal(void * /*OSWindowRef */window, QWidgetPrivat
     }
     method_exchangeImplementations(m1, m0);
     widget->originalDrawMethod = true;
-    [window display];
+    [theWindow display];
 }
 #endif // QT_MAC_USE_COCOA
 
@@ -1423,39 +1460,17 @@ void qt_cocoaChangeOverrideCursor(const QCursor &cursor)
     [static_cast<NSCursor *>(qt_mac_nsCursorForQCursor(cursor)) set];
 }
 
-//  WARNING: If Qt did not create NSApplication (e.g. in case it is
-//  used as a plugin), and at the same time, there is no window on
-//  screen (or the window that the event is sendt to becomes hidden etc
-//  before the event gets delivered), the message will not be performed.
-bool qt_cocoaPostMessage(id target, SEL selector)
+void qt_cocoaPostMessage(id target, SEL selector, int argCount, id arg1, id arg2)
 {
-    if (!target)
-        return false;
-
-    NSInteger windowNumber = 0;
-    if (![NSApp isMemberOfClass:[QNSApplication class]]) {
-        // INVARIANT: Cocoa is not using our NSApplication subclass. That means
-        // we don't control the main event handler either. So target the event
-        // for one of the windows on screen:
-        NSWindow *nswin = [NSApp mainWindow];
-        if (!nswin) {
-            nswin = [NSApp keyWindow];
-            if (!nswin)
-                return false;
-        }
-        windowNumber = [nswin windowNumber];
-    }
-
-    // WARNING: data1 and data2 is truncated to from 64-bit to 32-bit on OS 10.5! 
+    // WARNING: data1 and data2 is truncated to from 64-bit to 32-bit on OS 10.5!
     // That is why we need to split the address in two parts:
-    QCocoaPostMessageArgs *args = new QCocoaPostMessageArgs(target, selector);
+    QCocoaPostMessageArgs *args = new QCocoaPostMessageArgs(target, selector, argCount, arg1, arg2);
     quint32 lower = quintptr(args);
     quint32 upper = quintptr(args) >> 32;
     NSEvent *e = [NSEvent otherEventWithType:NSApplicationDefined
-        location:NSZeroPoint modifierFlags:0 timestamp:0 windowNumber:windowNumber
+        location:NSZeroPoint modifierFlags:0 timestamp:0 windowNumber:0
         context:nil subtype:QtCocoaEventSubTypePostMessage data1:lower data2:upper];
     [NSApp postEvent:e atStart:NO];
-    return true;
 }
 #endif
 
@@ -1494,7 +1509,7 @@ void macDrawRectOnTop(void * /*OSWindowRef */window)
     NSRect contentRect = [contentView frame];
     // Draw a line on top of the already drawn line.
     // We need to check if we are active or not to use the proper color.
-    if([window isKeyWindow] || [window isMainWindow]) {
+    if([theWindow isKeyWindow] || [theWindow isMainWindow]) {
         [[NSColor colorWithCalibratedRed:1.0 green:1.0 blue:1.0 alpha:1.0] set];
     } else {
         [[NSColor colorWithCalibratedRed:1.0 green:1.0 blue:1.0 alpha:1.0] set];
@@ -1514,7 +1529,7 @@ void macSyncDrawingOnFirstInvocation(void * /*OSWindowRef */window)
 {
     OSWindowRef theWindow = static_cast<OSWindowRef>(window);
     NSApplication *application = [NSApplication sharedApplication];
-    NSToolbar *toolbar = [window toolbar];
+    NSToolbar *toolbar = [theWindow toolbar];
     if([application isActive]) {
         // Launched from finder
         [toolbar setShowsBaselineSeparator:NO];
diff --git a/src/gui/kernel/qt_cocoa_helpers_mac_p.h b/src/gui/kernel/qt_cocoa_helpers_mac_p.h
index 5db121a..6b005ca 100644
--- a/src/gui/kernel/qt_cocoa_helpers_mac_p.h
+++ b/src/gui/kernel/qt_cocoa_helpers_mac_p.h
@@ -198,17 +198,25 @@ class QCocoaPostMessageArgs {
 public:
     id target;
     SEL selector;
-    QCocoaPostMessageArgs(id target, SEL selector) : target(target), selector(selector)
+    int argCount;
+    id arg1;
+    id arg2;
+    QCocoaPostMessageArgs(id target, SEL selector, int argCount=0, id arg1=0, id arg2=0)
+        : target(target), selector(selector), argCount(argCount), arg1(arg1), arg2(arg2)
     {
         [target retain];
+        [arg1 retain];
+        [arg2 retain];
     }
 
     ~QCocoaPostMessageArgs()
     {
+        [arg2 release];
+        [arg1 release];
         [target release];
     }
 };
-bool qt_cocoaPostMessage(id target, SEL selector);
+void qt_cocoaPostMessage(id target, SEL selector, int argCount=0, id arg1=0, id arg2=0);
 #endif
 
 #endif
diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp
index c7a9756..6132d10 100644
--- a/src/gui/text/qtextdocument.cpp
+++ b/src/gui/text/qtextdocument.cpp
@@ -1970,6 +1970,8 @@ QVariant QTextDocument::loadResource(int type, const QUrl &name)
             if (fi.exists()) {
                 resourceUrl =
                     QUrl::fromLocalFile(fi.absolutePath() + QDir::separator()).resolved(name);
+            } else if (currentURL.isEmpty()) {
+                resourceUrl.setScheme(QLatin1String("file"));
             }
         }
 
diff --git a/src/gui/widgets/qmenu_mac.mm b/src/gui/widgets/qmenu_mac.mm
index aaa113b..60023a8 100644
--- a/src/gui/widgets/qmenu_mac.mm
+++ b/src/gui/widgets/qmenu_mac.mm
@@ -1254,15 +1254,11 @@ QMenuPrivate::QMacMenuPrivate::addAction(QMacMenuAction *action, QMacMenuAction
 NSString *keySequenceToKeyEqivalent(const QKeySequence &accel)
 {
     quint32 accel_key = (accel[0] & ~(Qt::MODIFIER_MASK | Qt::UNICODE_ACCEL));
-    extern QChar qt_macSymbolForQtKey(int key); // qkeysequence.cpp
-    QChar keyEquiv = qt_macSymbolForQtKey(accel_key);
-    if (keyEquiv.isNull()) {
-        if (accel_key >= Qt::Key_F1 && accel_key <= Qt::Key_F15)
-            keyEquiv = (accel_key - Qt::Key_F1) + NSF1FunctionKey;
-        else
-            keyEquiv = unichar(QChar(accel_key).toLower().unicode());
-    }
-    return [NSString stringWithCharacters:&keyEquiv.unicode() length:1];
+    extern QChar qtKey2CocoaKey(Qt::Key key);
+    QChar cocoa_key = qtKey2CocoaKey(Qt::Key(accel_key));
+    if (cocoa_key.isNull())
+        cocoa_key = QChar(accel_key).toLower().unicode();
+    return [NSString stringWithCharacters:&cocoa_key.unicode() length:1];
 }
 
 // return the cocoa modifier mask for the QKeySequence (currently only looks at the first one).
@@ -2052,8 +2048,7 @@ bool QMenuBar::macUpdateMenuBar()
 {
 #ifdef QT_MAC_USE_COCOA
     QMacCocoaAutoReleasePool pool;
-    if (!qt_cocoaPostMessage(getMenuLoader(), @selector(qtUpdateMenubar)))
-        return QMenuBarPrivate::macUpdateMenuBarImmediatly();
+    qt_cocoaPostMessage(getMenuLoader(), @selector(qtUpdateMenubar));
     return true;
 #else
     return QMenuBarPrivate::macUpdateMenuBarImmediatly();
diff --git a/src/network/access/qnetworkaccessfilebackend.cpp b/src/network/access/qnetworkaccessfilebackend.cpp
index 4560153..710c258 100644
--- a/src/network/access/qnetworkaccessfilebackend.cpp
+++ b/src/network/access/qnetworkaccessfilebackend.cpp
@@ -65,10 +65,15 @@ QNetworkAccessFileBackendFactory::create(QNetworkAccessManager::Operation op,
     }
 
     QUrl url = request.url();
-    if (url.scheme() == QLatin1String("qrc") || !url.toLocalFile().isEmpty())
+    if (url.scheme().compare(QLatin1String("qrc"), Qt::CaseInsensitive) == 0 || url.isLocalFile()) {
         return new QNetworkAccessFileBackend;
-    else if (!url.isEmpty() && url.authority().isEmpty()) {
-        // check if QFile could, in theory, open this URL
+    } else if (!url.scheme().isEmpty() && url.authority().isEmpty()) {
+        // check if QFile could, in theory, open this URL via the file engines
+        // it has to be in the format:
+        //    prefix:path/to/file
+        // or prefix:/path/to/file
+        //
+        // this construct here must match the one below in open()
         QFileInfo fi(url.toString(QUrl::RemoveAuthority | QUrl::RemoveFragment | QUrl::RemoveQuery));
         if (fi.exists() || (op == QNetworkAccessManager::PutOperation && fi.dir().exists()))
             return new QNetworkAccessFileBackend;
diff --git a/src/network/access/qnetworkaccessftpbackend.cpp b/src/network/access/qnetworkaccessftpbackend.cpp
index 1a59011..da336d0 100644
--- a/src/network/access/qnetworkaccessftpbackend.cpp
+++ b/src/network/access/qnetworkaccessftpbackend.cpp
@@ -77,7 +77,7 @@ QNetworkAccessFtpBackendFactory::create(QNetworkAccessManager::Operation op,
     }
 
     QUrl url = request.url();
-    if (url.scheme() == QLatin1String("ftp"))
+    if (url.scheme().compare(QLatin1String("ftp"), Qt::CaseInsensitive) == 0)
         return new QNetworkAccessFtpBackend;
     return 0;
 }
diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp
index 1c7661d..10fdc6f 100644
--- a/src/network/access/qnetworkaccessmanager.cpp
+++ b/src/network/access/qnetworkaccessmanager.cpp
@@ -907,21 +907,20 @@ QNetworkReply *QNetworkAccessManager::createRequest(QNetworkAccessManager::Opera
 {
     Q_D(QNetworkAccessManager);
 
+    bool isLocalFile = req.url().isLocalFile();
+
     // fast path for GET on file:// URLs
-    // Also if the scheme is empty we consider it a file.
     // The QNetworkAccessFileBackend will right now only be used
     // for PUT or qrc://
     if ((op == QNetworkAccessManager::GetOperation || op == QNetworkAccessManager::HeadOperation)
-         && (req.url().scheme() == QLatin1String("file")
-             || req.url().scheme().isEmpty())) {
+         && isLocalFile) {
         return new QFileNetworkReply(this, req, op);
     }
 
 #ifndef QT_NO_BEARERMANAGEMENT
     // Return a disabled network reply if network access is disabled.
     // Except if the scheme is empty or file://.
-    if (!d->networkAccessible && !(req.url().scheme() == QLatin1String("file") ||
-                                      req.url().scheme().isEmpty())) {
+    if (!d->networkAccessible && !isLocalFile) {
         return new QDisabledNetworkReply(this, req, op);
     }
 
@@ -963,7 +962,7 @@ QNetworkReply *QNetworkAccessManager::createRequest(QNetworkAccessManager::Opera
     QUrl url = request.url();
     QNetworkReplyImpl *reply = new QNetworkReplyImpl(this);
 #ifndef QT_NO_BEARERMANAGEMENT
-    if (req.url().scheme() != QLatin1String("file") && !req.url().scheme().isEmpty()) {
+    if (!isLocalFile) {
         connect(this, SIGNAL(networkSessionConnected()),
                 reply, SLOT(_q_networkSessionConnected()));
     }