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

189 files changed, 3995 insertions, 6547 deletions

diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp
index f5afbec..6c5860c 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp
@@ -270,7 +270,7 @@ void QWebView::setPage(QWebPage *page)
     'ftp'. The result is then passed through QUrl's tolerant parser, and
     in the case or success, a valid QUrl is returned, or else a QUrl().
 
-    \section2 Examples:
+    \section1 Examples:
 
     \list
     \o webkit.org becomes http://webkit.org
@@ -617,6 +617,8 @@ qreal QWebView::textSizeMultiplier() const
     These hints are used to initialize QPainter before painting the web page.
 
     QPainter::TextAntialiasing is enabled by default.
+
+    \sa QPainter::renderHints()
 */
 QPainter::RenderHints QWebView::renderHints() const
 {
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebview.h b/src/3rdparty/webkit/WebKit/qt/Api/qwebview.h
index 5c2c7a0..0dab925 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebview.h
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebview.h
@@ -106,7 +106,7 @@ public:
 
     QPainter::RenderHints renderHints() const;
     void setRenderHints(QPainter::RenderHints hints);
-    void setRenderHint(QPainter::RenderHint hint, bool enabled);
+    void setRenderHint(QPainter::RenderHint hint, bool enabled = true);
 
     bool findText(const QString &subString, QWebPage::FindFlags options = 0);
 
diff --git a/src/corelib/concurrent/qtconcurrentthreadengine.h b/src/corelib/concurrent/qtconcurrentthreadengine.h
index 1f359fc..2f610de 100644
--- a/src/corelib/concurrent/qtconcurrentthreadengine.h
+++ b/src/corelib/concurrent/qtconcurrentthreadengine.h
@@ -238,9 +238,11 @@ protected:
 template <typename T>
 class ThreadEngineStarter : public ThreadEngineStarterBase<T>
 {
+    typedef ThreadEngineStarterBase<T> Base;
+    typedef ThreadEngine<T> TypedThreadEngine;
 public:
-    ThreadEngineStarter(ThreadEngine<T> *threadEngine)
-    :ThreadEngineStarterBase<T>(threadEngine) {}
+    ThreadEngineStarter(TypedThreadEngine *eng)
+        : Base(eng) { }
 
     T startBlocking()
     {
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index dbe25cb..bf6f8c0 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -319,10 +319,6 @@ namespace QT_NAMESPACE {}
 #  endif
 #endif
 
-#ifdef QT_MAC_USE_COCOA
-#define QT_MAC_NO_QUICKDRAW 1
-#endif
-
 #ifdef __LSB_VERSION__
 #  if __LSB_VERSION__ < 40
 #    error "This version of the Linux Standard Base is unsupported"
@@ -657,9 +653,7 @@ namespace QT_NAMESPACE {}
     in which case _BOOL is not defined
         this is the default in 4.2 compatibility mode triggered by -compat=4 */
 #  if __SUNPRO_CC >= 0x500
-#    if __SUNPRO_CC < 0x570
-#      define QT_NO_TEMPLATE_TEMPLATE_PARAMETERS
-#    endif
+#    define QT_NO_TEMPLATE_TEMPLATE_PARAMETERS
    /* see http://developers.sun.com/sunstudio/support/Ccompare.html */
 #    if __SUNPRO_CC >= 0x590
 #      define Q_ALIGNOF(type)   __alignof__(type)
@@ -668,6 +662,9 @@ namespace QT_NAMESPACE {}
 // using CC 5.9: Warning: attribute visibility is unsupported and will be skipped..
 //#      define Q_DECL_EXPORT     __attribute__((__visibility__("default")))
 #    endif
+#    if __SUNPRO_CC < 0x5a0
+#      define Q_NO_TEMPLATE_FRIENDS
+#    endif
 #    if !defined(_BOOL)
 #      define Q_NO_BOOL_TYPE
 #    endif
diff --git a/src/corelib/io/io.pri b/src/corelib/io/io.pri
index 5033b21..bd41f5e 100644
--- a/src/corelib/io/io.pri
+++ b/src/corelib/io/io.pri
@@ -65,7 +65,10 @@ win32 {
         SOURCES += io/qfsfileengine_unix.cpp
         SOURCES += io/qfsfileengine_iterator_unix.cpp
         SOURCES += io/qprocess_unix.cpp
-        mac:SOURCES += io/qsettings_mac.cpp
+        macx-*: {
+            HEADERS += io/qfilesystemwatcher_fsevents_p.h
+            SOURCES += io/qsettings_mac.cpp io/qfilesystemwatcher_fsevents.cpp
+        }
 
         linux-*:{
             SOURCES += \
diff --git a/src/corelib/io/qdatastream.cpp b/src/corelib/io/qdatastream.cpp
index 244299c..1023868 100644
--- a/src/corelib/io/qdatastream.cpp
+++ b/src/corelib/io/qdatastream.cpp
@@ -362,17 +362,19 @@ QDataStream::~QDataStream()
 /*!
     \fn QIODevice *QDataStream::device() const
 
-    Returns the I/O device currently set.
+    Returns the I/O device currently set, or 0 if no
+    device is currently set.
 
-    \sa setDevice(), unsetDevice()
+    \sa setDevice()
 */
 
 /*!
     void QDataStream::setDevice(QIODevice *d)
 
-    Sets the I/O device to \a d.
+    Sets the I/O device to \a d, which can be 0
+    to unset to current I/O device.
 
-    \sa device(), unsetDevice()
+    \sa device()
 */
 
 void QDataStream::setDevice(QIODevice *d)
diff --git a/src/corelib/io/qdiriterator.cpp b/src/corelib/io/qdiriterator.cpp
index 3bfea65..30d2558 100644
--- a/src/corelib/io/qdiriterator.cpp
+++ b/src/corelib/io/qdiriterator.cpp
@@ -309,17 +309,11 @@ bool QDirIteratorPrivate::matchesFilters(const QString &fileName, const QFileInf
                     || (!fi.exists() && fi.isSymLink())))
         return false;
 
-
-    if (!includeSystem && !dotOrDotDot && ((fi.exists() && !fi.isFile() && !fi.isDir() && !fi.isSymLink())
-                                           || (!fi.exists() && fi.isSymLink()))) {
-        return false;
-    }
-
     // skip directories
     const bool skipDirs = !(filters & (QDir::Dirs | QDir::AllDirs));
     if (skipDirs && fi.isDir()) {
-        if (!(includeHidden && !dotOrDotDot && fi.isHidden())
-              || (includeSystem && !fi.exists() && fi.isSymLink()))
+        if (!((includeHidden && !dotOrDotDot && fi.isHidden())
+              || (includeSystem && !fi.exists() && fi.isSymLink())))
             return false;
     }
 
diff --git a/src/corelib/io/qfilesystemwatcher.cpp b/src/corelib/io/qfilesystemwatcher.cpp
index b321644..27fe1c2 100644
--- a/src/corelib/io/qfilesystemwatcher.cpp
+++ b/src/corelib/io/qfilesystemwatcher.cpp
@@ -58,6 +58,9 @@
 #  include "qfilesystemwatcher_inotify_p.h"
 #  include "qfilesystemwatcher_dnotify_p.h"
 #elif defined(Q_OS_FREEBSD) || defined(Q_OS_MAC)
+#  if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5)
+#  include "qfilesystemwatcher_fsevents_p.h"
+#  endif //MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5)
 #  include "qfilesystemwatcher_kqueue_p.h"
 #endif
 
@@ -243,7 +246,12 @@ QFileSystemWatcherEngine *QFileSystemWatcherPrivate::createNativeEngine()
         eng = QDnotifyFileSystemWatcherEngine::create();
     return eng;
 #elif defined(Q_OS_FREEBSD) || defined(Q_OS_MAC)
-    return QKqueueFileSystemWatcherEngine::create();
+#  if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5)
+    if (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_5)
+        return QFSEventsFileSystemWatcherEngine::create();
+    else
+#  endif
+        return QKqueueFileSystemWatcherEngine::create();
 #else
     return 0;
 #endif
@@ -376,15 +384,17 @@ void QFileSystemWatcherPrivate::_q_directoryChanged(const QString &path, bool re
     \note The act of monitoring files and directories for
     modifications consumes system resources. This implies there is a
     limit to the number of files and directories your process can
-    monitor simultaneously. On Mac OS and all BSD variants, for
+    monitor simultaneously. On Mac OS X 10.4 and all BSD variants, for
     example, an open file descriptor is required for each monitored
-    file. The system limits the number of open file descriptors to 256
+    file. Some system limits the number of open file descriptors to 256
     by default. This means that addPath() and addPaths() will fail if
     your process tries to add more than 256 files or directories to
     the file system monitor. Also note that your process may have
     other file descriptors open in addition to the ones for files
     being monitored, and these other open descriptors also count in
-    the total.
+    the total. Mac OS X 10.5 and up use a different backend and do not
+    suffer from this issue.
+
 
     \sa QFile, QDir
 */
diff --git a/src/corelib/io/qfilesystemwatcher_fsevents.cpp b/src/corelib/io/qfilesystemwatcher_fsevents.cpp
new file mode 100644
index 0000000..3e0aee8
--- /dev/null
+++ b/src/corelib/io/qfilesystemwatcher_fsevents.cpp
@@ -0,0 +1,467 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtCore module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://www.qtsoftware.com/contact.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+#include <qplatformdefs.h>
+
+#include "qfilesystemwatcher.h"
+#include "qfilesystemwatcher_fsevents_p.h"
+
+#include <qdebug.h>
+#include <qfile.h>
+#include <qdatetime.h>
+#include <qfileinfo.h>
+#include <qvarlengtharray.h>
+
+#include <mach/mach.h>
+#include <sys/types.h>
+#include <CoreFoundation/CFRunLoop.h>
+#include <CoreFoundation/CFUUID.h>
+#include <CoreServices/CoreServices.h>
+#include <AvailabilityMacros.h>
+#include <private/qcore_mac_p.h>
+
+QT_BEGIN_NAMESPACE
+
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
+// Static operator overloading so for the sake of some convieniece.
+// They only live in this compilation unit to avoid polluting Qt in general.
+static bool operator==(const struct ::timespec &left, const struct ::timespec &right)
+{
+    return left.tv_sec == right.tv_sec
+            && left.tv_nsec == right.tv_nsec;
+}
+
+static bool operator==(const struct ::stat64 &left, const struct ::stat64 &right)
+{
+    return left.st_dev == right.st_dev
+            && left.st_mode == right.st_mode
+            && left.st_size == right.st_size
+            && left.st_ino == right.st_ino
+            && left.st_uid == right.st_uid
+            && left.st_gid == right.st_gid
+            && left.st_mtimespec == right.st_mtimespec
+            && left.st_ctimespec == right.st_ctimespec
+            && left.st_flags == right.st_flags;
+}
+
+static bool operator!=(const struct ::stat64 &left, const struct ::stat64 &right)
+{
+    return !(operator==(left, right));
+}
+
+
+static void addPathToHash(PathHash &pathHash, const QString &key, const QFileInfo &fileInfo,
+                          const QString &path)
+{
+    PathInfoList &list = pathHash[key];
+    list.push_back(PathInfo(path,
+                            fileInfo.absoluteFilePath().normalized(QString::NormalizationForm_D).toUtf8()));
+    pathHash.insert(key, list);
+}
+
+static void removePathFromHash(PathHash &pathHash, const QString &key, const QString &path)
+{
+    PathInfoList &list = pathHash[key];
+    // We make the assumption that the list contains unique paths
+    PathInfoList::iterator End = list.end();
+    PathInfoList::iterator it = list.begin();
+    while (it != End) {
+        if (it->originalPath == path) {
+            list.erase(it);
+            break;
+        }
+        ++it;
+    }
+    if (list.isEmpty())
+        pathHash.remove(key);
+}
+
+static void stopFSStream(FSEventStreamRef stream)
+{
+    if (stream) {
+        FSEventStreamStop(stream);
+        FSEventStreamInvalidate(stream);
+    }
+}
+
+static QString createFSStreamPath(const QString &absolutePath)
+{
+    // The path returned has a trailing slash, so ensure that here.
+    QString string = absolutePath;
+    string.reserve(string.size() + 1);
+    string.append(QLatin1Char('/'));
+    return string;
+}
+
+static void cleanupFSStream(FSEventStreamRef stream)
+{
+    if (stream)
+        FSEventStreamRelease(stream);
+}
+
+const FSEventStreamCreateFlags QtFSEventFlags = (kFSEventStreamCreateFlagUseCFTypes | kFSEventStreamCreateFlagNoDefer /* | kFSEventStreamCreateFlagWatchRoot*/);
+
+const CFTimeInterval Latency = 0.033; // This will do updates 30 times a second which is probably more than you need.
+#endif
+
+QFSEventsFileSystemWatcherEngine::QFSEventsFileSystemWatcherEngine()
+    : fsStream(0), pathsToWatch(0), threadsRunLoop(0)
+{
+}
+
+QFSEventsFileSystemWatcherEngine::~QFSEventsFileSystemWatcherEngine()
+{
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
+    // I assume that at this point, QFileSystemWatcher has already called stop
+    // on me, so I don't need to invalidate or stop my stream, simply
+    // release it.
+    cleanupFSStream(fsStream);
+    if (pathsToWatch)
+        CFRelease(pathsToWatch);
+#endif
+}
+
+QFSEventsFileSystemWatcherEngine *QFSEventsFileSystemWatcherEngine::create()
+{
+    return new QFSEventsFileSystemWatcherEngine();
+}
+
+QStringList QFSEventsFileSystemWatcherEngine::addPaths(const QStringList &paths,
+                                                       QStringList *files,
+                                                       QStringList *directories)
+{
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
+    stop();
+    QMutexLocker locker(&mutex);
+    QStringList failedToAdd;
+    // if we have a running FSStreamEvent, we have to kill it, we'll re-add the stream soon.
+    FSEventStreamEventId idToCheck;
+    if (fsStream) {
+        idToCheck = FSEventStreamGetLatestEventId(fsStream);
+        cleanupFSStream(fsStream);
+    } else {
+        idToCheck = kFSEventStreamEventIdSinceNow;
+    }
+
+    // Brain-dead approach, but works. FSEvents actually can already read sub-trees, but since it's
+    // work to figure out if we are doing a double register, we just register it twice as FSEvents
+    // seems smart enough to only deliver one event. We also duplicate directory entries in here
+    // (e.g., if you watch five files in the same directory, you get that directory included in the
+    // array 5 times). This stupidity also makes remove work correctly though. I'll freely admit
+    // that we could make this a bit smarter. If you do, check the auto-tests, they should catch at
+    // least a couple of the issues.
+    QCFType<CFMutableArrayRef> tmpArray = CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks);
+    for (int i = 0; i < paths.size(); ++i) {
+        const QString &path = paths.at(i);
+
+        QFileInfo fileInfo(path);
+        if (!fileInfo.exists()) {
+            failedToAdd.append(path);
+            continue;
+        }
+
+        if (fileInfo.isDir()) {
+            if (directories->contains(path)) {
+                failedToAdd.append(path);
+                continue;
+            } else {
+                directories->append(path);
+                // Full file path for dirs.
+                QCFString cfpath(createFSStreamPath(fileInfo.absoluteFilePath()));
+                addPathToHash(dirPathInfoHash, cfpath, fileInfo, path);
+                CFArrayAppendValue(tmpArray, cfpath);
+            }
+        } else {
+            if (files->contains(path)) {
+                failedToAdd.append(path);
+                continue;
+            } else {
+                // Just the absolute path (minus it's filename) for files.
+                QCFString cfpath(createFSStreamPath(fileInfo.absolutePath()));
+                files->append(path);
+                addPathToHash(filePathInfoHash, cfpath, fileInfo, path);
+                CFArrayAppendValue(tmpArray, cfpath);
+            }
+        }
+    }
+    if (CFArrayGetCount(tmpArray) > 0) {
+        if (pathsToWatch) {
+            CFArrayAppendArray(tmpArray, pathsToWatch, CFRangeMake(0, CFArrayGetCount(pathsToWatch)));
+            CFRelease(pathsToWatch);
+        }
+        pathsToWatch = CFArrayCreateCopy(kCFAllocatorDefault, tmpArray);
+    }
+    FSEventStreamContext context = { 0, this, 0, 0, 0 };
+    fsStream = FSEventStreamCreate(kCFAllocatorDefault,
+                                   QFSEventsFileSystemWatcherEngine::fseventsCallback,
+                                   &context, pathsToWatch,
+                                   idToCheck, Latency, QtFSEventFlags);
+    warmUpFSEvents();
+
+    return failedToAdd;
+#else
+    Q_UNUSED(paths);
+    Q_UNUSED(files);
+    Q_UNUSED(directories);
+    return QStringList();
+#endif
+}
+
+void QFSEventsFileSystemWatcherEngine::warmUpFSEvents()
+{
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
+    // This function assumes that the mutex has already been grabbed before calling it.
+    // It exits with the mutex still locked (Q_ASSERT(mutex.isLocked()) ;-).
+    start();
+    waitCondition.wait(&mutex);
+#endif
+}
+
+QStringList QFSEventsFileSystemWatcherEngine::removePaths(const QStringList &paths,
+                                                          QStringList *files,
+                                                          QStringList *directories)
+{
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
+    stop();
+    QMutexLocker locker(&mutex);
+    // short circuit for smarties that call remove before add and we have nothing.
+    if (pathsToWatch == 0)
+        return paths;
+    QStringList failedToRemove;
+    // if we have a running FSStreamEvent, we have to stop it, we'll re-add the stream soon.
+    FSEventStreamEventId idToCheck;
+    if (fsStream) {
+        idToCheck = FSEventStreamGetLatestEventId(fsStream);
+        cleanupFSStream(fsStream);
+        fsStream = 0;
+    } else {
+        idToCheck = kFSEventStreamEventIdSinceNow;
+    }
+
+    CFIndex itemCount = CFArrayGetCount(pathsToWatch);
+    QCFType<CFMutableArrayRef> tmpArray = CFArrayCreateMutableCopy(kCFAllocatorDefault, itemCount,
+                                                                   pathsToWatch);
+    CFRelease(pathsToWatch);
+    pathsToWatch = 0;
+    for (int i = 0; i < paths.size(); ++i) {
+        // Get the itemCount at the beginning to avoid any overruns during the iteration.
+        itemCount = CFArrayGetCount(tmpArray);
+        const QString &path = paths.at(i);
+        QFileInfo fi(path);
+        QCFString cfpath(createFSStreamPath(fi.absolutePath()));
+
+        CFIndex index = CFArrayGetFirstIndexOfValue(tmpArray, CFRangeMake(0, itemCount), cfpath);
+        if (index != -1) {
+            CFArrayRemoveValueAtIndex(tmpArray, index);
+            files->removeAll(path);
+            removePathFromHash(filePathInfoHash, cfpath, path);
+        } else {
+            // Could be a directory we are watching instead.
+            QCFString cfdirpath(createFSStreamPath(fi.absoluteFilePath()));
+            index = CFArrayGetFirstIndexOfValue(tmpArray, CFRangeMake(0, itemCount), cfdirpath);
+            if (index != -1) {
+                CFArrayRemoveValueAtIndex(tmpArray, index);
+                directories->removeAll(path);
+                removePathFromHash(dirPathInfoHash, cfpath, path);
+            } else {
+                failedToRemove.append(path);
+            }
+        }
+    }
+    itemCount = CFArrayGetCount(tmpArray);
+    if (itemCount != 0) {
+        pathsToWatch = CFArrayCreateCopy(kCFAllocatorDefault, tmpArray);
+
+        FSEventStreamContext context = { 0, this, 0, 0, 0 };
+        fsStream = FSEventStreamCreate(kCFAllocatorDefault,
+                                       QFSEventsFileSystemWatcherEngine::fseventsCallback,
+                                       &context, pathsToWatch, idToCheck, Latency, QtFSEventFlags);
+        warmUpFSEvents();
+    }
+    return failedToRemove;
+#else
+    Q_UNUSED(paths);
+    Q_UNUSED(files);
+    Q_UNUSED(directories);
+    return QStringList();
+#endif
+}
+
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
+void QFSEventsFileSystemWatcherEngine::updateList(PathInfoList &list, bool directory, bool emitSignals)
+{
+    PathInfoList::iterator End = list.end();
+    PathInfoList::iterator it = list.begin();
+    while (it != End) {
+        struct ::stat64 newInfo;
+        if (::stat64(it->absolutePath, &newInfo) == 0) {
+            if (emitSignals) {
+                if (newInfo != it->savedInfo) {
+                    it->savedInfo = newInfo;
+                    if (directory)
+                        emit directoryChanged(it->originalPath, false);
+                    else
+                        emit fileChanged(it->originalPath, false);
+                }
+            } else {
+                it->savedInfo = newInfo;
+            }
+        } else {
+            if (errno == ENOENT) {
+                if (emitSignals) {
+                    if (directory)
+                        emit directoryChanged(it->originalPath, true);
+                    else
+                        emit fileChanged(it->originalPath, true);
+                }
+                it = list.erase(it);
+                continue;
+            } else {
+                qWarning("%s:%d:QFSEventsFileSystemWatcherEngine: stat error on %s:%s",
+                         __FILE__, __LINE__, qPrintable(it->originalPath), strerror(errno));
+
+            }
+        }
+        ++it;
+    }
+}
+
+void QFSEventsFileSystemWatcherEngine::updateHash(PathHash &pathHash)
+{
+    PathHash::iterator HashEnd = pathHash.end();
+    PathHash::iterator it = pathHash.begin();
+    const bool IsDirectory = (&pathHash == &dirPathInfoHash);
+    while (it != HashEnd) {
+        updateList(it.value(), IsDirectory, false);
+        if (it.value().isEmpty())
+            it = pathHash.erase(it);
+        else
+            ++it;
+    }
+}
+#endif
+
+void QFSEventsFileSystemWatcherEngine::fseventsCallback(ConstFSEventStreamRef ,
+                                                        void *clientCallBackInfo, size_t numEvents,
+                                                        void *eventPaths,
+                                                        const FSEventStreamEventFlags eventFlags[],
+                                                        const FSEventStreamEventId [])
+{
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
+    QFSEventsFileSystemWatcherEngine *watcher = static_cast<QFSEventsFileSystemWatcherEngine *>(clientCallBackInfo);
+    QMutexLocker locker(&watcher->mutex);
+    CFArrayRef paths = static_cast<CFArrayRef>(eventPaths);
+    for (size_t i = 0; i < numEvents; ++i) {
+        const QString path = QCFString::toQString(
+                                    static_cast<CFStringRef>(CFArrayGetValueAtIndex(paths, i)));
+        const FSEventStreamEventFlags pathFlags = eventFlags[i];
+        // There are several flags that may be passed, but we really don't care about them ATM.
+        // Here they are and why we don't care.
+        // kFSEventStreamEventFlagHistoryDone--(very unlikely to be gotten, but even then, not much changes).
+        // kFSEventStreamEventFlagMustScanSubDirs--Likely means the data is very much out of date, we
+        //            aren't coalescing our directories, so again not so much of an issue
+        // kFSEventStreamEventFlagRootChanged | kFSEventStreamEventFlagMount | kFSEventStreamEventFlagUnmount--
+        // These three flags indicate something has changed, but the stat will likely show this, so
+        // there's not really much to worry about.
+        // (btw, FSEvents is not the correct way of checking for mounts/unmounts,
+        //  there are real CarbonCore events for that.)
+        Q_UNUSED(pathFlags);
+        if (watcher->filePathInfoHash.contains(path))
+            watcher->updateList(watcher->filePathInfoHash[path], false, true);
+
+        if (watcher->dirPathInfoHash.contains(path))
+            watcher->updateList(watcher->dirPathInfoHash[path], true, true);
+    }
+#else
+    Q_UNUSED(clientCallBackInfo);
+    Q_UNUSED(numEvents);
+    Q_UNUSED(eventPaths);
+    Q_UNUSED(eventFlags);
+#endif
+}
+
+void QFSEventsFileSystemWatcherEngine::stop()
+{
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
+    stopFSStream(fsStream);
+    if (threadsRunLoop)
+        CFRunLoopStop(threadsRunLoop);
+#endif
+}
+
+void QFSEventsFileSystemWatcherEngine::updateFiles()
+{
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
+    QMutexLocker locker(&mutex);
+    updateHash(filePathInfoHash);
+    updateHash(dirPathInfoHash);
+    if (filePathInfoHash.isEmpty() && dirPathInfoHash.isEmpty()) {
+        // Everything disappeared before we got to start, don't bother.
+        stop();
+        cleanupFSStream(fsStream);
+    }
+    waitCondition.wakeAll();
+#endif
+}
+
+void QFSEventsFileSystemWatcherEngine::run()
+{
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
+    threadsRunLoop = CFRunLoopGetCurrent();
+    FSEventStreamScheduleWithRunLoop(fsStream, threadsRunLoop, kCFRunLoopDefaultMode);
+    bool startedOK = FSEventStreamStart(fsStream);
+    // It's recommended by Apple that you only update the files after you've started
+    // the stream, because otherwise you might miss an update in between starting it.
+    updateFiles();
+#ifdef QT_NO_DEBUG
+    Q_UNUSED(startedOK);
+#else
+    Q_ASSERT(startedOK);
+#endif
+    // If for some reason we called stop up above (and invalidated our stream), this call will return
+    // immediately.
+    CFRunLoopRun();
+    threadsRunLoop = 0;
+#endif
+}
+
+QT_END_NAMESPACE
diff --git a/src/corelib/io/qfilesystemwatcher_fsevents_p.h b/src/corelib/io/qfilesystemwatcher_fsevents_p.h
new file mode 100644
index 0000000..4770867
--- /dev/null
+++ b/src/corelib/io/qfilesystemwatcher_fsevents_p.h
@@ -0,0 +1,127 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtCore module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://www.qtsoftware.com/contact.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+#ifndef FILEWATCHER_FSEVENTS_P_H
+#define FILEWATCHER_FSEVENTS_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of the QLibrary class.  This header file may change from
+// version to version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qfilesystemwatcher_p.h"
+
+#include <QtCore/qmutex.h>
+#include <QtCore/qwaitcondition.h>
+#include <QtCore/qthread.h>
+#include <QtCore/QHash>
+#include <QtCore/QLinkedList>
+#include <private/qcore_mac_p.h>
+#include <sys/stat.h>
+
+typedef struct __FSEventStream *FSEventStreamRef;
+typedef const struct __FSEventStream *ConstFSEventStreamRef;
+typedef const struct __CFArray *CFArrayRef;
+typedef UInt32 FSEventStreamEventFlags;
+typedef uint64_t FSEventStreamEventId;
+
+QT_BEGIN_NAMESPACE
+
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
+// Yes, I use a stat64 element here. QFileInfo requires too much knowledge about implementation
+// details to be used as a long-standing record. Since I'm going to have to store this information, I can
+// do the stat myself too.
+struct PathInfo {
+    PathInfo(const QString &path, const QByteArray &absPath)
+            : originalPath(path), absolutePath(absPath) {}
+    QString originalPath; // The path we need to emit
+    QByteArray absolutePath; // The path we need to stat.
+    struct ::stat64 savedInfo;  // All the info for the path so we can compare it.
+};
+typedef QLinkedList<PathInfo> PathInfoList;
+typedef QHash<QString, PathInfoList> PathHash;
+#endif
+
+class QFSEventsFileSystemWatcherEngine : public QFileSystemWatcherEngine
+{
+    Q_OBJECT
+public:
+    ~QFSEventsFileSystemWatcherEngine();
+
+    static QFSEventsFileSystemWatcherEngine *create();
+
+    QStringList addPaths(const QStringList &paths, QStringList *files, QStringList *directories);
+    QStringList removePaths(const QStringList &paths, QStringList *files, QStringList *directories);
+
+    void stop();
+
+private:
+    QFSEventsFileSystemWatcherEngine();
+    void warmUpFSEvents();
+    void updateFiles();
+
+    static void fseventsCallback(ConstFSEventStreamRef streamRef, void *clientCallBackInfo, size_t numEvents,
+                                  void *eventPaths, const FSEventStreamEventFlags eventFlags[],
+                                  const FSEventStreamEventId eventIds[]);
+    void run();
+    FSEventStreamRef fsStream;
+    CFArrayRef pathsToWatch;
+    CFRunLoopRef threadsRunLoop;
+    QMutex mutex;
+    QWaitCondition waitCondition;
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
+    PathHash filePathInfoHash;
+    PathHash dirPathInfoHash;
+    void updateHash(PathHash &pathHash);
+    void updateList(PathInfoList &list, bool directory, bool emitSignals);
+#endif
+};
+
+#endif
+
+QT_END_NAMESPACE
diff --git a/src/corelib/io/qfsfileengine_win.cpp b/src/corelib/io/qfsfileengine_win.cpp
index 53f0144..819034a 100644
--- a/src/corelib/io/qfsfileengine_win.cpp
+++ b/src/corelib/io/qfsfileengine_win.cpp
@@ -529,8 +529,7 @@ qint64 QFSFileEnginePrivate::nativeSize() const
                                         GetFileExInfoStandard, &attribData);
         if (!ok) {
             int errorCode = GetLastError();
-            if (errorCode != ERROR_INVALID_NAME
-                && errorCode != ERROR_FILE_NOT_FOUND && errorCode != ERROR_PATH_NOT_FOUND) {
+            if (errorCode == ERROR_ACCESS_DENIED || errorCode == ERROR_SHARING_VIOLATION) {
                 QByteArray path = nativeFilePath;
                 // path for the FindFirstFile should not end with a trailing slash
                 while (path.endsWith('\\'))
@@ -903,8 +902,7 @@ static inline bool isDirPath(const QString &dirPath, bool *existed)
     DWORD fileAttrib = ::GetFileAttributes((wchar_t*)QFSFileEnginePrivate::longFileName(path).utf16());
     if (fileAttrib == INVALID_FILE_ATTRIBUTES) {
         int errorCode = GetLastError();
-        if (errorCode != ERROR_INVALID_NAME
-            && errorCode != ERROR_FILE_NOT_FOUND && errorCode != ERROR_PATH_NOT_FOUND) {
+        if (errorCode == ERROR_ACCESS_DENIED || errorCode == ERROR_SHARING_VIOLATION) {
             // path for the FindFirstFile should not end with a trailing slash
             while (path.endsWith(QLatin1Char('\\')))
                 path.chop(1);
@@ -1194,8 +1192,7 @@ bool QFSFileEnginePrivate::doStat() const
             fileAttrib = GetFileAttributes((wchar_t*)QFSFileEnginePrivate::longFileName(fname).utf16());
             if (fileAttrib == INVALID_FILE_ATTRIBUTES) {
                 int errorCode = GetLastError();
-                if (errorCode != ERROR_INVALID_NAME
-                    && errorCode != ERROR_FILE_NOT_FOUND && errorCode != ERROR_PATH_NOT_FOUND) {
+                if (errorCode == ERROR_ACCESS_DENIED || errorCode == ERROR_SHARING_VIOLATION) {
                     QString path = QDir::toNativeSeparators(fname);
                     // path for the FindFirstFile should not end with a trailing slash
                     while (path.endsWith(QLatin1Char('\\')))
@@ -1810,8 +1807,7 @@ QDateTime QFSFileEngine::fileTime(FileTime time) const
         bool ok = ::GetFileAttributesEx((wchar_t*)QFSFileEnginePrivate::longFileName(d->filePath).utf16(), GetFileExInfoStandard, &attribData);
         if (!ok) {
             int errorCode = GetLastError();
-            if (errorCode != ERROR_INVALID_NAME
-                && errorCode != ERROR_FILE_NOT_FOUND && errorCode != ERROR_PATH_NOT_FOUND) {
+            if (errorCode == ERROR_ACCESS_DENIED || errorCode == ERROR_SHARING_VIOLATION) {
                 QString path = QDir::toNativeSeparators(d->filePath);
                 // path for the FindFirstFile should not end with a trailing slash
                 while (path.endsWith(QLatin1Char('\\')))
diff --git a/src/corelib/io/qprocess.cpp b/src/corelib/io/qprocess.cpp
index 8d23d35..e75c314 100644
--- a/src/corelib/io/qprocess.cpp
+++ b/src/corelib/io/qprocess.cpp
@@ -305,7 +305,7 @@ void QProcessPrivate::Channel::clear()
     writes to its standard output and standard error will be written
     to the standard output and standard error of the main process.
 
-    \sa setReadChannelMode()
+    \sa setProcessChannelMode()
 */
 
 /*!
@@ -862,7 +862,7 @@ void QProcess::setReadChannelMode(ProcessChannelMode mode)
     Returns the channel mode of the QProcess standard output and
     standard error channels.
 
-    \sa setReadChannelMode(), ProcessChannelMode, setReadChannel()
+    \sa setProcessChannelMode(), ProcessChannelMode, setReadChannel()
 */
 QProcess::ProcessChannelMode QProcess::processChannelMode() const
 {
@@ -879,7 +879,7 @@ QProcess::ProcessChannelMode QProcess::processChannelMode() const
 
     \snippet doc/src/snippets/code/src_corelib_io_qprocess.cpp 0
 
-    \sa readChannelMode(), ProcessChannelMode, setReadChannel()
+    \sa processChannelMode(), ProcessChannelMode, setReadChannel()
 */
 void QProcess::setProcessChannelMode(ProcessChannelMode mode)
 {
diff --git a/src/corelib/io/qprocess_unix.cpp b/src/corelib/io/qprocess_unix.cpp
index fafce07..607b734 100644
--- a/src/corelib/io/qprocess_unix.cpp
+++ b/src/corelib/io/qprocess_unix.cpp
@@ -1161,10 +1161,10 @@ bool QProcessPrivate::startDetached(const QString &program, const QStringList &a
 
     // To catch the startup of the child
     int startedPipe[2];
-    ::pipe(startedPipe);
+    qt_safe_pipe(startedPipe);
     // To communicate the pid of the child
     int pidPipe[2];
-    ::pipe(pidPipe);
+    qt_safe_pipe(pidPipe);
 
     pid_t childPid = qt_fork();
     if (childPid == 0) {
diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp
index a70b92f..16927ea 100644
--- a/src/corelib/io/qresource.cpp
+++ b/src/corelib/io/qresource.cpp
@@ -575,7 +575,7 @@ QResource::addSearchPath(const QString &path)
   Returns the current search path list. This list is consulted when
   creating a relative resource.
 
-  \sa addSearchPath()
+  \sa QDir::addSearchPath() QDir::setSearchPaths()
 */
 
 QStringList
diff --git a/src/corelib/kernel/qabstractitemmodel.cpp b/src/corelib/kernel/qabstractitemmodel.cpp
index 6e1d5c4..cd17076 100644
--- a/src/corelib/kernel/qabstractitemmodel.cpp
+++ b/src/corelib/kernel/qabstractitemmodel.cpp
@@ -2320,7 +2320,8 @@ void QAbstractItemModel::endRemoveColumns()
     \note The view to which the model is attached to will be reset as well.
 
     When a model is reset it means that any previous data reported from the
-    model is now invalid and has to be queried for again.
+    model is now invalid and has to be queried for again. This also means 
+    that the current item and any selected items will become invalid.
 
     When a model radically changes its data it can sometimes be easier to just
     call this function rather than emit dataChanged() to inform other
diff --git a/src/corelib/kernel/qcore_unix.cpp b/src/corelib/kernel/qcore_unix.cpp
index c5b0fc7..28c1d9c 100644
--- a/src/corelib/kernel/qcore_unix.cpp
+++ b/src/corelib/kernel/qcore_unix.cpp
@@ -47,6 +47,10 @@
 
 #include "qeventdispatcher_unix_p.h" // for the timeval operators
 
+#ifdef Q_OS_MAC
+#include <mach/mach_time.h>
+#endif
+
 #if !defined(QT_NO_CLOCK_MONOTONIC)
 # if defined(QT_BOOTSTRAPPED)
 #  define QT_NO_CLOCK_MONOTONIC
@@ -55,37 +59,72 @@
 
 QT_BEGIN_NAMESPACE
 
-static inline timeval gettime()
+bool qt_gettime_is_monotonic()
 {
-    timeval tv;
-#ifndef QT_NO_CLOCK_MONOTONIC
-    // use the monotonic clock
-    static volatile bool monotonicClockDisabled = false;
-    struct timespec ts;
-    if (!monotonicClockDisabled) {
-        if (clock_gettime(CLOCK_MONOTONIC, &ts) == -1) {
-            monotonicClockDisabled = true;
-        } else {
-            tv.tv_sec = ts.tv_sec;
-            tv.tv_usec = ts.tv_nsec / 1000;
-            return tv;
-        }
+#if (_POSIX_MONOTONIC_CLOCK-0 > 0) || defined(Q_OS_MAC)
+    return true;
+#else
+    static int returnValue = 0;
+
+    if (returnValue == 0) {
+#  if (_POSIX_MONOTONIC_CLOCK-0 < 0)
+        returnValue = -1;
+#  elif (_POSIX_MONOTONIC_CLOCK == 0)
+        // detect if the system support monotonic timers
+        long x = sysconf(_SC_MONOTONIC_CLOCK);
+        returnValue = (x >= 200112L) ? 1 : -1;
+#  endif
     }
+
+    return returnValue != -1;
 #endif
+}
+
+timeval qt_gettime()
+{
+    timeval tv;
+#if defined(Q_OS_MAC)
+    static mach_timebase_info_data_t info = {0,0};
+    if (info.denom == 0)
+        mach_timebase_info(&info);
+
+    uint64_t cpu_time = mach_absolute_time();
+    uint64_t nsecs = cpu_time * (info.numer / info.denom);
+    tv.tv_sec = nsecs / 1000000000ull;
+    tv.tv_usec = (nsecs / 1000) - (tv.tv_sec * 1000000);
+    return tv;
+#elif (_POSIX_MONOTONIC_CLOCK-0 > 0)
+    timespec ts;
+    clock_gettime(CLOCK_MONOTONIC, &ts);
+    tv.tv_sec = ts.tv_sec;
+    tv.tv_usec = ts.tv_nsec / 1000;
+    return tv;
+#else
+#  if !defined(QT_NO_CLOCK_MONOTONIC) && !defined(QT_BOOTSTRAPPED)
+    if (qt_gettime_is_monotonic()) {
+        timespec ts;
+        clock_gettime(CLOCK_MONOTONIC, &ts);
+        tv.tv_sec = ts.tv_sec;
+        tv.tv_usec = ts.tv_nsec / 1000;
+        return tv;
+    }
+#  endif
     // use gettimeofday
     ::gettimeofday(&tv, 0);
     return tv;
+#endif
 }
 
 static inline bool time_update(struct timeval *tv, const struct timeval &start,
                                const struct timeval &timeout)
 {
-    struct timeval now = gettime();
-    if (now < start) {
-        // clock reset, give up
+    if (!qt_gettime_is_monotonic()) {
+        // we cannot recalculate the timeout without a monotonic clock as the time may have changed
         return false;
     }
 
+    // clock source is monotonic, so we can recalculate how much timeout is left
+    struct timeval now = qt_gettime();
     *tv = timeout + start - now;
     return true;
 }
@@ -100,7 +139,7 @@ int qt_safe_select(int nfds, fd_set *fdread, fd_set *fdwrite, fd_set *fdexcept,
         return ret;
     }
 
-    timeval start = gettime();
+    timeval start = qt_gettime();
     timeval timeout = *orig_timeout;
 
     // loop and recalculate the timeout as needed
diff --git a/src/corelib/kernel/qcore_unix_p.h b/src/corelib/kernel/qcore_unix_p.h
index dd97841..bffd670 100644
--- a/src/corelib/kernel/qcore_unix_p.h
+++ b/src/corelib/kernel/qcore_unix_p.h
@@ -267,6 +267,8 @@ static inline pid_t qt_safe_waitpid(pid_t pid, int *status, int options)
     return ret;
 }
 
+bool qt_gettime_is_monotonic();
+timeval qt_gettime();
 Q_CORE_EXPORT int qt_safe_select(int nfds, fd_set *fdread, fd_set *fdwrite, fd_set *fdexcept,
                                  const struct timeval *tv);
 
diff --git a/src/corelib/kernel/qeventdispatcher_unix.cpp b/src/corelib/kernel/qeventdispatcher_unix.cpp
index 9deb78f..2943c6d 100644
--- a/src/corelib/kernel/qeventdispatcher_unix.cpp
+++ b/src/corelib/kernel/qeventdispatcher_unix.cpp
@@ -59,10 +59,6 @@
 #  include <sys/times.h>
 #endif
 
-#ifdef Q_OS_MAC
-#include <mach/mach_time.h>
-#endif
-
 QT_BEGIN_NAMESPACE
 
 Q_CORE_EXPORT bool qt_disable_lowpriority_timers=false;
@@ -263,18 +259,10 @@ int QEventDispatcherUNIXPrivate::doSelect(QEventLoop::ProcessEventsFlags flags,
 
 QTimerInfoList::QTimerInfoList()
 {
-#if (_POSIX_MONOTONIC_CLOCK-0 <= 0) && !defined(Q_OS_MAC)
-    useMonotonicTimers = false;
-
-#  if (_POSIX_MONOTONIC_CLOCK == 0)
-    // detect if the system support monotonic timers
-    long x = sysconf(_SC_MONOTONIC_CLOCK);
-    useMonotonicTimers = x != -1;
-#  endif
-
-    getTime(currentTime);
+    currentTime = qt_gettime();
 
-    if (!useMonotonicTimers) {
+#if (_POSIX_MONOTONIC_CLOCK-0 <= 0) && !defined(Q_OS_MAC)
+    if (!qt_gettime_is_monotonic()) {
         // not using monotonic timers, initialize the timeChanged() machinery
         previousTime = currentTime;
 
@@ -290,12 +278,6 @@ QTimerInfoList::QTimerInfoList()
         ticksPerSecond = 0;
         msPerTick = 0;
     }
-#else
-#  if defined(Q_OS_MAC)
-    useMonotonicTimers = true;
-#  endif
-    // using monotonic timers unconditionally
-    getTime(currentTime);
 #endif
 
     firstTimerInfo = currentTimerInfo = 0;
@@ -303,11 +285,24 @@ QTimerInfoList::QTimerInfoList()
 
 timeval QTimerInfoList::updateCurrentTime()
 {
-    getTime(currentTime);
-    return currentTime;
+    return (currentTime = qt_gettime());
 }
 
-#if (_POSIX_MONOTONIC_CLOCK-0 <= 0) || defined(QT_BOOTSTRAPPED)
+#if ((_POSIX_MONOTONIC_CLOCK-0 <= 0) && !defined(Q_OS_MAC)) || defined(QT_BOOTSTRAPPED)
+
+template <>
+timeval qAbs(const timeval &t)
+{
+    timeval tmp = t;
+    if (tmp.tv_sec < 0) {
+        tmp.tv_sec = -tmp.tv_sec - 1;
+        tmp.tv_usec -= 1000000;
+    }
+    if (tmp.tv_sec == 0 && tmp.tv_usec < 0) {
+        tmp.tv_usec = -tmp.tv_usec;
+    }
+    return normalizedTimeval(tmp);
+}
 
 /*
   Returns true if the real time clock has changed by more than 10%
@@ -321,69 +316,32 @@ bool QTimerInfoList::timeChanged(timeval *delta)
     tms unused;
     clock_t currentTicks = times(&unused);
 
-    int elapsedTicks = currentTicks - previousTicks;
+    clock_t elapsedTicks = currentTicks - previousTicks;
     timeval elapsedTime = currentTime - previousTime;
-    int elapsedMsecTicks = (elapsedTicks * 1000) / ticksPerSecond;
-    int deltaMsecs = (elapsedTime.tv_sec * 1000 + elapsedTime.tv_usec / 1000)
-                     - elapsedMsecTicks;
 
-    if (delta) {
-	delta->tv_sec = deltaMsecs / 1000;
-	delta->tv_usec = (deltaMsecs % 1000) * 1000;
-    }
+    timeval elapsedTimeTicks;
+    elapsedTimeTicks.tv_sec = elapsedTicks / ticksPerSecond;
+    elapsedTimeTicks.tv_usec = (((elapsedTicks * 1000) / ticksPerSecond) % 1000) * 1000;
+
+    timeval dummy;
+    if (!delta)
+        delta = &dummy;
+    *delta = elapsedTime - elapsedTimeTicks;
+
     previousTicks = currentTicks;
     previousTime = currentTime;
 
     // If tick drift is more than 10% off compared to realtime, we assume that the clock has
     // been set. Of course, we have to allow for the tick granularity as well.
-
-     return (qAbs(deltaMsecs) - msPerTick) * 10 > elapsedMsecTicks;
-}
-
-void QTimerInfoList::getTime(timeval &t)
-{
-#if defined(Q_OS_MAC)
-    {
-        static mach_timebase_info_data_t info = {0,0};
-        if (info.denom == 0)
-            mach_timebase_info(&info);
-
-        uint64_t cpu_time = mach_absolute_time();
-        uint64_t nsecs = cpu_time * (info.numer / info.denom);
-        t.tv_sec = nsecs * 1e-9;
-        t.tv_usec = nsecs * 1e-3 - (t.tv_sec * 1e6);
-        return;
-    }
-#elif !defined(QT_NO_CLOCK_MONOTONIC) && !defined(QT_BOOTSTRAPPED)
-    if (useMonotonicTimers) {
-        timespec ts;
-        clock_gettime(CLOCK_MONOTONIC, &ts);
-        t.tv_sec = ts.tv_sec;
-        t.tv_usec = ts.tv_nsec / 1000;
-        return;
-    }
-#endif
-
-    gettimeofday(&t, 0);
-    // NTP-related fix
-    while (t.tv_usec >= 1000000l) {
-        t.tv_usec -= 1000000l;
-        ++t.tv_sec;
-    }
-    while (t.tv_usec < 0l) {
-        if (t.tv_sec > 0l) {
-            t.tv_usec += 1000000l;
-            --t.tv_sec;
-        } else {
-            t.tv_usec = 0l;
-            break;
-        }
-    }
+    timeval tickGranularity;
+    tickGranularity.tv_sec = 0;
+    tickGranularity.tv_usec = msPerTick * 1000;
+    return elapsedTimeTicks < ((qAbs(*delta) - tickGranularity) * 10);
 }
 
 void QTimerInfoList::repairTimersIfNeeded()
 {
-    if (useMonotonicTimers)
+    if (qt_gettime_is_monotonic())
         return;
     timeval delta;
     if (timeChanged(&delta))
@@ -392,14 +350,6 @@ void QTimerInfoList::repairTimersIfNeeded()
 
 #else // !(_POSIX_MONOTONIC_CLOCK-0 <= 0) && !defined(QT_BOOTSTRAPPED)
 
-void QTimerInfoList::getTime(timeval &t)
-{
-    timespec ts;
-    clock_gettime(CLOCK_MONOTONIC, &ts);
-    t.tv_sec = ts.tv_sec;
-    t.tv_usec = ts.tv_nsec / 1000;
-}
-
 void QTimerInfoList::repairTimersIfNeeded()
 {
 }
@@ -428,7 +378,7 @@ void QTimerInfoList::timerRepair(const timeval &diff)
     // repair all timers
     for (int i = 0; i < size(); ++i) {
         register QTimerInfo *t = at(i);
-        t->timeout = t->timeout - diff;
+        t->timeout = t->timeout + diff;
     }
 }
 
@@ -625,25 +575,7 @@ QEventDispatcherUNIX::~QEventDispatcherUNIX()
 int QEventDispatcherUNIX::select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
                                  timeval *timeout)
 {
-    Q_D(QEventDispatcherUNIX);
-    if (timeout) {
-        // handle the case where select returns with a timeout, too
-        // soon.
-        timeval tvStart = d->timerList.currentTime;
-        timeval tvCurrent = tvStart;
-        timeval originalTimeout = *timeout;
-
-        int nsel;
-        do {
-            timeval tvRest = originalTimeout + tvStart - tvCurrent;
-            nsel = ::select(nfds, readfds, writefds, exceptfds, &tvRest);
-            d->timerList.getTime(tvCurrent);
-        } while (nsel == 0 && (tvCurrent - tvStart) < originalTimeout);
-
-        return nsel;
-    }
-
-    return ::select(nfds, readfds, writefds, exceptfds, timeout);
+    return ::qt_safe_select(nfds, readfds, writefds, exceptfds, timeout);
 }
 
 /*!
diff --git a/src/corelib/kernel/qeventdispatcher_unix_p.h b/src/corelib/kernel/qeventdispatcher_unix_p.h
index d1f7431..61d94c9 100644
--- a/src/corelib/kernel/qeventdispatcher_unix_p.h
+++ b/src/corelib/kernel/qeventdispatcher_unix_p.h
@@ -71,6 +71,18 @@ QT_BEGIN_NAMESPACE
 #endif
 
 // Internal operator functions for timevals
+inline timeval &normalizedTimeval(timeval &t)
+{
+    while (t.tv_usec > 1000000l) {
+        ++t.tv_sec;
+        t.tv_usec -= 1000000l;
+    }
+    while (t.tv_usec < 0l) {
+        --t.tv_sec;
+        t.tv_usec += 1000000l;
+    }
+    return t;
+}
 inline bool operator<(const timeval &t1, const timeval &t2)
 { return t1.tv_sec < t2.tv_sec || (t1.tv_sec == t2.tv_sec && t1.tv_usec < t2.tv_usec); }
 inline bool operator==(const timeval &t1, const timeval &t2)
@@ -78,31 +90,29 @@ inline bool operator==(const timeval &t1, const timeval &t2)
 inline timeval &operator+=(timeval &t1, const timeval &t2)
 {
     t1.tv_sec += t2.tv_sec;
-    if ((t1.tv_usec += t2.tv_usec) >= 1000000l) {
-        ++t1.tv_sec;
-        t1.tv_usec -= 1000000l;
-    }
-    return t1;
+    t1.tv_usec += t2.tv_usec;
+    return normalizedTimeval(t1);
 }
 inline timeval operator+(const timeval &t1, const timeval &t2)
 {
     timeval tmp;
     tmp.tv_sec = t1.tv_sec + t2.tv_sec;
-    if ((tmp.tv_usec = t1.tv_usec + t2.tv_usec) >= 1000000l) {
-        ++tmp.tv_sec;
-        tmp.tv_usec -= 1000000l;
-    }
-    return tmp;
+    tmp.tv_usec = t1.tv_usec + t2.tv_usec;
+    return normalizedTimeval(tmp);
 }
 inline timeval operator-(const timeval &t1, const timeval &t2)
 {
     timeval tmp;
-    tmp.tv_sec = t1.tv_sec - t2.tv_sec;
-    if ((tmp.tv_usec = t1.tv_usec - t2.tv_usec) < 0l) {
-        --tmp.tv_sec;
-        tmp.tv_usec += 1000000l;
-    }
-    return tmp;
+    tmp.tv_sec = t1.tv_sec - (t2.tv_sec - 1);
+    tmp.tv_usec = t1.tv_usec - (t2.tv_usec + 1000000);
+    return normalizedTimeval(tmp);
+}
+inline timeval operator*(const timeval &t1, int mul)
+{
+    timeval tmp;
+    tmp.tv_sec = t1.tv_sec * mul;
+    tmp.tv_usec = t1.tv_usec * mul;
+    return normalizedTimeval(tmp);
 }
 
 // internal timer info
@@ -116,9 +126,7 @@ struct QTimerInfo {
 
 class QTimerInfoList : public QList<QTimerInfo*>
 {
-#if (_POSIX_MONOTONIC_CLOCK-0 <= 0) || defined(QT_BOOTSTRAPPED)
-    bool useMonotonicTimers;
-
+#if ((_POSIX_MONOTONIC_CLOCK-0 <= 0) && !defined(Q_OS_MAC)) || defined(QT_BOOTSTRAPPED)
     timeval previousTime;
     clock_t previousTicks;
     int ticksPerSecond;
@@ -133,8 +141,6 @@ class QTimerInfoList : public QList<QTimerInfo*>
 public:
     QTimerInfoList();
 
-    void getTime(timeval &t);
-
     timeval currentTime;
     timeval updateCurrentTime();
 
diff --git a/src/corelib/statemachine/qstate.cpp b/src/corelib/statemachine/qstate.cpp
index f74edc3..2042288 100644
--- a/src/corelib/statemachine/qstate.cpp
+++ b/src/corelib/statemachine/qstate.cpp
@@ -215,6 +215,8 @@ QList<QAbstractTransition*> QStatePrivate::transitions() const
     return result;
 }
 
+#ifndef QT_NO_PROPERTIES
+
 /*!
   Instructs this state to set the property with the given \a name of the given
   \a object to the given \a value when the state is entered.
@@ -239,6 +241,8 @@ void QState::assignProperty(QObject *object, const char *name,
     d->propertyAssignments.append(QPropertyAssignment(object, name, value));
 }
 
+#endif // QT_NO_PROPERTIES
+
 /*!
   Returns this state's error state. 
 
diff --git a/src/corelib/statemachine/qstate.h b/src/corelib/statemachine/qstate.h
index 41d32be..ce88b25 100644
--- a/src/corelib/statemachine/qstate.h
+++ b/src/corelib/statemachine/qstate.h
@@ -87,8 +87,10 @@ public:
     ChildMode childMode() const;
     void setChildMode(ChildMode mode);
 
+#ifndef QT_NO_PROPERTIES
     void assignProperty(QObject *object, const char *name,
                         const QVariant &value);
+#endif
 
 Q_SIGNALS:
     void finished();
diff --git a/src/corelib/statemachine/qstatemachine.cpp b/src/corelib/statemachine/qstatemachine.cpp
index 5402b04..a02480b 100644
--- a/src/corelib/statemachine/qstatemachine.cpp
+++ b/src/corelib/statemachine/qstatemachine.cpp
@@ -395,7 +395,9 @@ void QStateMachinePrivate::microstep(QEvent *event, const QList<QAbstractTransit
 #endif
     executeTransitionContent(event, enabledTransitions);
     QList<QAbstractState*> enteredStates = enterStates(event, enabledTransitions);
+#ifndef QT_NO_PROPERTIES
     applyProperties(enabledTransitions, exitedStates, enteredStates);
+#endif
 #ifdef QSTATEMACHINE_DEBUG
     qDebug() << q_func() << ": configuration after entering states:" << configuration;
     qDebug() << q_func() << ": end microstep";
@@ -666,6 +668,8 @@ void QStateMachinePrivate::addStatesToEnter(QAbstractState *s, QState *root,
 	}
 }
 
+#ifndef QT_NO_PROPERTIES
+
 void QStateMachinePrivate::applyProperties(const QList<QAbstractTransition*> &transitionList,
                                            const QList<QAbstractState*> &exitedStates,
                                            const QList<QAbstractState*> &enteredStates)
@@ -853,6 +857,8 @@ void QStateMachinePrivate::applyProperties(const QList<QAbstractTransition*> &tr
     }
 }
 
+#endif // QT_NO_PROPERTIES
+
 bool QStateMachinePrivate::isFinal(const QAbstractState *s)
 {
     return qobject_cast<const QFinalState*>(s) != 0;
@@ -932,6 +938,8 @@ bool QStateMachinePrivate::isInFinalState(QAbstractState* s) const
         return false;
 }
 
+#ifndef QT_NO_PROPERTIES
+
 void QStateMachinePrivate::registerRestorable(QObject *object, const QByteArray &propertyName)
 {
     RestorableId id(object, propertyName);
@@ -976,6 +984,8 @@ void QStateMachinePrivate::unregisterRestorable(QObject *object, const QByteArra
     registeredRestorables.remove(id);
 }
 
+#endif // QT_NO_PROPERTIES
+
 QAbstractState *QStateMachinePrivate::findErrorState(QAbstractState *context)
 {
     // Find error state recursively in parent hierarchy if not set explicitly for context state
@@ -1088,12 +1098,14 @@ void QStateMachinePrivate::_q_animationFinished()
         resetAnimationEndValues.remove(anim);
     }
 
+#ifndef QT_NO_PROPERTIES
     // Set the final property value.
     QPropertyAssignment assn = propertyForAnimation.take(anim);
     Q_ASSERT(assn.object != 0);
     assn.object->setProperty(assn.propertyName, assn.value);
     if (!assn.explicitlySet)
         unregisterRestorable(assn.object, assn.propertyName);
+#endif
 
     QAbstractState *state = stateForAnimation.take(anim);
     Q_ASSERT(state != 0);
@@ -1161,8 +1173,10 @@ void QStateMachinePrivate::_q_start()
     QEvent nullEvent(QEvent::None);
     executeTransitionContent(&nullEvent, transitions);
     QList<QAbstractState*> enteredStates = enterStates(&nullEvent, transitions);
+#ifndef QT_NO_PROPERTIES
     applyProperties(transitions, QList<QAbstractState*>() << start,
                     enteredStates);
+#endif
     delete start;
 
 #ifdef QSTATEMACHINE_DEBUG
diff --git a/src/corelib/statemachine/qstatemachine_p.h b/src/corelib/statemachine/qstatemachine_p.h
index 21e405d..cae21aa 100644
--- a/src/corelib/statemachine/qstatemachine_p.h
+++ b/src/corelib/statemachine/qstatemachine_p.h
@@ -151,6 +151,7 @@ public:
                                 void **args);    
     void scheduleProcess();
     
+#ifndef QT_NO_PROPERTIES
     typedef QPair<QObject *, QByteArray> RestorableId;
     QHash<RestorableId, QVariant> registeredRestorables;
     void registerRestorable(QObject *object, const QByteArray &propertyName);
@@ -158,6 +159,7 @@ public:
     bool hasRestorable(QObject *object, const QByteArray &propertyName) const;
     QVariant restorableValue(QObject *object, const QByteArray &propertyName) const;
     QList<QPropertyAssignment> restorablesToPropertyList(const QHash<RestorableId, QVariant> &restorables) const;
+#endif
 
     State state;
     bool processing;
diff --git a/src/corelib/tools/qbytearraymatcher.h b/src/corelib/tools/qbytearraymatcher.h
index 697b6ff..4bad24c 100644
--- a/src/corelib/tools/qbytearraymatcher.h
+++ b/src/corelib/tools/qbytearraymatcher.h
@@ -81,13 +81,14 @@ private:
 // explicitely allow anonymous unions for RVCT to prevent compiler warnings
 #pragma anon_unions
 #endif
+    struct Data {
+        uchar q_skiptable[256];
+        const uchar *p;
+        int l;
+    }; 
     union {
         uint dummy[256];
-        struct {
-            uchar q_skiptable[256];
-            const uchar *p;
-            int l;
-        } p;
+        Data p;
     };
 };
 
diff --git a/src/corelib/tools/qsharedpointer.cpp b/src/corelib/tools/qsharedpointer.cpp
index 85085c5..59dfffe 100644
--- a/src/corelib/tools/qsharedpointer.cpp
+++ b/src/corelib/tools/qsharedpointer.cpp
@@ -803,29 +803,19 @@
 #    endif
 #  endif
 
-#  if !defined(BACKTRACE_SUPPORTED)
-// Dummy implementation of the functions.
-// Using QHashDummyValue also means that the QHash below is actually a QSet
-typedef QT_PREPEND_NAMESPACE(QHashDummyValue) Backtrace;
-
-static inline Backtrace saveBacktrace() { return Backtrace(); }
-static inline void printBacktrace(Backtrace) { }
-
-#  else
+#  if defined(BACKTRACE_SUPPORTED)
 #    include <sys/types.h>
 #    include <execinfo.h>
 #    include <stdio.h>
 #    include <unistd.h>
 #    include <sys/wait.h>
 
-typedef QT_PREPEND_NAMESPACE(QByteArray) Backtrace;
-
-static inline Backtrace saveBacktrace() __attribute__((always_inline));
-static inline Backtrace saveBacktrace()
+static inline QByteArray saveBacktrace() __attribute__((always_inline));
+static inline QByteArray saveBacktrace()
 {
     static const int maxFrames = 32;
 
-    Backtrace stacktrace;
+    QByteArray stacktrace;
     stacktrace.resize(sizeof(void*) * maxFrames);
     int stack_size = backtrace((void**)stacktrace.data(), maxFrames);
     stacktrace.resize(sizeof(void*) * stack_size);
@@ -833,7 +823,7 @@ static inline Backtrace saveBacktrace()
     return stacktrace;
 }
 
-static void printBacktrace(Backtrace stacktrace)
+static void printBacktrace(QByteArray stacktrace)
 {
     void *const *stack = (void *const *)stacktrace.constData();
     int stack_size = stacktrace.size() / sizeof(void*);
@@ -884,11 +874,19 @@ static void printBacktrace(Backtrace stacktrace)
 
 namespace {
     QT_USE_NAMESPACE
+    struct Data {
+        const volatile void *pointer;
+#  ifdef BACKTRACE_SUPPORTED
+        QByteArray backtrace;
+#  endif
+    };
+
     class KnownPointers
     {
     public:
         QMutex mutex;
-        QHash<void *, Backtrace> values;
+        QHash<const void *, Data> dPointers;
+        QHash<const volatile void *, const void *> dataPointers;
     };
 }
 
@@ -896,38 +894,101 @@ Q_GLOBAL_STATIC(KnownPointers, knownPointers)
 
 QT_BEGIN_NAMESPACE
 
+namespace QtSharedPointer {
+    Q_CORE_EXPORT void internalSafetyCheckAdd(const volatile void *);
+    Q_CORE_EXPORT void internalSafetyCheckRemove(const volatile void *);
+}
+
+/*!
+    \internal
+*/
+void QtSharedPointer::internalSafetyCheckAdd(const volatile void *)
+{
+    // Qt 4.5 compatibility
+    // this function is broken by design, so it was replaced with internalSafetyCheckAdd2
+    //
+    // it's broken because we tracked the pointers added and
+    // removed from QSharedPointer, converted to void*.
+    // That is, this is supposed to track the "top-of-object" pointer in
+    // case of multiple inheritance.
+    //
+    // However, it doesn't work well in some compilers:
+    // if you create an object with a class of type A and the last reference
+    // is dropped of type B, then the value passed to internalSafetyCheckRemove could
+    // be different than was added. That would leave dangling addresses.
+    //
+    // So instead, we track the pointer by the d-pointer instead.
+}
+
 /*!
     \internal
 */
-void QtSharedPointer::internalSafetyCheckAdd(const volatile void *ptr)
+void QtSharedPointer::internalSafetyCheckRemove(const volatile void *)
 {
+    // Qt 4.5 compatibility
+    // see comments above
+}
+
+/*!
+    \internal
+*/
+void QtSharedPointer::internalSafetyCheckAdd2(const void *d_ptr, const volatile void *ptr)
+{
+    // see comments above for the rationale for this function
     KnownPointers *const kp = knownPointers();
     if (!kp)
         return;                 // end-game: the application is being destroyed already
 
     QMutexLocker lock(&kp->mutex);
-    void *actual = const_cast<void*>(ptr);
-    if (kp->values.contains(actual)) {
-        printBacktrace(knownPointers()->values.value(actual));
-        qFatal("QSharedPointerData: internal self-check failed: pointer %p was already tracked "
-               "by another QSharedPointerData object", actual);
+    Q_ASSERT(!kp->dPointers.contains(d_ptr));
+
+    //qDebug("Adding d=%p value=%p", d_ptr, ptr);
+    
+    const void *other_d_ptr = kp->dataPointers.value(ptr, 0);
+    if (other_d_ptr) {
+#  ifdef BACKTRACE_SUPPORTED
+        printBacktrace(knownPointers()->dPointers.value(other_d_ptr).backtrace);
+#  endif
+        qFatal("QSharedPointer: internal self-check failed: pointer %p was already tracked "
+               "by another QSharedPointer object %p", ptr, other_d_ptr);
     }
 
-    kp->values.insert(actual, saveBacktrace());
+    Data data;
+    data.pointer = ptr;
+#  ifdef BACKTRACE_SUPPORTED
+    data.backtrace = saveBacktrace();
+#  endif
+
+    kp->dPointers.insert(d_ptr, data);
+    kp->dataPointers.insert(ptr, d_ptr);
 }
 
 /*!
     \internal
 */
-void QtSharedPointer::internalSafetyCheckRemove(const volatile void *ptr)
+void QtSharedPointer::internalSafetyCheckRemove2(const void *d_ptr)
 {
     KnownPointers *const kp = knownPointers();
     if (!kp)
         return;                 // end-game: the application is being destroyed already
 
     QMutexLocker lock(&kp->mutex);
-    void *actual = const_cast<void*>(ptr);
-    kp->values.remove(actual);
+
+    QHash<const void *, Data>::iterator it = kp->dPointers.find(d_ptr);
+    if (it == kp->dPointers.end()) {
+        qFatal("QSharedPointer: internal self-check inconsistency: pointer %p was not tracked. "
+               "To use QT_SHAREDPOINTER_TRACK_POINTERS, you have to enable it throughout "
+               "in your code.", d_ptr);
+    }
+
+    QHash<const volatile void *, const void *>::iterator it2 = kp->dataPointers.find(it->pointer);
+    Q_ASSERT(it2 != kp->dataPointers.end());
+
+    //qDebug("Removing d=%p value=%p", d_ptr, it->pointer);
+    
+    // remove entries
+    kp->dataPointers.erase(it2);
+    kp->dPointers.erase(it);
 }
 
 QT_END_NAMESPACE
diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h
index 739a949..b8f4139 100644
--- a/src/corelib/tools/qsharedpointer_impl.h
+++ b/src/corelib/tools/qsharedpointer_impl.h
@@ -48,6 +48,7 @@
 #pragma qt_sync_stop_processing
 #endif
 
+#include <new>
 #include <QtCore/qatomic.h>
 #include <QtCore/qobject.h>    // for qobject_cast
 
@@ -97,9 +98,9 @@ namespace QtSharedPointer {
     template <class X, class Y> QSharedPointer<X> copyAndSetPointer(X * ptr, const QSharedPointer<Y> &src);
 
     // used in debug mode to verify the reuse of pointers
-    Q_CORE_EXPORT void internalSafetyCheckAdd(const volatile void *);
-    Q_CORE_EXPORT void internalSafetyCheckRemove(const volatile void *);
-
+    Q_CORE_EXPORT void internalSafetyCheckAdd2(const void *, const volatile void *);
+    Q_CORE_EXPORT void internalSafetyCheckRemove2(const void *);
+    
     template <class T, typename Klass, typename RetVal>
     inline void executeDeleter(T *t, RetVal (Klass:: *memberDeleter)())
     { (t->*memberDeleter)(); }
@@ -145,17 +146,8 @@ namespace QtSharedPointer {
 
         inline void internalConstruct(T *ptr)
         {
-#ifdef QT_SHAREDPOINTER_TRACK_POINTERS
-            if (ptr) internalSafetyCheckAdd(ptr);
-#endif
             value = ptr;
         }
-        inline void internalDestroy()
-        {
-#ifdef QT_SHAREDPOINTER_TRACK_POINTERS
-            if (value) internalSafetyCheckRemove(value);
-#endif
-        }
 
 #if defined(Q_NO_TEMPLATE_FRIENDS)
     public:
@@ -178,15 +170,89 @@ namespace QtSharedPointer {
     };
 
     template <class T, typename Deleter>
-    struct ExternalRefCountWithSpecializedDeleter: public ExternalRefCountData
+    struct CustomDeleter
     {
-        T *ptr;
         Deleter deleter;
+        T *ptr;
+
+        inline CustomDeleter(T *p, Deleter d) : deleter(d), ptr(p) {}
+    };
 
-        inline ExternalRefCountWithSpecializedDeleter(T *p, Deleter d)
-            : ptr(p), deleter(d)
+    struct ExternalRefCountWithDestroyFn: public ExternalRefCountData
+    {
+        typedef void (*DestroyerFn)(ExternalRefCountData *);
+        DestroyerFn destroyer;
+
+        inline ExternalRefCountWithDestroyFn(DestroyerFn d)
+            : destroyer(d)
         { }
-        inline bool destroy() { executeDeleter(ptr, deleter); return true; }
+
+        inline bool destroy() { destroyer(this); return true; }
+        inline void operator delete(void *ptr) { ::operator delete(ptr); }
+    };
+
+    template <class T, typename Deleter>
+    struct ExternalRefCountWithCustomDeleter: public ExternalRefCountWithDestroyFn
+    {
+        typedef ExternalRefCountWithCustomDeleter Self;
+        typedef ExternalRefCountWithDestroyFn Parent;
+        typedef CustomDeleter<T, Deleter> Next;
+        Next extra;
+
+        static inline void deleter(ExternalRefCountData *self)
+        {
+            Self *realself = static_cast<Self *>(self);
+            executeDeleter(realself->extra.ptr, realself->extra.deleter);
+        }
+
+        static inline Self *create(T *ptr, Deleter userDeleter)
+        {
+            DestroyerFn destroy = &deleter;
+            Self *d = static_cast<Self *>(::operator new(sizeof(Self)));
+
+            // initialize the two sub-objects
+            new (&d->extra) Next(ptr, userDeleter);
+            new (d) Parent(destroy); // can't throw
+
+            return d;
+        }
+    private:
+        // prevent construction and the emission of virtual symbols
+        ExternalRefCountWithCustomDeleter();
+        ~ExternalRefCountWithCustomDeleter();
+    };
+
+    template <class T>
+    struct ExternalRefCountWithContiguousData: public ExternalRefCountWithDestroyFn
+    {
+        typedef ExternalRefCountWithDestroyFn Parent;
+        T data;
+
+        static void deleter(ExternalRefCountData *self)
+        {
+            ExternalRefCountWithContiguousData *that =
+                    static_cast<ExternalRefCountWithContiguousData *>(self);
+            that->data.~T();
+        }
+
+        static inline ExternalRefCountData *create(T **ptr)
+        {
+            DestroyerFn destroy = &deleter;
+            ExternalRefCountWithContiguousData *d =
+                static_cast<ExternalRefCountWithContiguousData *>(::operator new(sizeof(ExternalRefCountWithContiguousData)));
+
+            // initialize the d-pointer sub-object
+            // leave d->data uninitialized
+            new (d) Parent(destroy); // can't throw
+
+            *ptr = &d->data;
+            return d;
+        }
+
+    private:
+        // prevent construction and the emission of virtual symbols
+        ExternalRefCountWithContiguousData();
+        ~ExternalRefCountWithContiguousData();
     };
 
     template <class T>
@@ -198,8 +264,9 @@ namespace QtSharedPointer {
         inline void ref() const { d->weakref.ref(); d->strongref.ref(); }
         inline bool deref()
         {
-            if (!d->strongref.deref())
-                this->internalDestroy();
+            if (!d->strongref.deref()) {
+                internalDestroy();
+            }
             return d->weakref.deref();
         }
 
@@ -209,6 +276,9 @@ namespace QtSharedPointer {
             Q_ASSERT(!d);
             if (ptr)
                 d = new Data;
+#ifdef QT_SHAREDPOINTER_TRACK_POINTERS
+            if (ptr) internalSafetyCheckAdd2(d, ptr);
+#endif
         }
 
         template <typename Deleter>
@@ -217,7 +287,21 @@ namespace QtSharedPointer {
             Basic<T>::internalConstruct(ptr);
             Q_ASSERT(!d);
             if (ptr)
-                d = new ExternalRefCountWithSpecializedDeleter<T, Deleter>(ptr, deleter);
+                d = ExternalRefCountWithCustomDeleter<T, Deleter>::create(ptr, deleter);
+#ifdef QT_SHAREDPOINTER_TRACK_POINTERS
+            if (ptr) internalSafetyCheckAdd2(d, ptr);
+#endif
+        }
+
+        inline void internalCreate()
+        {
+            T *ptr;
+            d = ExternalRefCountWithContiguousData<T>::create(&ptr);
+
+            Basic<T>::internalConstruct(ptr);
+#ifdef QT_SHAREDPOINTER_TRACK_POINTERS
+            if (ptr) internalSafetyCheckAdd2(d, ptr);
+#endif
         }
 
         inline ExternalRefCount() : d(0) { }
@@ -233,7 +317,9 @@ namespace QtSharedPointer {
 
         inline void internalDestroy()
         {
-            Basic<T>::internalDestroy();
+#ifdef QT_SHAREDPOINTER_TRACK_POINTERS
+            internalSafetyCheckRemove2(d);
+#endif
             if (!d->destroy())
                 delete this->value;
         }
@@ -347,6 +433,17 @@ public:
     inline void clear() { *this = QSharedPointer<T>(); }
 
     QWeakPointer<T> toWeakRef() const;
+
+public:
+    static inline QSharedPointer<T> create()
+    {
+        QSharedPointer<T> result;
+        result.internalCreate();
+
+        // now initialize the data
+        new (result.data()) T();
+        return result;
+    }
 };
 
 template <class T>
diff --git a/src/corelib/tools/qstringbuilder.h b/src/corelib/tools/qstringbuilder.h
index 3b43253..463c32d 100644
--- a/src/corelib/tools/qstringbuilder.h
+++ b/src/corelib/tools/qstringbuilder.h
@@ -163,7 +163,7 @@ template <> struct QConcatenable<QString>
     static inline void appendTo(const QString &a, QChar *&out)
     {
         const int n = a.size();
-        memcpy(out, (char*)a.constData(), sizeof(QChar) * n);
+        memcpy(out, reinterpret_cast<const char*>(a.constData()), sizeof(QChar) * n);
         out += n; 
     }
 };
@@ -175,7 +175,7 @@ template <> struct QConcatenable<QStringRef>
     static inline void appendTo(QStringRef a, QChar *&out)
     {
         const int n = a.size();
-        memcpy(out, (char*)a.constData(), sizeof(QChar) * n);
+        memcpy(out, reinterpret_cast<const char*>(a.constData()), sizeof(QChar) * n);
         out += n; 
     }
 };
diff --git a/src/corelib/xml/qxmlstream.cpp b/src/corelib/xml/qxmlstream.cpp
index 42ed04e..3e8f73e 100644
--- a/src/corelib/xml/qxmlstream.cpp
+++ b/src/corelib/xml/qxmlstream.cpp
@@ -334,12 +334,17 @@ QXmlStreamEntityResolver *QXmlStreamReader::entityResolver() const
   from the PrematureEndOfDocumentError error and continues parsing the
   new data with the next call to readNext().
 
-  For example, if you read data from the network using QHttp, you
-  would connect its \l{QHttp::readyRead()}{readyRead()} signal to a
-  custom slot. In this slot, you read all available data with
-  \l{QHttp::readAll()}{readAll()} and pass it to the XML stream reader
-  using addData(). Then you call your custom parsing function that
-  reads the XML events from the reader.
+  For example, if your application reads data from the network using a
+  \l{QNetworkAccessManager} {network access manager}, you would issue
+  a \l{QNetworkRequest} {network request} to the manager and receive a
+  \l{QNetworkReply} {network reply} in return. Since a QNetworkReply
+  is a QIODevice, you connect its \l{QNetworkReply::readyRead()}
+  {readyRead()} signal to a custom slot, e.g. \c{slotReadyRead()} in
+  the code snippet shown in the discussion for QNetworkAccessManager.
+  In this slot, you read all available data with
+  \l{QNetworkReply::readAll()} {readAll()} and pass it to the XML
+  stream reader using addData(). Then you call your custom parsing
+  function that reads the XML events from the reader.
 
   \section1 Performance and memory consumption
 
diff --git a/src/declarative/fx/fx.pri b/src/declarative/fx/fx.pri
index 24c5536..9b4b5ab 100644
--- a/src/declarative/fx/fx.pri
+++ b/src/declarative/fx/fx.pri
@@ -36,7 +36,6 @@ HEADERS += \
            fx/qfxtextedit_p.h \
            fx/qfxtext.h \
            fx/qfxtext_p.h \
-           fx/qfxtransform.h \
            fx/qfxpixmap.cpp \
            fx/qfxvisualitemmodel.h \
            fx/qfxlistview.h \
@@ -65,7 +64,6 @@ SOURCES += \
            fx/qfxlineedit.cpp \
            fx/qfxtext.cpp \
            fx/qfxtextedit.cpp \
-           fx/qfxtransform.cpp \
            fx/qfxpixmap.cpp \
            fx/qfxvisualitemmodel.cpp \
            fx/qfxlistview.cpp \
diff --git a/src/declarative/fx/qfxanchors.cpp b/src/declarative/fx/qfxanchors.cpp
index 9704fef..9093c8e 100644
--- a/src/declarative/fx/qfxanchors.cpp
+++ b/src/declarative/fx/qfxanchors.cpp
@@ -152,9 +152,9 @@ void QFxAnchorsPrivate::fillChanged()
     if (!fill || !isItemComplete())
         return;
 
-    if (fill == item->itemParent()) {                         //child-parent
+    if (fill == item->parentItem()) {                         //child-parent
         setItemPos(QPointF(leftMargin, topMargin));
-    } else if (fill->itemParent() == item->itemParent()) {   //siblings
+    } else if (fill->parentItem() == item->parentItem()) {   //siblings
         setItemPos(QPointF(fill->x()+leftMargin, fill->y()+topMargin));
     }
     setItemWidth(fill->width()-leftMargin-rightMargin);
@@ -166,12 +166,12 @@ void QFxAnchorsPrivate::centeredInChanged()
     if (!centeredIn || fill || !isItemComplete())
         return;
 
-    if (centeredIn == item->itemParent()) {
-        QPointF p((item->itemParent()->width() - item->width()) / 2.,
-                  (item->itemParent()->height() - item->height()) / 2.);
+    if (centeredIn == item->parentItem()) {
+        QPointF p((item->parentItem()->width() - item->width()) / 2.,
+                  (item->parentItem()->height() - item->height()) / 2.);
         setItemPos(p);
 
-    } else if (centeredIn->itemParent() == item->itemParent()) {
+    } else if (centeredIn->parentItem() == item->parentItem()) {
 
         QPointF p(centeredIn->x() + (centeredIn->width() - item->width()) / 2.,
                   centeredIn->y() + (centeredIn->height() - item->height()) / 2.);
@@ -328,7 +328,7 @@ void QFxAnchors::setFill(QFxItem *f)
         d->fill = f;
         return;
     }
-    if (f != d->item->itemParent() && f->itemParent() != d->item->itemParent()){
+    if (f != d->item->parentItem() && f->parentItem() != d->item->parentItem()){
         qmlInfo(d->item) << "Can't anchor to an item that isn't a parent or sibling.";
         return;
     }
@@ -360,7 +360,7 @@ void QFxAnchors::setCenteredIn(QFxItem* c)
         d->centeredIn = c;
         return;
     }
-    if (c != d->item->itemParent() && c->itemParent() != d->item->itemParent()){
+    if (c != d->item->parentItem() && c->parentItem() != d->item->parentItem()){
         qmlInfo(d->item) << "Can't anchor to an item that isn't a parent or sibling.";
         return;
     }
@@ -379,10 +379,10 @@ bool QFxAnchorsPrivate::calcStretch(const QFxAnchorLine &edge1,
                                     QFxAnchorLine::AnchorLine line,
                                     int &stretch)
 {
-    bool edge1IsParent = (edge1.item == item->itemParent());
-    bool edge2IsParent = (edge2.item == item->itemParent());
-    bool edge1IsSibling = (edge1.item->itemParent() == item->itemParent());
-    bool edge2IsSibling = (edge2.item->itemParent() == item->itemParent());
+    bool edge1IsParent = (edge1.item == item->parentItem());
+    bool edge2IsParent = (edge2.item == item->parentItem());
+    bool edge1IsSibling = (edge1.item->parentItem() == item->parentItem());
+    bool edge2IsSibling = (edge2.item->parentItem() == item->parentItem());
 
     bool invalid = false;
     if ((edge2IsParent && edge1IsParent) || (edge2IsSibling && edge1IsSibling)) {
@@ -390,10 +390,10 @@ bool QFxAnchorsPrivate::calcStretch(const QFxAnchorLine &edge1,
                     - ((int)position(edge1.item, edge1.anchorLine) + offset1);
     } else if (edge2IsParent && edge1IsSibling) {
         stretch = ((int)position(edge2.item, edge2.anchorLine) + offset2)
-                    - ((int)position(item->itemParent(), line)
+                    - ((int)position(item->parentItem(), line)
                     + (int)position(edge1.item, edge1.anchorLine) + offset1);
     } else if (edge2IsSibling && edge1IsParent) {
-        stretch = ((int)position(item->itemParent(), line) + (int)position(edge2.item, edge2.anchorLine) + offset2)
+        stretch = ((int)position(item->parentItem(), line) + (int)position(edge2.item, edge2.anchorLine) + offset2)
                     - ((int)position(edge1.item, edge1.anchorLine) + offset1);
     } else
         invalid = true;
@@ -422,9 +422,9 @@ void QFxAnchorsPrivate::updateVerticalAnchors()
                 setItemHeight(height);
 
             //Handle top
-            if (top.item == item->itemParent()) {
+            if (top.item == item->parentItem()) {
                 setItemY(adjustedPosition(top.item, top.anchorLine) + topMargin);
-            } else if (top.item->itemParent() == item->itemParent()) {
+            } else if (top.item->parentItem() == item->parentItem()) {
                 setItemY(position(top.item, top.anchorLine) + topMargin);
             }
         } else if (usedAnchors & QFxAnchors::HasBottomAnchor) {
@@ -438,24 +438,24 @@ void QFxAnchorsPrivate::updateVerticalAnchors()
             }
 
             //Handle bottom
-            if (bottom.item == item->itemParent()) {
+            if (bottom.item == item->parentItem()) {
                 setItemY(adjustedPosition(bottom.item, bottom.anchorLine) - item->height() - bottomMargin);
-            } else if (bottom.item->itemParent() == item->itemParent()) {
+            } else if (bottom.item->parentItem() == item->parentItem()) {
                 setItemY(position(bottom.item, bottom.anchorLine) - item->height() - bottomMargin);
             }
         } else if (usedAnchors & QFxAnchors::HasVCenterAnchor) {
             //(stetching handled above)
 
             //Handle vCenter
-            if (vCenter.item == item->itemParent()) {
+            if (vCenter.item == item->parentItem()) {
                 setItemY(adjustedPosition(vCenter.item, vCenter.anchorLine)
                               - item->height()/2 + vCenterOffset);
-            } else if (vCenter.item->itemParent() == item->itemParent()) {
+            } else if (vCenter.item->parentItem() == item->parentItem()) {
                 setItemY(position(vCenter.item, vCenter.anchorLine) - item->height()/2 + vCenterOffset);
             }
         } else if (usedAnchors & QFxAnchors::HasBaselineAnchor) {
             //Handle baseline
-            if (baseline.item->itemParent() == item->itemParent()) {
+            if (baseline.item->parentItem() == item->parentItem()) {
                 setItemY(position(baseline.item, baseline.anchorLine) - item->baselineOffset());
             }
         }
@@ -488,9 +488,9 @@ void QFxAnchorsPrivate::updateHorizontalAnchors()
                 setItemWidth(width);
 
             //Handle left
-            if (left.item == item->itemParent()) {
+            if (left.item == item->parentItem()) {
                 setItemX(adjustedPosition(left.item, left.anchorLine) + leftMargin);
-            } else if (left.item->itemParent() == item->itemParent()) {
+            } else if (left.item->parentItem() == item->parentItem()) {
                 setItemX(position(left.item, left.anchorLine) + leftMargin);
             }
         } else if (usedAnchors & QFxAnchors::HasRightAnchor) {
@@ -504,16 +504,16 @@ void QFxAnchorsPrivate::updateHorizontalAnchors()
             }
 
             //Handle right
-            if (right.item == item->itemParent()) {
+            if (right.item == item->parentItem()) {
                 setItemX(adjustedPosition(right.item, right.anchorLine) - item->width() - rightMargin);
-            } else if (right.item->itemParent() == item->itemParent()) {
+            } else if (right.item->parentItem() == item->parentItem()) {
                 setItemX(position(right.item, right.anchorLine) - item->width() - rightMargin);
             }
         } else if (usedAnchors & QFxAnchors::HasHCenterAnchor) {
             //Handle hCenter
-            if (hCenter.item == item->itemParent()) {
+            if (hCenter.item == item->parentItem()) {
                 setItemX(adjustedPosition(hCenter.item, hCenter.anchorLine) - item->width()/2 + hCenterOffset);
-            } else if (hCenter.item->itemParent() == item->itemParent()) {
+            } else if (hCenter.item->parentItem() == item->parentItem()) {
                 setItemX(position(hCenter.item, hCenter.anchorLine) - item->width()/2 + hCenterOffset);
             }
         }
@@ -892,7 +892,7 @@ bool QFxAnchorsPrivate::checkHAnchorValid(QFxAnchorLine anchor) const
     } else if (anchor.anchorLine & QFxAnchorLine::Vertical_Mask) {
         qmlInfo(item) << "Can't anchor a horizontal edge to a vertical edge.";
         return false;
-    } else if (anchor.item != item->itemParent() && anchor.item->itemParent() != item->itemParent()){
+    } else if (anchor.item != item->parentItem() && anchor.item->parentItem() != item->parentItem()){
         qmlInfo(item) << "Can't anchor to an item that isn't a parent or sibling.";
         return false;
     } else if (anchor.item == item) {
@@ -929,7 +929,7 @@ bool QFxAnchorsPrivate::checkVAnchorValid(QFxAnchorLine anchor) const
     } else if (anchor.anchorLine & QFxAnchorLine::Horizontal_Mask) {
         qmlInfo(item) << "Can't anchor a vertical edge to a horizontal edge.";
         return false;
-    } else if (anchor.item != item->itemParent() && anchor.item->itemParent() != item->itemParent()){
+    } else if (anchor.item != item->parentItem() && anchor.item->parentItem() != item->parentItem()){
         qmlInfo(item) << "Can't anchor to an item that isn't a parent or sibling.";
         return false;
     } else if (anchor.item == item){
diff --git a/src/declarative/fx/qfxcomponentinstance.cpp b/src/declarative/fx/qfxcomponentinstance.cpp
index 3ea45bd..a85b25d 100644
--- a/src/declarative/fx/qfxcomponentinstance.cpp
+++ b/src/declarative/fx/qfxcomponentinstance.cpp
@@ -113,7 +113,7 @@ void QFxComponentInstance::create()
             QFxItem *objitem = qobject_cast<QFxItem *>(obj);
             if (objitem) {
                 d->instance = objitem;
-                objitem->setItemParent(this);
+                objitem->setParentItem(this);
                 objitem->setFocus(true);
                 connect(objitem, SIGNAL(widthChanged()), this, SLOT(updateSize()));
                 connect(objitem, SIGNAL(heightChanged()), this, SLOT(updateSize()));
diff --git a/src/declarative/fx/qfxflipable.cpp b/src/declarative/fx/qfxflipable.cpp
index fafd04a..228d938 100644
--- a/src/declarative/fx/qfxflipable.cpp
+++ b/src/declarative/fx/qfxflipable.cpp
@@ -41,7 +41,7 @@
 
 #include "qfxflipable.h"
 #include "private/qfxitem_p.h"
-#include "qfxtransform.h"
+#include "QtGui/qgraphicstransform.h"
 #include <QtDeclarative/qmlinfo.h>
 
 QT_BEGIN_NAMESPACE
@@ -50,18 +50,15 @@ QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Flipable,QFxFlipable)
 
 class QFxFlipablePrivate : public QFxItemPrivate
 {
+    Q_DECLARE_PUBLIC(QFxFlipable)
 public:
-    QFxFlipablePrivate() : current(QFxFlipable::Front), front(0), back(0), axis(0), rotation(0) {}
+    QFxFlipablePrivate() : current(QFxFlipable::Front), front(0), back(0) {}
 
-    void setBackTransform();
-    void _q_updateAxis();
+    void updateSceneTransformFromParent();
 
     QFxFlipable::Side current;
     QFxItem *front;
     QFxItem *back;
-    QFxAxis *axis;
-    QFxRotation3D axisRotation;
-    qreal rotation;
 };
 
 /*!
@@ -174,104 +171,6 @@ void QFxFlipable::setBack(QFxItem *back)
 }
 
 /*!
-    \qmlproperty Axis Flipable::axis
-
-    The axis to flip around. See the \l Axis documentation for more
-    information on specifying an axis.
-*/
-
-QFxAxis *QFxFlipable::axis()
-{
-    Q_D(QFxFlipable);
-    return d->axis;
-}
-
-void QFxFlipable::setAxis(QFxAxis *axis)
-{
-    Q_D(QFxFlipable);
-    //### disconnect if we are already connected?
-    if (d->axis)
-        disconnect(d->axis, SIGNAL(updated()), this, SLOT(_q_updateAxis()));
-    d->axis = axis;
-    connect(d->axis, SIGNAL(updated()), this, SLOT(_q_updateAxis()));
-    d->_q_updateAxis();
-}
-
-void QFxFlipablePrivate::_q_updateAxis()
-{
-    axisRotation.axis()->setStartX(axis->startX());
-    axisRotation.axis()->setStartY(axis->startY());
-    axisRotation.axis()->setEndX(axis->endX());
-    axisRotation.axis()->setEndY(axis->endY());
-    axisRotation.axis()->setEndZ(axis->endZ());
-}
-
-void QFxFlipablePrivate::setBackTransform()
-{
-    if (!back)
-        return;
-
-    QPointF p1(0, 0);
-    QPointF p2(1, 0);
-    QPointF p3(1, 1);
-
-    axisRotation.setAngle(180);
-    p1 = axisRotation.transform().map(p1);
-    p2 = axisRotation.transform().map(p2);
-    p3 = axisRotation.transform().map(p3);
-    axisRotation.setAngle(rotation);
-
-    QTransform mat;
-    mat.translate(back->width()/2,back->height()/2);
-    if (back->width() && p1.x() >= p2.x())
-        mat.rotate(180, Qt::YAxis);
-    if (back->height() && p2.y() >= p3.y())
-        mat.rotate(180, Qt::XAxis);
-    mat.translate(-back->width()/2,-back->height()/2);
-    back->setTransform(mat);
-}
-
-/*!
-    \qmlproperty real Flipable::rotation
-    The angle to rotate the flipable. For example, to show the back side of the flipable
-    you can set the rotation to 180.
-*/
-qreal QFxFlipable::rotation() const
-{
-    Q_D(const QFxFlipable);
-    return d->rotation;
-}
-
-void QFxFlipable::setRotation(qreal angle)
-{
-    Q_D(QFxFlipable);
-    d->rotation = angle;
-    d->axisRotation.setAngle(angle);
-    setTransform(d->axisRotation.transform());
-
-
-    int simpleAngle = int(angle) % 360;
-
-    Side newSide;
-    if (simpleAngle < 91 || simpleAngle > 270) {
-       newSide = Front;
-    } else {
-        newSide = Back;
-    }
-
-    if (newSide != d->current) {
-        d->current = newSide;
-        if (d->front)
-            d->front->setOpacity((d->current==Front)?1.:0.);
-        if (d->back) {
-            d->setBackTransform();
-            d->back->setOpacity((d->current==Back)?1.:0.);
-        }
-        emit sideChanged();
-    }
-}
-
-/*!
   \qmlproperty enumeration Flipable::side
 
   The side of the Flippable currently visible. Possible values are \c
@@ -280,50 +179,55 @@ void QFxFlipable::setRotation(qreal angle)
 QFxFlipable::Side QFxFlipable::side() const
 {
     Q_D(const QFxFlipable);
+    if (d->dirtySceneTransform)
+        const_cast<QFxFlipablePrivate *>(d)->updateSceneTransformFromParent();
+
     return d->current;
 }
 
-//in some cases the user may want to specify a more complex transformation.
-//in that case, we still allow the generic use of transform.
-//(the logic here should be kept in sync with setBackTransform and setRotation)
-void QFxFlipable::transformChanged(const QTransform &trans)
+// determination on the currently visible side of the flipable
+// has to be done on the complete scene transform to give
+// correct results.
+void QFxFlipablePrivate::updateSceneTransformFromParent()
 {
-    Q_D(QFxFlipable);
+    Q_Q(QFxFlipable);
+
+    QFxItemPrivate::updateSceneTransformFromParent();
     QPointF p1(0, 0);
     QPointF p2(1, 0);
     QPointF p3(1, 1);
 
-    p1 = trans.map(p1);
-    p2 = trans.map(p2);
-    p3 = trans.map(p3);
+    p1 = sceneTransform.map(p1);
+    p2 = sceneTransform.map(p2);
+    p3 = sceneTransform.map(p3);
 
     qreal cross = (p1.x() - p2.x()) * (p3.y() - p2.y()) -
                   (p1.y() - p2.y()) * (p3.x() - p2.x());
 
-    Side newSide;
+    QFxFlipable::Side newSide;
     if (cross > 0) {
-       newSide = Back;
+       newSide = QFxFlipable::Back;
     } else {
-        newSide = Front;
+        newSide = QFxFlipable::Front;
     }
 
-    if (newSide != d->current) {
-        d->current = newSide;
-        if (d->current==Back) {
+    if (newSide != current) {
+        current = newSide;
+        if (current == QFxFlipable::Back) {
             QTransform mat;
-            mat.translate(d->back->width()/2,d->back->height()/2);
-            if (d->back->width() && p1.x() >= p2.x())
+            mat.translate(back->width()/2,back->height()/2);
+            if (back->width() && p1.x() >= p2.x())
                 mat.rotate(180, Qt::YAxis);
-            if (d->back->height() && p2.y() >= p3.y())
+            if (back->height() && p2.y() >= p3.y())
                 mat.rotate(180, Qt::XAxis);
-            mat.translate(-d->back->width()/2,-d->back->height()/2);
-            d->back->setTransform(mat);
+            mat.translate(-back->width()/2,-back->height()/2);
+            back->setTransform(mat);
         }
-        if (d->front)
-            d->front->setOpacity((d->current==Front)?1.:0.);
-        if (d->back)
-            d->back->setOpacity((d->current==Back)?1.:0.);
-        emit sideChanged();
+        if (front)
+            front->setOpacity((current==QFxFlipable::Front)?1.:0.);
+        if (back)
+            back->setOpacity((current==QFxFlipable::Back)?1.:0.);
+        emit q->sideChanged();
     }
 }
 
diff --git a/src/declarative/fx/qfxflipable.h b/src/declarative/fx/qfxflipable.h
index 5aa038d..0ab8fd2 100644
--- a/src/declarative/fx/qfxflipable.h
+++ b/src/declarative/fx/qfxflipable.h
@@ -45,6 +45,7 @@
 #include <QtCore/QObject>
 #include <QtGui/QTransform>
 #include <QtDeclarative/qfxitem.h>
+#include <QtGui/qvector3d.h>
 
 QT_BEGIN_HEADER
 
@@ -52,7 +53,6 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
-class QFxAxis;
 class QFxFlipablePrivate;
 class Q_DECLARATIVE_EXPORT QFxFlipable : public QFxItem
 {
@@ -61,8 +61,6 @@ class Q_DECLARATIVE_EXPORT QFxFlipable : public QFxItem
     Q_ENUMS(Side)
     Q_PROPERTY(QFxItem *front READ front WRITE setFront)
     Q_PROPERTY(QFxItem *back READ back WRITE setBack)
-    Q_PROPERTY(QFxAxis *axis READ axis WRITE setAxis)
-    Q_PROPERTY(qreal rotation READ rotation WRITE setRotation)
     Q_PROPERTY(Side side READ side NOTIFY sideChanged)
 public:
     QFxFlipable(QFxItem *parent=0);
@@ -74,23 +72,13 @@ public:
     QFxItem *back();
     void setBack(QFxItem *);
 
-    QFxAxis *axis();
-    void setAxis(QFxAxis *axis);
-
-    qreal rotation() const;
-    void setRotation(qreal angle);
-
     enum Side { Front, Back };
     Side side() const;
 
-protected:
-    virtual void transformChanged(const QTransform &);
-
 Q_SIGNALS:
     void sideChanged();
 
 private:
-    Q_PRIVATE_SLOT(d_func(), void _q_updateAxis())
     Q_DISABLE_COPY(QFxFlipable)
     Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxFlipable)
 };
diff --git a/src/declarative/fx/qfxgridview.cpp b/src/declarative/fx/qfxgridview.cpp
index 27ac92d..8df6f2a 100644
--- a/src/declarative/fx/qfxgridview.cpp
+++ b/src/declarative/fx/qfxgridview.cpp
@@ -1380,9 +1380,9 @@ void QFxGridView::destroyRemoved()
 void QFxGridView::createdItem(int index, QFxItem *item)
 {
     Q_D(QFxGridView);
-    item->setItemParent(this);
+    item->setParentItem(this);
     if (d->requestedIndex != index) {
-        item->setItemParent(this);
+        item->setParentItem(this);
         d->unrequestedItems.insert(item, index);
         if (d->flow == QFxGridView::LeftToRight) {
             item->setPos(QPointF(d->colPosAt(index), d->rowPosAt(index)));
diff --git a/src/declarative/fx/qfxitem.cpp b/src/declarative/fx/qfxitem.cpp
index f8ed7b4..a65b51a 100644
--- a/src/declarative/fx/qfxitem.cpp
+++ b/src/declarative/fx/qfxitem.cpp
@@ -48,6 +48,7 @@
 #include <QGraphicsSceneMouseEvent>
 #include <QtScript/qscriptengine.h>
 #include <private/qfxperf_p.h>
+#include <QtGui/qgraphicstransform.h>
 
 #include <QtDeclarative/qmlengine.h>
 #include <private/qmlengine_p.h>
@@ -55,7 +56,6 @@
 #include "qlistmodelinterface.h"
 #include "qfxanchors_p.h"
 
-#include "qfxtransform.h"
 #include "qfxscalegrid.h"
 #include "qfxview.h"
 #include "qmlstategroup.h"
@@ -74,6 +74,11 @@ QT_BEGIN_NAMESPACE
 QML_DEFINE_NOCREATE_TYPE(QFxContents)
 QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Item,QFxItem)
 
+QML_DEFINE_NOCREATE_TYPE(QGraphicsTransform);
+QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Scale,QGraphicsScale)
+QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Rotation,QGraphicsRotation)
+QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Rotation3D,QGraphicsRotation3D)
+
 /*!
     \group group_animation
     \title Animation
@@ -308,12 +313,6 @@ void QFxContents::setItem(QFxItem *item)
 */
 
 /*!
-    \fn void QFxItem::scaleChanged()
-
-    This signal is emitted when the scale of the item changes.
-*/
-
-/*!
     \fn void QFxItem::stateChanged(const QString &state)
 
     This signal is emitted when the \a state of the item changes.
@@ -354,7 +353,7 @@ void QFxContents::setItem(QFxItem *item)
 
     This signal is emitted when the parent of the item changes.
 
-    \sa setItemParent()
+    \sa setParentItem()
 */
 
 /*!
@@ -440,22 +439,23 @@ QFxItem::~QFxItem()
     \property QFxItem::parent
     This property holds the parent of the item.
 */
-void QFxItem::setItemParent(QFxItem *parent)
+void QFxItem::setParentItem(QFxItem *parent)
 {
-    setParent(parent);
+    QFxItem *oldParent = parentItem();
+    if (parent == oldParent || !parent) return;
+
+    QObject::setParent(parent);
+    QGraphicsObject::setParentItem(parent);
+
+    parentChanged(parent, oldParent);
 }
 
 /*!
     Returns the QFxItem parent of this item.
 */
-QFxItem *QFxItem::itemParent() const
-{
-    return qobject_cast<QFxItem *>(QGraphicsItem::parentItem());
-}
-
 QFxItem *QFxItem::parentItem() const
 {
-    return itemParent();
+    return qobject_cast<QFxItem *>(QGraphicsObject::parentItem());
 }
 
 /*!
@@ -638,6 +638,45 @@ void QFxItemPrivate::children_clear()
     // ###
 }
 
+
+void QFxItemPrivate::transform_removeAt(int i)
+{
+    if (!transformData)
+        return;
+    transformData->graphicsTransforms.removeAt(i);
+    dirtySceneTransform = 1;
+}
+
+int QFxItemPrivate::transform_count() const
+{
+    return transformData ? transformData->graphicsTransforms.size() : 0;
+}
+
+void QFxItemPrivate::transform_append(QGraphicsTransform *item)
+{
+    appendGraphicsTransform(item);
+}
+
+void QFxItemPrivate::transform_insert(int, QGraphicsTransform *)
+{
+    // ###
+}
+
+QGraphicsTransform *QFxItemPrivate::transform_at(int idx) const
+{
+    if (!transformData)
+        return 0;
+    return transformData->graphicsTransforms.at(idx);
+}
+
+void QFxItemPrivate::transform_clear()
+{
+    if (!transformData)
+        return;
+    Q_Q(QFxItem);
+    q->setTransformations(QList<QGraphicsTransform *>());
+}
+
 /*!
     \qmlproperty list<Object> Item::data
     \default
@@ -820,7 +859,7 @@ void QFxItem::qmlLoaded()
             QObject* o = c ? c->create(ctxt):0;
             QFxItem* ret = qobject_cast<QFxItem*>(o);
             if (ret) {
-                ret->setItemParent(this);
+                ret->setParentItem(this);
                 QScriptValue v = QmlEnginePrivate::getScriptEngine(qmlEngine(this))->newQObject(ret);
                 emit newChildCreated(d->_qmlnewloading.at(i).toString(),v);
             }
@@ -849,7 +888,7 @@ void QFxItem::qmlLoaded()
             qWarning() << d->_qmlcomp->errors();
         QFxItem *qmlChild = qobject_cast<QFxItem *>(obj);
         if (qmlChild) {
-            qmlChild->setItemParent(this);
+            qmlChild->setParentItem(this);
             d->_qmlChildren.insert(d->_qml.toString(), qmlChild);
             d->qmlItem = qmlChild;
         } else {
@@ -999,12 +1038,8 @@ void QFxItem::geometryChanged(const QRectF &newGeometry,
     if (d->_anchors)
         d->_anchors->d_func()->updateMe();
 
-    if (newGeometry.size() != oldGeometry.size()) {
-        if (rotation() && transformOrigin() != QFxItem::TopLeft)
-            setRotation(rotation());
-        if (scale() && transformOrigin() != QFxItem::TopLeft)
-            setScale(scale());
-    }
+    if (transformOrigin() != QFxItem::TopLeft)
+        setTransformOriginPoint(d->computeTransformOrigin());
 
     if (newGeometry.x() != oldGeometry.x()) 
         emit xChanged();
@@ -1037,8 +1072,8 @@ void QFxItem::keyPressEvent(QKeyEvent *event)
     QFxKeyEvent ke(*event);
     emit keyPress(&ke);
     event->setAccepted(ke.isAccepted());
-    if (itemParent() && !ke.isAccepted())
-        itemParent()->keyPressEvent(event);
+    if (parentItem() && !ke.isAccepted())
+        parentItem()->keyPressEvent(event);
 }
 
 /*!
@@ -1049,8 +1084,8 @@ void QFxItem::keyReleaseEvent(QKeyEvent *event)
     QFxKeyEvent ke(*event);
     emit keyRelease(&ke);
     event->setAccepted(ke.isAccepted());
-    if (itemParent() && !ke.isAccepted())
-        itemParent()->keyReleaseEvent(event);
+    if (parentItem() && !ke.isAccepted())
+        parentItem()->keyReleaseEvent(event);
 }
 
 /*!
@@ -1333,29 +1368,6 @@ void QFxItem::setBaselineOffset(qreal offset)
  */
 
 /*!
-  \property QFxItem::rotation
-  This property holds the rotation of the item in degrees.
-
-  This specifies how many degrees to rotate the item around its transformOrigin.
-  The default rotation is 0 degrees (i.e. not rotated at all).
-*/
-qreal QFxItem::rotation() const
-{
-    Q_D(const QFxItem);
-    return d->_rotation;
-}
-
-void QFxItem::setRotation(qreal rotation)
-{
-    Q_D(QFxItem);
-    if (d->_rotation == rotation)
-        return;
-    d->_rotation = rotation;
-    setTransform(d->transform);
-    emit rotationChanged();
-}
-
-/*!
   \qmlproperty real Item::scale
   This property holds the scale of the item.
 
@@ -1392,21 +1404,6 @@ void QFxItem::setRotation(qreal rotation)
 */
 
 /*!
-  \property QFxItem::scale
-  This property holds the scale of the item.
-
-  A scale of less than 1 means the item will be displayed smaller than
-  normal, and a scale of greater than 1 means the item will be
-  displayed larger than normal.  A negative scale means the item will
-  be mirrored.
-
-  By default, items are displayed at a scale of 1 (i.e. at their
-  normal size).
-
-  Scaling is from the item's transformOrigin.
-*/
-
-/*!
   \qmlproperty real Item::opacity
 
   The opacity of the item.  Opacity is specified as a number between 0
@@ -1695,17 +1692,14 @@ void QFxItem::setState(const QString &state)
 
 /*!
   \property QFxItem::transform
-  This property holds the list of transformations to apply.
-
-  For more information see \l Transform.
+  This property holds a list of transformations set on the item.
 */
-QList<QFxTransform *> *QFxItem::transform()
+QmlList<QGraphicsTransform *>* QFxItem::transform()
 {
     Q_D(QFxItem);
-    return &(d->_transform);
+    return &(d->transform);
 }
 
-
 /*!
   Creates a new child of the given component \a type.  The
   newChildCreated() signal will be emitted when and if the child is
@@ -1776,32 +1770,6 @@ void QFxItem::componentComplete()
         d->_stateGroup->componentComplete();
     if (d->_anchors) 
         d->anchors()->d_func()->updateOnComplete();
-    if (!d->_transform.isEmpty())
-        updateTransform();
-}
-
-/*!
-    \internal
-*/
-void QFxItem::updateTransform()
-{
-    Q_D(QFxItem);
-    QTransform trans;
-    for (int ii = d->_transform.count() - 1; ii >= 0; --ii) {
-        QFxTransform *a = d->_transform.at(ii);
-        if (!a->isIdentity()) 
-            trans = a->transform() * trans;
-    }
-
-    setTransform(trans);
-    transformChanged(trans);
-}
-
-/*!
-    \internal
-*/
-void QFxItem::transformChanged(const QTransform &)
-{
 }
 
 QmlStateGroup *QFxItemPrivate::states()
@@ -1836,7 +1804,7 @@ QFxItemPrivate::AnchorLines::AnchorLines(QFxItem *q)
     baseline.anchorLine = QFxAnchorLine::Baseline;
 }
 
-QPointF QFxItemPrivate::transformOrigin() const
+QPointF QFxItemPrivate::computeTransformOrigin() const
 {
     Q_Q(const QFxItem);
 
@@ -1897,8 +1865,6 @@ QVariant QFxItem::itemChange(GraphicsItemChange change,
         if (options() & QFxItem::MouseFilter)
             d->gvAddMouseFilter();
 
-        if (d->canvas && d->isFocusItemForArea)
-            d->canvas->setFocusItem(this);
     } else if (change == ItemChildAddedChange ||
                change == ItemChildRemovedChange) {
         childrenChanged();
@@ -1941,14 +1907,6 @@ void QFxItem::parentChanged(QFxItem *, QFxItem *)
 }
 
 /*!
-    Returns the item's (0, 0) point mapped to scene coordinates.
- */
-QPointF QFxItem::scenePos() const
-{
-    return mapToScene(QPointF(0, 0));
-}
-
-/*!
     \enum QFxItem::TransformOrigin
 
     Controls the point about which simple transforms like scale apply.
@@ -1981,16 +1939,10 @@ void QFxItem::setTransformOrigin(TransformOrigin origin)
     Q_D(QFxItem);
     if (origin != d->origin) {
         d->origin = origin;
-        update();
+        QGraphicsItem::setTransformOriginPoint(d->computeTransformOrigin());
     }
 }
 
-QPointF QFxItem::transformOriginPoint() const
-{
-    Q_D(const QFxItem);
-    return d->transformOrigin();
-}
-
 qreal QFxItem::width() const
 {
     Q_D(const QFxItem);
@@ -2081,61 +2033,6 @@ bool QFxItem::heightValid() const
     return d->heightValid;
 }
 
-qreal QFxItem::scale() const
-{
-    Q_D(const QFxItem);
-    return d->scale;
-}
-
-void QFxItem::setScale(qreal s)
-{
-    Q_D(QFxItem);
-    if (d->scale == s)
-        return;
-
-    d->scale = s;
-    setTransform(d->transform);
-
-    emit scaleChanged();
-}
-
-QRect QFxItem::itemBoundingRect()
-{
-    return boundingRect().toAlignedRect();
-}
-
-QTransform QFxItem::transform() const
-{
-    Q_D(const QFxItem);
-    return d->transform;
-}
-
-//### optimize (perhaps cache scale and rot transforms, and have dirty flags)
-//### we rely on there not being an "if (d->transform == m) return;" check
-void QFxItem::setTransform(const QTransform &m)
-{
-    Q_D(QFxItem);
-    d->transform = m;
-    QTransform scaleTransform, rotTransform;
-    if (d->scale != 1) {
-        QPointF to = transformOriginPoint();
-        if (to.x() != 0. || to.y() != 0.)
-            scaleTransform.translate(to.x(), to.y());
-        scaleTransform.scale(d->scale, d->scale);
-        if (to.x() != 0. || to.y() != 0.)
-            scaleTransform.translate(-to.x(), -to.y());
-    }
-    if (d->_rotation != 0) {
-        QPointF to = d->transformOrigin();
-        if (to.x() != 0. || to.y() != 0.)
-            rotTransform.translate(to.x(), to.y());
-        rotTransform.rotate(d->_rotation);
-        if (to.x() != 0. || to.y() != 0.)
-            rotTransform.translate(-to.x(), -to.y());
-    }
-    QGraphicsItem::setTransform(scaleTransform * rotTransform * d->transform);
-}
-
 QFxItem *QFxItem::mouseGrabberItem() const
 {
     QGraphicsScene *s = scene();
@@ -2154,28 +2051,49 @@ QFxItem *QFxItem::mouseGrabberItem() const
 
 bool QFxItem::hasFocus() const
 {
-    Q_D(const QFxItem);
-    return d->isFocusItemForArea;
+    const QGraphicsItem *current = this->parentItem();
+    while (current && !(current->flags() & ItemAutoDetectsFocusProxy))
+        current = current->parentItem();
+
+    if (current)
+        return current->focusProxy() == this;
+    else
+        return QGraphicsItem::hasFocus();
 }
 
 void QFxItem::setFocus(bool focus)
 {
-    Q_D(QFxItem);
     QGraphicsScene *s = scene();
-    if (s) {
-        if (d->hasActiveFocus)
-            s->setFocusItem(focus ? this : 0);
-        else if (focus)
-            s->setFocusItem(this);
-        else {
-            d->isFocusItemForArea = false;
-            focusChanged(false);
-        }
+    if (!s) {
+        if (focus) QGraphicsItem::setFocus(Qt::OtherFocusReason);
+        else QGraphicsItem::clearFocus();
+        focusChanged(focus);
+        return;
+    }
 
-    } else {
-        d->isFocusItemForArea = focus;
+    QGraphicsItem *current = this->parentItem();
+    while (current && !(current->flags() & ItemAutoDetectsFocusProxy))
+        current = current->parentItem();
+
+    if (!current) {
+        if (focus) QGraphicsItem::setFocus(Qt::OtherFocusReason);
+        else QGraphicsItem::clearFocus();
         focusChanged(focus);
+        return;
+    }
+
+    if (current->focusProxy() && current->focusProxy() != this) {
+        QFxItem *currentItem = qobject_cast<QFxItem *>(current->focusProxy());
+        if (currentItem) 
+            currentItem->setFocus(false);
     }
+
+    if (current->focusProxy() == this && !focus)
+        current->setFocusProxy(0);
+    else if (focus)
+        current->setFocusProxy(this);
+
+    focusChanged(focus);
 }
 
 /*!
@@ -2185,8 +2103,7 @@ void QFxItem::setFocus(bool focus)
 
 bool QFxItem::hasActiveFocus() const
 {
-    Q_D(const QFxItem);
-    return d->hasActiveFocus;
+    return QGraphicsItem::hasFocus();
 }
 
 bool QFxItem::activeFocusPanel() const
@@ -2242,7 +2159,8 @@ void QFxItem::setOptions(Options options, bool set)
     setFiltersChildEvents(d->options & ChildMouseFilter);
     setFlag(QGraphicsItem::ItemAcceptsInputMethod, (d->options & AcceptsInputMethods));
     setAcceptHoverEvents(d->options & HoverEvents);
-    d->isFocusRealm = static_cast<bool>(d->options & IsFocusRealm);
+
+    setFlag(QGraphicsItem::ItemAutoDetectsFocusProxy, d->options & IsFocusRealm);
 
     if ((old & MouseFilter) != (d->options & MouseFilter)) {
         if (d->options & MouseFilter)
@@ -2252,22 +2170,6 @@ void QFxItem::setOptions(Options options, bool set)
     }
 }
 
-/*!
-    \fn void QFxItem::setParent(QFxItem *parent)
-
-    Sets the parent of the item to \a parent.
- */
-void QFxItem::setParent(QFxItem *p)
-{
-    if (p == parent() || !p) return;
-
-    QObject::setParent(p);
-
-    QFxItem *oldParent = itemParent();
-    setParentItem(p);
-    parentChanged(p, oldParent);
-}
-
 void QFxItem::paint(QPainter *p, const QStyleOptionGraphicsItem *, QWidget *)
 {
     paintContents(*p);
diff --git a/src/declarative/fx/qfxitem.h b/src/declarative/fx/qfxitem.h
index a75bdcd..4837881 100644
--- a/src/declarative/fx/qfxitem.h
+++ b/src/declarative/fx/qfxitem.h
@@ -49,6 +49,7 @@
 #include <QtDeclarative/qml.h>
 #include <QtDeclarative/qmlcomponent.h>
 #include <QtGui/qgraphicsitem.h>
+#include <QtGui/qgraphicstransform.h>
 #include <QtGui/qfont.h>
 
 QT_BEGIN_HEADER
@@ -57,6 +58,8 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
+class QGraphicsTransform;
+
 class QFxItem;
 class Q_DECLARATIVE_EXPORT QFxContents : public QObject
 {
@@ -112,7 +115,6 @@ public:
 
 class QmlState;
 class QmlTransition;
-class QFxTransform;
 class QFxKeyEvent;
 class QFxAnchors;
 class QFxItemPrivate;
@@ -121,7 +123,7 @@ class Q_DECLARATIVE_EXPORT QFxItem : public QGraphicsObject, public QmlParserSta
     Q_OBJECT
     Q_INTERFACES(QmlParserStatus)
 
-    Q_PROPERTY(QFxItem * parent READ itemParent WRITE setItemParent NOTIFY parentChanged DESIGNABLE false FINAL)
+    Q_PROPERTY(QFxItem * parent READ parentItem WRITE setParentItem NOTIFY parentChanged DESIGNABLE false FINAL)
     Q_PROPERTY(QmlList<QFxItem *>* children READ children DESIGNABLE false)
     Q_PROPERTY(QmlList<QObject *>* resources READ resources DESIGNABLE false)
     Q_PROPERTY(QFxAnchors * anchors READ anchors DESIGNABLE false CONSTANT FINAL)
@@ -142,12 +144,10 @@ class Q_DECLARATIVE_EXPORT QFxItem : public QGraphicsObject, public QmlParserSta
     Q_PROPERTY(QFxAnchorLine verticalCenter READ verticalCenter CONSTANT FINAL)
     Q_PROPERTY(QFxAnchorLine baseline READ baseline CONSTANT FINAL)
     Q_PROPERTY(qreal baselineOffset READ baselineOffset WRITE setBaselineOffset NOTIFY baselineOffsetChanged)
-    Q_PROPERTY(qreal rotation READ rotation WRITE setRotation NOTIFY rotationChanged) // ## remove me
-    Q_PROPERTY(qreal scale READ scale WRITE setScale NOTIFY scaleChanged) // ### remove me
     Q_PROPERTY(bool clip READ clip WRITE setClip) // ### move to QGI/QGO, NOTIFY
     Q_PROPERTY(bool focus READ hasFocus WRITE setFocus NOTIFY focusChanged FINAL)
     Q_PROPERTY(bool activeFocus READ hasActiveFocus NOTIFY activeFocusChanged FINAL)
-    Q_PROPERTY(QList<QFxTransform *>* transform READ transform) // ## QGI/QGO
+    Q_PROPERTY(QmlList<QGraphicsTransform *>* transform READ transform DESIGNABLE false FINAL) // ## QGI/QGO
     Q_PROPERTY(TransformOrigin transformOrigin READ transformOrigin WRITE setTransformOrigin) // ### move to QGI
     Q_ENUMS(TransformOrigin)
     Q_CLASSINFO("DefaultProperty", "data")
@@ -176,9 +176,9 @@ public:
     QFxItem(QFxItem *parent = 0);
     virtual ~QFxItem();
 
-    QFxItem *itemParent() const; // ### remove me
     QFxItem *parentItem() const;
-    void setItemParent(QFxItem *parent); // ## setParentItem
+    void setParentItem(QFxItem *parent);
+    void setParent(QFxItem *parent) { setParentItem(parent); }
 
     QmlList<QObject *> *data();
     QmlList<QFxItem *> *children();
@@ -206,19 +206,11 @@ public:
     qreal baselineOffset() const;
     void setBaselineOffset(qreal);
 
-    qreal rotation() const;
-    void setRotation(qreal);
-
-    qreal scale() const;
-    void setScale(qreal);
-
-    QList<QFxTransform *> *transform();
+    QmlList<QGraphicsTransform *> *transform();
 
     bool isClassComplete() const;
     bool isComponentComplete() const;
 
-    void updateTransform(); // ### private!
-
     bool keepMouseGrab() const;
     void setKeepMouseGrab(bool);
 
@@ -234,23 +226,13 @@ public:
     void setImplicitHeight(qreal);
     bool heightValid() const; // ### better name?
 
-    QPointF scenePos() const; // ### remove me
-
     TransformOrigin transformOrigin() const;
     void setTransformOrigin(TransformOrigin);
-    QPointF transformOriginPoint() const;
-
-    void setParent(QFxItem *);
-
-    QRect itemBoundingRect(); // ### remove me
 
     void setPaintMargin(qreal margin);
     QRectF boundingRect() const;
     virtual void paintContents(QPainter &);
 
-    QTransform transform() const; // ### remove me
-    void setTransform(const QTransform &); // ### remove me
-
     QFxItem *mouseGrabberItem() const;
 
     virtual bool hasFocus() const;
@@ -293,7 +275,6 @@ protected:
     virtual bool mouseFilter(QGraphicsSceneMouseEvent *);
     virtual void mouseUngrabEvent();
 
-    virtual void transformChanged(const QTransform &);
     virtual void classBegin();
     virtual void classComplete();
     virtual void componentComplete();
@@ -345,6 +326,10 @@ QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QFxContents)
 QML_DECLARE_TYPE(QFxItem)
+QML_DECLARE_TYPE(QGraphicsTransform)
+QML_DECLARE_TYPE(QGraphicsScale)
+QML_DECLARE_TYPE(QGraphicsRotation)
+QML_DECLARE_TYPE(QGraphicsRotation3D)
 
 QT_END_HEADER
 
diff --git a/src/declarative/fx/qfxitem_p.h b/src/declarative/fx/qfxitem_p.h
index bb3a97a..ebd77f8 100644
--- a/src/declarative/fx/qfxitem_p.h
+++ b/src/declarative/fx/qfxitem_p.h
@@ -76,13 +76,13 @@ class QFxItemPrivate : public QGraphicsItemPrivate
 public:
     QFxItemPrivate()
     : _anchors(0), _contents(0), qmlItem(0), _qmlcomp(0),
-      _baselineOffset(0), _rotation(0.),
+      _baselineOffset(0),
       _classComplete(true), _componentComplete(true), _keepMouse(false), 
       _anchorLines(0),
       _stateGroup(0), canvas(0), origin(QFxItem::TopLeft), 
       options(QFxItem::NoOption),
       widthValid(false), heightValid(false), width(0), height(0), 
-      paintmargin(0), scale(1)
+      paintmargin(0)
     {}
     ~QFxItemPrivate() 
     { delete _anchors; }
@@ -92,7 +92,7 @@ public:
         Q_Q(QFxItem);
 
         if (parent)
-            q->setItemParent(parent);
+            q->setParentItem(parent);
         _baselineOffset.invalidate();
         q->setAcceptedMouseButtons(Qt::NoButton);
         q->setFlags(QGraphicsItem::ItemHasNoContents |
@@ -130,7 +130,15 @@ public:
     void children_clear();
     QML_DECLARE_LIST_PROXY(QFxItemPrivate, QFxItem *, children)
 
-    QList<QFxTransform *> _transform;
+    // transform property
+    void transform_removeAt(int);
+    int transform_count() const;
+    void transform_append(QGraphicsTransform *);
+    void transform_insert(int, QGraphicsTransform *);
+    QGraphicsTransform *transform_at(int) const;
+    void transform_clear();
+    QML_DECLARE_LIST_PROXY(QFxItemPrivate, QGraphicsTransform *, transform)
+
     QFxAnchors *anchors() {
         if (!_anchors) {
             Q_Q(QFxItem);
@@ -149,7 +157,6 @@ public:
     QList<QmlComponent*> _qmlnewcomp;
 
     QmlNullableValue<qreal> _baselineOffset;
-    float _rotation;
 
     bool _classComplete:1;
     bool _componentComplete:1;
@@ -189,26 +196,12 @@ public:
     qreal width;
     qreal height;
     qreal paintmargin;
-    qreal scale;
 
-    QPointF transformOrigin() const;
-    QTransform transform;
+    QPointF computeTransformOrigin() const;
 
     void gvRemoveMouseFilter();
     void gvAddMouseFilter();
 
-    virtual void setActiveFocus(bool b) {
-        Q_Q(QFxItem);
-        QGraphicsItemPrivate::setActiveFocus(b);
-        q->activeFocusChanged(b);
-    }
-
-    virtual void setFocusItemForArea(bool b) {
-        Q_Q(QFxItem);
-        QGraphicsItemPrivate::setFocusItemForArea(b);
-        q->focusChanged(b);
-    }
-
     virtual void setPosHelper(const QPointF &pos)
     {
         Q_Q(QFxItem);
diff --git a/src/declarative/fx/qfxlayouts.cpp b/src/declarative/fx/qfxlayouts.cpp
index 6b94321..0546845 100644
--- a/src/declarative/fx/qfxlayouts.cpp
+++ b/src/declarative/fx/qfxlayouts.cpp
@@ -378,12 +378,12 @@ void QFxBaseLayout::preLayout()
 
     if (d->aut & Horizontal)
         setWidth(int(width));
-    else if (itemParent())
-        setImplicitWidth(itemParent()->width());
+    else if (parentItem())
+        setImplicitWidth(parentItem()->width());
     if (d->aut & Vertical)
         setHeight(int(height));
-    else if (itemParent())
-        setImplicitHeight(itemParent()->height());
+    else if (parentItem())
+        setImplicitHeight(parentItem()->height());
     setLayoutItem(0);
 }
 
diff --git a/src/declarative/fx/qfxlineedit.cpp b/src/declarative/fx/qfxlineedit.cpp
index 4ff3504..a185383 100644
--- a/src/declarative/fx/qfxlineedit.cpp
+++ b/src/declarative/fx/qfxlineedit.cpp
@@ -367,7 +367,7 @@ void QFxLineEdit::createCursor()
         return;
     }
 
-    d->cursorItem->setItemParent(this);
+    d->cursorItem->setParentItem(this);
     d->cursorItem->setX(d->control->cursorToX());
     d->cursorItem->setHeight(d->control->height());
 }
diff --git a/src/declarative/fx/qfxlistview.cpp b/src/declarative/fx/qfxlistview.cpp
index 36ecddd..5f1defd 100644
--- a/src/declarative/fx/qfxlistview.cpp
+++ b/src/declarative/fx/qfxlistview.cpp
@@ -1615,7 +1615,7 @@ void QFxListView::createdItem(int index, QFxItem *item)
 {
     Q_D(QFxListView);
     if (d->requestedIndex != index) {
-        item->setItemParent(viewport());
+        item->setParentItem(viewport());
         d->unrequestedItems.insert(item, index);
         if (d->orient == Qt::Vertical)
             item->setY(d->positionAt(index));
diff --git a/src/declarative/fx/qfxmouseregion.cpp b/src/declarative/fx/qfxmouseregion.cpp
index bc19c23..e4e7442 100644
--- a/src/declarative/fx/qfxmouseregion.cpp
+++ b/src/declarative/fx/qfxmouseregion.cpp
@@ -333,8 +333,7 @@ void QFxMouseRegion::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
 
     // ### we should skip this if these signals aren't used
     // ### can GV handle this for us?
-    const QRect &bounds = itemBoundingRect();
-    bool contains = bounds.contains(d->lastPos.toPoint());
+    bool contains = boundingRect().contains(d->lastPos);
     if (d->hovered && !contains)
         setHovered(false);
     else if (!d->hovered && contains)
diff --git a/src/declarative/fx/qfxpathview.cpp b/src/declarative/fx/qfxpathview.cpp
index 2a36c25..98121e6 100644
--- a/src/declarative/fx/qfxpathview.cpp
+++ b/src/declarative/fx/qfxpathview.cpp
@@ -737,7 +737,7 @@ void QFxPathView::createdItem(int index, QFxItem *item)
 {
     Q_D(QFxPathView);
     if (d->requestedIndex != index) {
-        item->setItemParent(this);
+        item->setParentItem(this);
         d->updateItem(item, index < d->firstIndex ? 0.0 : 1.0);
     }
 }
diff --git a/src/declarative/fx/qfxpathview_p.h b/src/declarative/fx/qfxpathview_p.h
index 63c8224..be9509f 100644
--- a/src/declarative/fx/qfxpathview_p.h
+++ b/src/declarative/fx/qfxpathview_p.h
@@ -96,7 +96,7 @@ public:
         requestedIndex = modelIndex;
         QFxItem *item = model->item(modelIndex);
         if (item)
-            item->setItemParent(q);
+            item->setParentItem(q);
         requestedIndex = -1;
         return item;
     }
diff --git a/src/declarative/fx/qfxrepeater.cpp b/src/declarative/fx/qfxrepeater.cpp
index 084921b..a231f20 100644
--- a/src/declarative/fx/qfxrepeater.cpp
+++ b/src/declarative/fx/qfxrepeater.cpp
@@ -62,7 +62,7 @@ QFxItem *QFxRepeaterPrivate::addItem(QmlContext *ctxt, QFxItem *lastItem)
     QObject *nobj = component->create(ctxt);
     QFxItem *item = qobject_cast<QFxItem *>(nobj);
     if (item) {
-        item->setParent(q->itemParent());
+        item->setParent(q->parentItem());
 //        item->stackUnder(lastItem);
         deletables << nobj;
     } else {
@@ -259,7 +259,7 @@ void QFxRepeater::regenerate()
     
     qDeleteAll(d->deletables); 
     d->deletables.clear();
-    if (!d->component || !itemParent() || !isComponentComplete())
+    if (!d->component || !parentItem() || !isComponentComplete())
         return;
 
     QFxItem *lastItem = this;
diff --git a/src/declarative/fx/qfxtextedit.cpp b/src/declarative/fx/qfxtextedit.cpp
index fbb2d53..abad7fc 100644
--- a/src/declarative/fx/qfxtextedit.cpp
+++ b/src/declarative/fx/qfxtextedit.cpp
@@ -531,7 +531,7 @@ void QFxTextEdit::loadCursorDelegate()
                 this, SLOT(moveCursorDelegate()));
         d->control->setCursorWidth(0);
         dirtyCache(cursorRect());
-        d->cursor->setItemParent(this);
+        d->cursor->setParentItem(this);
         d->cursor->setHeight(QFontMetrics(d->font.font()).height());
         moveCursorDelegate();
     }else{
diff --git a/src/declarative/fx/qfxtransform.cpp b/src/declarative/fx/qfxtransform.cpp
deleted file mode 100644
index 9fc66ef..0000000
--- a/src/declarative/fx/qfxtransform.cpp
+++ /dev/null
@@ -1,919 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QDebug>
-#include "private/qfxitem_p.h"
-#include "qfxtransform.h"
-#include <QtDeclarative/qmlinfo.h>
-
-#include <math.h>
-#ifndef M_PI
-#define M_PI 3.14159265358979323846
-#endif
-
-QT_BEGIN_NAMESPACE
-
-QML_DEFINE_NOCREATE_TYPE(QFxTransform);
-
-/*!
-    \qmlclass Transform
-    \brief A transformation.
-*/
-QFxTransform::QFxTransform(QObject *parent) :
-    QObject(parent)
-{
-}
-
-QFxTransform::~QFxTransform()
-{
-}
-
-bool QFxTransform::isIdentity() const
-{
-    return true;
-}
-
-QTransform QFxTransform::transform() const
-{
-    return QTransform();
-}
-
-void QFxTransform::update()
-{
-    QFxItem *item = qobject_cast<QFxItem *>(parent());
-    if (item)
-        item->updateTransform();
-}
-
-/*!
-    \qmlclass Scale
-    \brief A Scale object provides a way to scale an Item.
-
-    The scale object gives more control over scaling than using Item's scale property. Specifically,
-    it allows a different scale for the x and y axes, and allows the scale to be relative to an
-    arbitrary point.
-
-    The following example scales the X axis of the Rect, relative to its interior point 25, 25:
-    \qml
-    Rect {
-        width: 100; height: 100
-        color: "blue"
-        transform: Scale { originX: 25; originY: 25; xScale: 3}
-    }
-    \endqml
-*/
-
-QFxScale::QFxScale(QObject *parent)
-: QFxTransform(parent), _originX(0), _originY(0), _xScale(1), _yScale(1), _dirty(true)
-{
-}
-
-QFxScale::~QFxScale()
-{
-}
-
-/*!
-    \qmlproperty real Scale::originX
-    \qmlproperty real Scale::originY
-
-    The origin point for the scale. The scale will be relative to this point.
-*/
-qreal QFxScale::originX() const
-{
-    return _originX;
-}
-
-void QFxScale::setOriginX(qreal ox)
-{
-    _originX = ox;
-    update();
-}
-
-qreal QFxScale::originY() const
-{
-    return _originY;
-}
-
-void QFxScale::setOriginY(qreal oy)
-{
-    _originY = oy;
-    update();
-}
-
-/*!
-    \qmlproperty real Scale::xScale
-
-    The scaling factor for the X axis.
-*/
-qreal QFxScale::xScale() const
-{
-    return _xScale;
-}
-
-void QFxScale::setXScale(qreal scale)
-{
-    if (_xScale == scale)
-        return;
-    _xScale = scale;
-    update();
-    emit scaleChanged();
-}
-
-/*!
-    \qmlproperty real Scale::yScale
-
-    The scaling factor for the Y axis.
-*/
-qreal QFxScale::yScale() const
-{
-    return _yScale;
-}
-
-void QFxScale::setYScale(qreal scale)
-{
-    if (_yScale == scale)
-        return;
-    _yScale = scale;
-    update();
-    emit scaleChanged();
-}
-
-bool QFxScale::isIdentity() const
-{
-    return (_xScale == 1. && _yScale == 1.);
-}
-
-QTransform QFxScale::transform() const
-{
-    if (_dirty) {
-        _transform = QTransform();
-        _dirty = false;
-        _transform.translate(_originX, _originY);
-        _transform.scale(_xScale, _yScale);
-        _transform.translate(-_originX, -_originY);
-    }
-    return _transform;
-}
-
-void QFxScale::update()
-{
-    _dirty = true;
-    QFxTransform::update();
-}
-
-QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Scale,QFxScale)
-
-
-/*!
-    \qmlclass Axis
-    \brief A Axis object defines an axis that can be used for rotation or translation.
-
-    An axis is specified by 2 points in 3D space: a start point and
-    an end point. While technically the axis is the line running through these two points
-    (and thus many different sets of two points could define the same axis), the distance
-    between the points does matter for translation along an axis.
-
-    \image 3d-axis.png
-
-    \qml
-    Axis { startX: 20; startY: 0; endX: 40; endY: 60; endZ: 20 }
-    \endqml
-*/
-
-QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Axis,QFxAxis)
-
-QFxAxis::QFxAxis(QObject *parent)
-: QObject(parent), _startX(0), _startY(0), _endX(0), _endY(0), _endZ(0)
-{
-}
-
-QFxAxis::~QFxAxis()
-{
-}
-
-/*!
-    \qmlproperty real Axis::startX
-    \qmlproperty real Axis::startY
-
-    The start point of the axis. The z-position of the start point is assumed to be 0, and cannot
-    be changed.
-*/
-qreal QFxAxis::startX() const
-{
-    return _startX;
-}
-
-void QFxAxis::setStartX(qreal x)
-{
-    _startX = x;
-    emit updated();
-}
-
-qreal QFxAxis::startY() const
-{
-    return _startY;
-}
-
-void QFxAxis::setStartY(qreal y)
-{
-    _startY = y;
-    emit updated();
-}
-
-/*!
-    \qmlproperty real Axis::endX
-    \qmlproperty real Axis::endY
-    \qmlproperty real Axis::endZ
-
-    The end point of the axis.
-*/
-qreal QFxAxis::endX() const
-{
-    return _endX;
-}
-
-void QFxAxis::setEndX(qreal x)
-{
-    _endX = x;
-    emit updated();
-}
-
-qreal QFxAxis::endY() const
-{
-    return _endY;
-}
-
-void QFxAxis::setEndY(qreal y)
-{
-    _endY = y;
-    emit updated();
-}
-
-qreal QFxAxis::endZ() const
-{
-    return _endZ;
-}
-
-void QFxAxis::setEndZ(qreal z)
-{
-    _endZ = z;
-    emit updated();
-}
-
-/*!
-    \qmlclass Rotation
-    \brief A Rotation object provides a way to rotate an Item around a point.
-
-    The following example rotates a Rect around its interior point 25, 25:
-    \qml
-    Rect {
-        width: 100; height: 100
-        color: "blue"
-        transform: Rotation { originX: 25; originY: 25; angle: 45}
-    }
-    \endqml
-*/
-
-QFxRotation::QFxRotation(QObject *parent)
-: QFxTransform(parent), _originX(0), _originY(0), _angle(0), _dirty(true)
-{
-}
-
-QFxRotation::~QFxRotation()
-{
-}
-
-/*!
-    \qmlproperty real Rotation::originX
-    \qmlproperty real Rotation::originY
-
-    The point to rotate around.
-*/
-qreal QFxRotation::originX() const
-{
-    return _originX;
-}
-
-void QFxRotation::setOriginX(qreal ox)
-{
-    _originX = ox;
-    update();
-}
-
-qreal QFxRotation::originY() const
-{
-    return _originY;
-}
-
-void QFxRotation::setOriginY(qreal oy)
-{
-    _originY = oy;
-    update();
-}
-
-/*!
-    \qmlproperty real Rotation::angle
-
-    The angle, in degrees, to rotate.
-*/
-qreal QFxRotation::angle() const
-{
-    return _angle;
-}
-
-void QFxRotation::setAngle(qreal angle)
-{
-    if (_angle == angle)
-        return;
-    _angle = angle;
-    update();
-    emit angleChanged();
-}
-
-bool QFxRotation::isIdentity() const
-{
-    return (_angle == 0.);
-}
-
-QTransform QFxRotation::transform() const
-{
-    if (_dirty) {
-        _transform = QTransform();
-        _dirty = false;
-        _transform.translate(_originX, _originY);
-        _transform.rotate(_angle);
-        _transform.translate(-_originX, -_originY);
-    }
-    return _transform;
-}
-
-void QFxRotation::update()
-{
-    _dirty = true;
-    QFxTransform::update();
-}
-
-QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Rotation,QFxRotation)
-
-/*!
-    \qmlclass Rotation3D
-    \brief A Rotation3D object provides a way to rotate an Item around an axis.
-
-    Here is an example of various rotations applied to an \l Image.
-    \snippet doc/src/snippets/declarative/rotation.qml 0
-
-    \image axisrotation.png
-*/
-
-QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Rotation3D,QFxRotation3D)
-
-QFxRotation3D::QFxRotation3D(QObject *parent)
-: QFxTransform(parent), _angle(0), _dirty(true)
-{
-    connect(&_axis, SIGNAL(updated()), this, SLOT(update()));
-}
-
-QFxRotation3D::~QFxRotation3D()
-{
-}
-
-/*!
-    \qmlproperty real Rotation3D::axis.startX
-    \qmlproperty real Rotation3D::axis.startY
-    \qmlproperty real Rotation3D::axis.endX
-    \qmlproperty real Rotation3D::axis.endY
-    \qmlproperty real Rotation3D::axis.endZ
-
-    A rotation axis is specified by 2 points in 3D space: a start point and
-    an end point. The z-position of the start point is assumed to be 0, and cannot
-    be changed.
-
-    \image 3d-rotation-axis.png
-
-    \sa Axis
-*/
-QFxAxis *QFxRotation3D::axis()
-{
-    return &_axis;
-}
-
-/*!
-    \qmlproperty real Rotation3D::angle
-
-    The angle, in degrees, to rotate around the specified axis.
-*/
-qreal QFxRotation3D::angle() const
-{
-    return _angle;
-}
-
-void QFxRotation3D::setAngle(qreal angle)
-{
-    _angle = angle;
-    update();
-}
-
-bool QFxRotation3D::isIdentity() const
-{
-    return (_angle == 0.) || (_axis.endZ() == 0. && _axis.endY() == _axis.startY() && _axis.endX() == _axis.startX());
-}
-
-const qreal inv_dist_to_plane = 1. / 1024.;
-QTransform QFxRotation3D::transform() const
-{
-    if (_dirty) {
-        _transform = QTransform();
-
-        if (!isIdentity()) {
-            if (angle() != 0.) {
-                QTransform rotTrans;
-                rotTrans.translate(-_axis.startX(), -_axis.startY());
-                QTransform rotTrans2;
-                rotTrans2.translate(_axis.startX(), _axis.startY());
-
-                qreal rad = angle() * 2. * M_PI / 360.;
-                qreal c = ::cos(rad);
-                qreal s = ::sin(rad);
-
-                qreal x = _axis.endX() - _axis.startX();
-                qreal y = _axis.endY() - _axis.startY();
-                qreal z = _axis.endZ();
-
-                qreal len = x * x + y * y + z * z;
-                if (len != 1.) {
-                    len = ::sqrt(len);
-                    x /= len;
-                    y /= len;
-                    z /= len;
-                }
-
-                QTransform rot(x*x*(1-c)+c, x*y*(1-c)-z*s, x*z*(1-c)+y*s*inv_dist_to_plane,
-                               y*x*(1-c)+z*s, y*y*(1-c)+c, y*z*(1-c)-x*s*inv_dist_to_plane,
-                               0, 0, 1);
-
-                _transform *= rotTrans;
-                _transform *= rot;
-                _transform *= rotTrans2;
-            }
-        }
-
-        _dirty = false;
-    }
-
-    return _transform;
-}
-
-void QFxRotation3D::update()
-{
-    _dirty = true;
-    QFxTransform::update();
-}
-
-/*!
-  \internal
-  \qmlclass Translation3D
-  \brief A Translation3D object provides a way to move an Item along an axis.
-
-  The following example translates the image to 10, 3.
-  \qml
-Image {
-    source: "logo.png"
-    transform: [
-        Translation3D {
-            axis.startX: 0
-            axis.startY: 0
-            axis.endX: 1
-            axis.endY: .3
-            distance: 10
-        }
-    ]
-}
-  \endqml
-*/
-
-QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Translation3D,QFxTranslation3D)
-
-QFxTranslation3D::QFxTranslation3D(QObject *parent)
-: QFxTransform(parent), _distance(0), _dirty(true)
-{
-    connect(&_axis, SIGNAL(updated()), this, SLOT(update()));
-}
-
-QFxTranslation3D::~QFxTranslation3D()
-{
-}
-
-/*!
-  \qmlproperty real Translation3D::axis.startX
-  \qmlproperty real Translation3D::axis.startY
-  \qmlproperty real Translation3D::axis.endX
-  \qmlproperty real Translation3D::axis.endY
-  \qmlproperty real Translation3D::axis.endZ
-
-  A translation axis is specified by 2 points in 3D space: a start
-  point and an end point. The z-position of the start point is assumed
-  to be 0, and cannot be changed. Changing the z-position of the end
-  point is only valid when running under OpenGL.
-
-  \sa Axis
-*/
-QFxAxis *QFxTranslation3D::axis()
-{
-    return &_axis;
-}
-
-/*!
-  \qmlproperty real Translation3D::distance
-
-  The distance to translate along the specified axis. distance is a
-  multiplier; in the example below, a distance of 1 would translate to
-  100, 50, while a distance of 0.5 would translate to 50, 25.
-
-  \qml
-  Translation3D { axis.startX: 0; axis.startY: 0; axis.endX: 100; axis.endY: 50 }
-  \endqml
-*/
-qreal QFxTranslation3D::distance() const
-{
-    return _distance;
-}
-
-void QFxTranslation3D::setDistance(qreal distance)
-{
-    _distance = distance;
-    update();
-}
-
-bool QFxTranslation3D::isIdentity() const
-{
-    return (_distance == 0.) || (_axis.endZ() == 0. && _axis.endY() == _axis.startY() && _axis.endX() == _axis.startX());
-}
-
-QTransform QFxTranslation3D::transform() const
-{
-    if (_dirty) {
-        _transform = QTransform();
-
-        if (!isIdentity()) {
-            if (distance() != 0.) {
-                QTransform trans;
-                trans.translate((_axis.endX() - _axis.startX()) * distance(),
-                        (_axis.endY() - _axis.startY()) * distance());
-                _transform *= trans;
-            }
-        }
-
-        _dirty = false;
-    }
-
-    return _transform;
-}
-
-void QFxTranslation3D::update()
-{
-    _dirty = true;
-
-    if (_axis.endZ() != 0. && distance() != 0.) {
-        qmlInfo(this) << "QTransform cannot translate along Z-axis.";
-    }
-
-    QFxTransform::update();
-}
-
-/*!
-  \internal
-  \qmlclass Perspective
-  \brief A Perspective object specifies a perspective transformation.
-
-  A Perspective transform only affects an item when running under
-  OpenGL. When running under software rasterization it has no effect.
-*/
-
-QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Perspective,QFxPerspective)
-
-QFxPerspective::QFxPerspective(QObject *parent)
-    : QFxTransform(parent)
-{
-}
-
-QFxPerspective::~QFxPerspective()
-{
-}
-
-/*!
-    \qmlproperty real Perspective::angle
-*/
-
-/*!
-    \qmlproperty real Perspective::aspect
-*/
-
-/*!
-    \qmlproperty real Perspective::x
-*/
-
-/*!
-    \qmlproperty real Perspective::y
-*/
-
-/*!
-    \qmlproperty real Perspective::scale
-*/
-
-/*!
-    \qmlclass Squish
-    \brief A Squish object allows you to distort an item's appearance by 'squishing' it.
-
-    Conceptually, a Squish works by allowing you to move the four corners of an item,
-    and distorting the item to fit into the newly created polygon.
-
-    \image squish-transform.png
-
-    Here is an example of various \l Image squishes.
-    \qml
-    Rect {
-        id: Screen
-        width: 360; height: 80
-        color: "white"
-
-        HorizontalLayout {
-            margin: 10
-            spacing: 10
-            Image { source: "qt.png" }
-            Image {
-                source: "qt.png"
-                transform: Squish {
-                    x:0; y:0; width:60; height:60
-                    topLeftX:0; topLeftY:0
-                    topRightX:50; topRightY:10
-                    bottomLeftX:0; bottomLeftY:60
-                    bottomRightX: 60; bottomRightY:60
-                }
-            }
-            Image {
-                source: "qt.png"
-                transform: Squish {
-                    x:0; y:0; width:60; height:60
-                    topLeftX:0; topLeftY:0
-                    topRightX:50; topRightY:0
-                    bottomLeftX:10; bottomLeftY:50
-                    bottomRightX: 60; bottomRightY:60
-                }
-            }
-            Image {
-                source: "qt.png"
-                transform: Squish {
-                    x:0; y:0; width:60; height:60
-                    topLeftX:0; topLeftY:10
-                    topRightX:60; topRightY:10
-                    bottomLeftX:0; bottomLeftY:50
-                    bottomRightX: 60; bottomRightY:50
-                }
-            }
-            Image {
-                source: "qt.png"
-                transform: Squish {
-                    x:0; y:0; width:60; height:60
-                    topLeftX:10; topLeftY:0
-                    topRightX:50; topRightY:0
-                    bottomLeftX:10; bottomLeftY:60
-                    bottomRightX: 50; bottomRightY:60
-                }
-            }
-        }
-    }
-    \endqml
-
-    \image squish.png
-*/
-QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Squish,QFxSquish)
-
-QFxSquish::QFxSquish(QObject *parent)
-    : QFxTransform(parent)
-{
-}
-
-QFxSquish::~QFxSquish()
-{
-}
-
-/*!
-    \qmlproperty real Squish::x
-    \qmlproperty real Squish::y
-    \qmlproperty real Squish::width
-    \qmlproperty real Squish::height
-
-    This is usually set to the original geometry of the item being squished.
-*/
-qreal QFxSquish::x() const
-{
-    return p.x();
-}
-
-void QFxSquish::setX(qreal v)
-{
-    p.setX(v);
-    update();
-}
-
-qreal QFxSquish::y() const
-{
-    return p.y();
-}
-
-void QFxSquish::setY(qreal v)
-{
-    p.setY(v);
-    update();
-}
-
-qreal QFxSquish::width() const
-{
-    return s.width();
-}
-
-void QFxSquish::setWidth(qreal v)
-{
-    s.setWidth(v);
-    update();
-}
-
-qreal QFxSquish::height() const
-{
-    return s.height();
-}
-
-void QFxSquish::setHeight(qreal v)
-{
-    s.setHeight(v);
-    update();
-}
-
-/*!
-    \qmlproperty real Squish::topLeftX
-    \qmlproperty real Squish::topLeftY
-
-    The top left point for the squish.
-*/
-qreal QFxSquish::topLeft_x() const
-{
-    return p1.x();
-}
-
-void QFxSquish::settopLeft_x(qreal v)
-{
-    p1.setX(v);
-    update();
-}
-
-qreal QFxSquish::topLeft_y() const
-{
-    return p1.y();
-}
-
-void QFxSquish::settopLeft_y(qreal v)
-{
-    p1.setY(v);
-    update();
-}
-
-/*!
-    \qmlproperty real Squish::topRightX
-    \qmlproperty real Squish::topRightY
-
-    The top right point for the squish.
-*/
-qreal QFxSquish::topRight_x() const
-{
-    return p2.x();
-}
-
-void QFxSquish::settopRight_x(qreal v)
-{
-    p2.setX(v);
-    update();
-}
-
-qreal QFxSquish::topRight_y() const
-{
-    return p2.y();
-}
-
-void QFxSquish::settopRight_y(qreal v)
-{
-    p2.setY(v);
-    update();
-}
-
-/*!
-    \qmlproperty real Squish::bottomLeftX
-    \qmlproperty real Squish::bottomLeftY
-
-    The bottom left point for the squish.
-*/
-qreal QFxSquish::bottomLeft_x() const
-{
-    return p3.x();
-}
-
-void QFxSquish::setbottomLeft_x(qreal v)
-{
-    p3.setX(v);
-    update();
-}
-
-qreal QFxSquish::bottomLeft_y() const
-{
-    return p3.y();
-}
-
-void QFxSquish::setbottomLeft_y(qreal v)
-{
-    p3.setY(v);
-    update();
-}
-
-/*!
-    \qmlproperty real Squish::bottomRightX
-    \qmlproperty real Squish::bottomRightY
-
-    The bottom right point for the squish.
-*/
-qreal QFxSquish::bottomRight_x() const
-{
-    return p4.x();
-}
-
-void QFxSquish::setbottomRight_x(qreal v)
-{
-    p4.setX(v);
-    update();
-}
-
-qreal QFxSquish::bottomRight_y() const
-{
-    return p4.y();
-}
-
-void QFxSquish::setbottomRight_y(qreal v)
-{
-    p4.setY(v);
-    update();
-}
-
-bool QFxSquish::isIdentity() const
-{
-    return false;
-}
-
-QTransform QFxSquish::transform() const
-{
-    QPolygonF poly;
-    poly << p << QPointF(p.x() + s.width(), p.y()) << QPointF(p.x() + s.width(), p.y() + s.height()) << QPointF(p.x(), p.y() + s.height());
-    QPolygonF poly2;
-    poly2 << p1 << p2 << p4 << p3;
-
-    QTransform t;
-    QTransform::quadToQuad(poly, poly2, t);
-    return t;
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/fx/qfxtransform.h b/src/declarative/fx/qfxtransform.h
deleted file mode 100644
index fb49294..0000000
--- a/src/declarative/fx/qfxtransform.h
+++ /dev/null
@@ -1,356 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QFXTRANSFORM_H
-#define QFXTRANSFORM_H
-
-#include <QtCore/QObject>
-#include <QtGui/QTransform>
-#include <QtDeclarative/qfxitem.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class Q_DECLARATIVE_EXPORT QFxTransform : public QObject
-{
-    Q_OBJECT
-public:
-    QFxTransform(QObject *parent=0);
-    ~QFxTransform();
-
-    void update();
-
-    virtual bool isIdentity() const;
-    virtual QTransform transform() const;
-};
-
-class Q_DECLARATIVE_EXPORT QFxScale : public QFxTransform
-{
-    Q_OBJECT
-
-    Q_PROPERTY(qreal originX READ originX WRITE setOriginX)
-    Q_PROPERTY(qreal originY READ originY WRITE setOriginY)
-    Q_PROPERTY(qreal xScale READ xScale WRITE setXScale NOTIFY scaleChanged())
-    Q_PROPERTY(qreal yScale READ yScale WRITE setYScale NOTIFY scaleChanged())
-public:
-    QFxScale(QObject *parent=0);
-    ~QFxScale();
-
-    qreal originX() const;
-    void setOriginX(qreal);
-
-    qreal originY() const;
-    void setOriginY(qreal);
-
-    qreal xScale() const;
-    void setXScale(qreal);
-
-    qreal yScale() const;
-    void setYScale(qreal);
-
-    virtual bool isIdentity() const;
-    virtual QTransform transform() const;
-
-Q_SIGNALS:
-    void scaleChanged();
-
-private Q_SLOTS:
-    void update();
-private:
-    qreal _originX;
-    qreal _originY;
-    qreal _xScale;
-    qreal _yScale;
-
-    mutable bool _dirty;
-    mutable QTransform _transform;
-};
-
-class Q_DECLARATIVE_EXPORT QFxAxis : public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY(qreal startX READ startX WRITE setStartX)
-    Q_PROPERTY(qreal startY READ startY WRITE setStartY)
-    Q_PROPERTY(qreal endX READ endX WRITE setEndX)
-    Q_PROPERTY(qreal endY READ endY WRITE setEndY)
-    Q_PROPERTY(qreal endZ READ endZ WRITE setEndZ)
-public:
-    QFxAxis(QObject *parent=0);
-    ~QFxAxis();
-
-    qreal startX() const;
-    void setStartX(qreal);
-
-    qreal startY() const;
-    void setStartY(qreal);
-
-    qreal endX() const;
-    void setEndX(qreal);
-
-    qreal endY() const;
-    void setEndY(qreal);
-
-    qreal endZ() const;
-    void setEndZ(qreal);
-
-Q_SIGNALS:
-    void updated();
-
-private:
-    qreal _startX;
-    qreal _startY;
-    qreal _endX;
-    qreal _endY;
-    qreal _endZ;
-};
-
-class Q_DECLARATIVE_EXPORT QFxRotation : public QFxTransform
-{
-    Q_OBJECT
-
-    Q_PROPERTY(qreal originX READ originX WRITE setOriginX)
-    Q_PROPERTY(qreal originY READ originY WRITE setOriginY)
-    Q_PROPERTY(qreal angle READ angle WRITE setAngle NOTIFY angleChanged())
-public:
-    QFxRotation(QObject *parent=0);
-    ~QFxRotation();
-
-    qreal originX() const;
-    void setOriginX(qreal);
-
-    qreal originY() const;
-    void setOriginY(qreal);
-
-    qreal angle() const;
-    void setAngle(qreal);
-
-    virtual bool isIdentity() const;
-    virtual QTransform transform() const;
-
-Q_SIGNALS:
-    void angleChanged();
-
-private Q_SLOTS:
-    void update();
-private:
-    qreal _originX;
-    qreal _originY;
-    qreal _angle;
-
-    mutable bool _dirty;
-    mutable QTransform _transform;
-};
-
-class Q_DECLARATIVE_EXPORT QFxRotation3D : public QFxTransform
-{
-    Q_OBJECT
-
-    Q_PROPERTY(QFxAxis *axis READ axis)
-    Q_PROPERTY(qreal angle READ angle WRITE setAngle)
-public:
-    QFxRotation3D(QObject *parent=0);
-    ~QFxRotation3D();
-
-    QFxAxis *axis();
-
-    qreal angle() const;
-    void setAngle(qreal);
-
-    virtual bool isIdentity() const;
-    virtual QTransform transform() const;
-
-private Q_SLOTS:
-    void update();
-private:
-    QFxAxis _axis;
-    qreal _angle;
-
-    mutable bool _dirty;
-    mutable QTransform _transform;
-};
-
-class Q_DECLARATIVE_EXPORT QFxTranslation3D : public QFxTransform
-{
-    Q_OBJECT
-
-    Q_PROPERTY(QFxAxis *axis READ axis)
-    Q_PROPERTY(qreal distance READ distance WRITE setDistance)
-public:
-    QFxTranslation3D(QObject *parent=0);
-    ~QFxTranslation3D();
-
-    QFxAxis *axis();
-
-    qreal distance() const;
-    void setDistance(qreal);
-
-    virtual bool isIdentity() const;
-    virtual QTransform transform() const;
-
-private Q_SLOTS:
-    void update();
-private:
-    QFxAxis _axis;
-    qreal _distance;
-
-    mutable bool _dirty;
-    mutable QTransform _transform;
-};
-
-class Q_DECLARATIVE_EXPORT QFxPerspective : public QFxTransform
-{
-    Q_OBJECT
-
-    Q_PROPERTY(qreal angle READ angle WRITE setAngle)
-    Q_PROPERTY(qreal aspect READ aspect WRITE setAspect)
-    Q_PROPERTY(qreal x READ x WRITE setX)
-    Q_PROPERTY(qreal y READ y WRITE setY)
-    Q_PROPERTY(qreal scale READ scale WRITE setScale)
-public:
-    QFxPerspective(QObject *parent=0);
-    ~QFxPerspective();
-
-    qreal angle() const { return _angle; }
-    void setAngle(qreal v) { _angle = v; update(); }
-
-    qreal aspect() const { return _aspect; }
-    void setAspect(qreal v) { _aspect = v; update(); }
-
-    qreal x() const { return _x; }
-    void setX(qreal v) { _x = v; update(); }
-
-    qreal y() const { return _y; }
-    void setY(qreal v) { _y = v; update(); }
-
-    qreal scale() const { return _scale; }
-    void setScale(qreal v) { _scale = v; update(); }
-
-private:
-    qreal _scale;
-    qreal _x;
-    qreal _y;
-    qreal _angle;
-    qreal _aspect;
-};
-
-class Q_DECLARATIVE_EXPORT QFxSquish : public QFxTransform
-{
-    Q_OBJECT
-
-    Q_PROPERTY(qreal x READ x WRITE setX)
-    Q_PROPERTY(qreal y READ y WRITE setY)
-    Q_PROPERTY(qreal width READ width WRITE setWidth)
-    Q_PROPERTY(qreal height READ height WRITE setHeight)
-    Q_PROPERTY(qreal topLeftX READ topLeft_x WRITE settopLeft_x)
-    Q_PROPERTY(qreal topLeftY READ topLeft_y WRITE settopLeft_y)
-    Q_PROPERTY(qreal topRightX READ topRight_x WRITE settopRight_x)
-    Q_PROPERTY(qreal topRightY READ topRight_y WRITE settopRight_y)
-    Q_PROPERTY(qreal bottomLeftX READ bottomLeft_x WRITE setbottomLeft_x)
-    Q_PROPERTY(qreal bottomLeftY READ bottomLeft_y WRITE setbottomLeft_y)
-    Q_PROPERTY(qreal bottomRightX READ bottomRight_x WRITE setbottomRight_x)
-    Q_PROPERTY(qreal bottomRightY READ bottomRight_y WRITE setbottomRight_y)
-public:
-    QFxSquish(QObject *parent=0);
-    ~QFxSquish();
-
-    qreal x() const;
-    void setX(qreal);
-
-    qreal y() const;
-    void setY(qreal);
-
-    qreal width() const;
-    void setWidth(qreal);
-
-    qreal height() const;
-    void setHeight(qreal);
-
-    qreal topLeft_x() const;
-    void settopLeft_x(qreal);
-
-    qreal topLeft_y() const;
-    void settopLeft_y(qreal);
-
-    qreal topRight_x() const;
-    void settopRight_x(qreal);
-
-    qreal topRight_y() const;
-    void settopRight_y(qreal);
-
-    qreal bottomLeft_x() const;
-    void setbottomLeft_x(qreal);
-
-    qreal bottomLeft_y() const;
-    void setbottomLeft_y(qreal);
-
-    qreal bottomRight_y() const;
-    void setbottomRight_y(qreal);
-
-    qreal bottomRight_x() const;
-    void setbottomRight_x(qreal);
-
-    virtual bool isIdentity() const;
-    virtual QTransform transform() const;
-
-private:
-    QPointF p;
-    QSizeF s;
-    QPointF p1, p2, p3, p4;
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QFxTransform)
-QML_DECLARE_TYPE(QFxScale)
-QML_DECLARE_TYPE(QFxAxis)
-QML_DECLARE_TYPE(QFxRotation)
-QML_DECLARE_TYPE(QFxRotation3D)
-QML_DECLARE_TYPE(QFxTranslation3D)
-QML_DECLARE_TYPE(QFxPerspective)
-QML_DECLARE_TYPE(QFxSquish)
-
-QT_END_HEADER
-
-#endif // QFXTRANSFORM_H
diff --git a/src/declarative/fx/qfxwebview.cpp b/src/declarative/fx/qfxwebview.cpp
index 4c6af69..83f9249 100644
--- a/src/declarative/fx/qfxwebview.cpp
+++ b/src/declarative/fx/qfxwebview.cpp
@@ -55,7 +55,6 @@
 #include "qml.h"
 #include "qmlengine.h"
 #include "qmlstate.h"
-#include "qfxtransform.h"
 #include "qfxscalegrid.h"
 #include "qlistmodelinterface.h"
 
diff --git a/src/declarative/qml/qmlvaluetype.cpp b/src/declarative/qml/qmlvaluetype.cpp
index 571263e..e93fbc1 100644
--- a/src/declarative/qml/qmlvaluetype.cpp
+++ b/src/declarative/qml/qmlvaluetype.cpp
@@ -59,7 +59,11 @@ QmlValueTypeFactory::~QmlValueTypeFactory()
 QmlValueType *QmlValueTypeFactory::valueType(int t)
 {
     switch (t) {
+    case QVariant::Point:
+    case QVariant::PointF:
+        return new QmlPointValueType;
     case QVariant::Rect:
+    case QVariant::RectF:
         return new QmlRectValueType;
     case QVariant::Vector3D:
         return new QmlVector3DValueType;
@@ -73,6 +77,43 @@ QmlValueType::QmlValueType(QObject *parent)
 {
 }
 
+QmlPointValueType::QmlPointValueType(QObject *parent)
+: QmlValueType(parent)
+{
+}
+
+void QmlPointValueType::read(QObject *obj, int idx)
+{
+    void *a[] = { &point, 0 };
+    QMetaObject::metacall(obj, QMetaObject::ReadProperty, idx, a);
+}
+
+void QmlPointValueType::write(QObject *obj, int idx)
+{
+    void *a[] = { &point, 0 };
+    QMetaObject::metacall(obj, QMetaObject::WriteProperty, idx, a);
+}
+
+qreal QmlPointValueType::x() const
+{
+    return point.x();
+}
+
+qreal QmlPointValueType::y() const
+{
+    return point.y();
+}
+
+void QmlPointValueType::setX(qreal x)
+{
+    point.setX(x);
+}
+
+void QmlPointValueType::setY(qreal y)
+{
+    point.setY(y);
+}
+
 QmlRectValueType::QmlRectValueType(QObject *parent)
 : QmlValueType(parent)
 {
@@ -90,42 +131,42 @@ void QmlRectValueType::write(QObject *obj, int idx)
     QMetaObject::metacall(obj, QMetaObject::WriteProperty, idx, a);
 }
 
-int QmlRectValueType::x() const
+qreal QmlRectValueType::x() const
 {
     return rect.x();
 }
 
-int QmlRectValueType::y() const
+qreal QmlRectValueType::y() const
 {
     return rect.y();
 }
 
-void QmlRectValueType::setX(int x)
+void QmlRectValueType::setX(qreal x)
 {
     rect.moveLeft(x);
 }
 
-void QmlRectValueType::setY(int y)
+void QmlRectValueType::setY(qreal y)
 {
     rect.moveTop(y);
 }
 
-int QmlRectValueType::width() const
+qreal QmlRectValueType::width() const
 {
     return rect.width();
 }
 
-int QmlRectValueType::height() const
+qreal QmlRectValueType::height() const
 {
     return rect.height();
 }
 
-void QmlRectValueType::setWidth(int w)
+void QmlRectValueType::setWidth(qreal w)
 {
     rect.setWidth(w);
 }
 
-void QmlRectValueType::setHeight(int h)
+void QmlRectValueType::setHeight(qreal h)
 {
     rect.setHeight(h);
 }
diff --git a/src/declarative/qml/qmlvaluetype_p.h b/src/declarative/qml/qmlvaluetype_p.h
index b19c1ba..9195c61 100644
--- a/src/declarative/qml/qmlvaluetype_p.h
+++ b/src/declarative/qml/qmlvaluetype_p.h
@@ -80,12 +80,32 @@ public:
     QmlValueType *operator[](int idx) const { return valueTypes[idx]; }
 };
 
+class QmlPointValueType : public QmlValueType
+{
+    Q_PROPERTY(qreal x READ x WRITE setX);
+    Q_PROPERTY(qreal y READ y WRITE setY);
+    Q_OBJECT
+public:
+    QmlPointValueType(QObject *parent = 0);
+
+    virtual void read(QObject *, int);
+    virtual void write(QObject *, int);
+
+    qreal x() const;
+    qreal y() const;
+    void setX(qreal);
+    void setY(qreal);
+
+private:
+    QPointF point;
+};
+
 class QmlRectValueType : public QmlValueType
 {
-    Q_PROPERTY(int x READ x WRITE setX);
-    Q_PROPERTY(int y READ y WRITE setY);
-    Q_PROPERTY(int width READ width WRITE setWidth);
-    Q_PROPERTY(int height READ height WRITE setHeight);
+    Q_PROPERTY(qreal x READ x WRITE setX);
+    Q_PROPERTY(qreal y READ y WRITE setY);
+    Q_PROPERTY(qreal width READ width WRITE setWidth);
+    Q_PROPERTY(qreal height READ height WRITE setHeight);
     Q_OBJECT
 public:
     QmlRectValueType(QObject *parent = 0);
@@ -93,18 +113,18 @@ public:
     virtual void read(QObject *, int);
     virtual void write(QObject *, int);
 
-    int x() const;
-    int y() const;
-    void setX(int);
-    void setY(int);
+    qreal x() const;
+    qreal y() const;
+    void setX(qreal);
+    void setY(qreal);
     
-    int width() const;
-    int height() const;
-    void setWidth(int);
-    void setHeight(int);
+    qreal width() const;
+    qreal height() const;
+    void setWidth(qreal);
+    void setHeight(qreal);
 
 private:
-    QRect rect;
+    QRectF rect;
 };
 
 class QmlVector3DValueType : public QmlValueType
diff --git a/src/declarative/util/qfxview.cpp b/src/declarative/util/qfxview.cpp
index 96d9e8e..2f5cdd3 100644
--- a/src/declarative/util/qfxview.cpp
+++ b/src/declarative/util/qfxview.cpp
@@ -443,7 +443,7 @@ QFxItem* QFxView::addItem(const QString &qml, QFxItem* parent)
         if (!parent)
             parent = d->root;
 
-        item->setItemParent(parent);
+        item->setParentItem(parent);
         return item;
     }
     return 0;
diff --git a/src/declarative/util/qmlstateoperations.cpp b/src/declarative/util/qmlstateoperations.cpp
index 3d03c34..7caf3ed 100644
--- a/src/declarative/util/qmlstateoperations.cpp
+++ b/src/declarative/util/qmlstateoperations.cpp
@@ -63,8 +63,8 @@ public:
 
 void QmlParentChangePrivate::doChange(QFxItem *targetParent)
 {
-    if (targetParent && target && target->itemParent()) {
-        QPointF me = target->itemParent()->mapToScene(QPointF(0,0));
+    if (targetParent && target && target->parentItem()) {
+        QPointF me = target->parentItem()->mapToScene(QPointF(0,0));
         QPointF them = targetParent->mapToScene(QPointF(0,0));
 
         QPointF themx = targetParent->mapToScene(QPointF(1,0));
@@ -73,7 +73,7 @@ void QmlParentChangePrivate::doChange(QFxItem *targetParent)
         themx -= them;
         themy -= them;
 
-        target->setItemParent(targetParent);
+        target->setParentItem(targetParent);
 
         // XXX - this is silly and will only work in a few cases
 
@@ -112,7 +112,7 @@ void QmlParentChangePrivate::doChange(QFxItem *targetParent)
         target->setX(target->x() - rx);
         target->setY(target->y() - ry);
     } else if (target) {
-        target->setItemParent(targetParent);
+        target->setParentItem(targetParent);
     }
 }
 
@@ -182,7 +182,7 @@ void QmlParentChange::execute()
 {
     Q_D(QmlParentChange);
     if (d->target)
-        d->origParent = d->target->itemParent();
+        d->origParent = d->target->parentItem();
     d->doChange(d->parent);
 }
 
diff --git a/src/gui/dialogs/qabstractprintdialog.cpp b/src/gui/dialogs/qabstractprintdialog.cpp
index 2ffc400..beb6918 100644
--- a/src/gui/dialogs/qabstractprintdialog.cpp
+++ b/src/gui/dialogs/qabstractprintdialog.cpp
@@ -395,10 +395,8 @@ void QAbstractPrintDialogPrivate::setPrinter(QPrinter *newPrinter)
 
     On Windows and Mac OS X, the native print dialog is used, which means that
     some QWidget and QDialog properties set on the dialog won't be respected.
-    The native print dialog on
-    Mac OS X does not support setting printer options, i.e.
-    QAbstractPrintDialog::setEnabledOptions() and
-    QAbstractPrintDialog::addEnabledOption() have no effect.
+    The native print dialog on Mac OS X does not support setting printer options,
+    i.e. setOptions() and setOption() have no effect.
 
     In Qt 4.4, it was possible to use the static functions to show a sheet on
     Mac OS X. This is no longer supported in Qt 4.5. If you want this
diff --git a/src/gui/embedded/embedded.pri b/src/gui/embedded/embedded.pri
index 4a9aa3f..53a2512 100644
--- a/src/gui/embedded/embedded.pri
+++ b/src/gui/embedded/embedded.pri
@@ -141,15 +141,7 @@ embedded {
 		!contains( kbd-drivers, qvfb ) {
 			kbd-drivers += qvfb
 		}
-         }
-
-	contains( kbd-drivers, sl5000 ) {
-		HEADERS +=embedded/qkbdsl5000_qws.h
-		SOURCES +=embedded/qkbdsl5000_qws.cpp
-		!contains( kbd-drivers, tty ) {
-		    kbd-drivers += tty
-		}
-	}
+        }
 
 	contains( kbd-drivers, tty ) {
 		HEADERS +=embedded/qkbdtty_qws.h
@@ -166,16 +158,6 @@ embedded {
 		SOURCES +=embedded/qkbdum_qws.cpp
 	}
 
-	contains( kbd-drivers, yopy ) {
-		HEADERS +=embedded/qkbdyopy_qws.h
-		SOURCES +=embedded/qkbdyopy_qws.cpp
-	}
-
-	contains( kbd-drivers, vr41xx ) {
-		HEADERS +=embedded/qkbdvr41xx_qws.h
-		SOURCES +=embedded/qkbdvr41xx_qws.cpp
-	}
-
 #
 # Mouse drivers
 #
@@ -189,29 +171,19 @@ embedded {
 		SOURCES +=embedded/qmousepc_qws.cpp
 	}
 
-	contains( mouse-drivers, bus ) {
-		HEADERS +=embedded/qmousebus_qws.h
-		SOURCES +=embedded/qmousebus_qws.cpp
-	}
-
 	contains( mouse-drivers, linuxtp ) {
 		HEADERS +=embedded/qmouselinuxtp_qws.h
 		SOURCES +=embedded/qmouselinuxtp_qws.cpp
 	}
 
-	contains( mouse-drivers, vr41xx ) {
-		HEADERS +=embedded/qmousevr41xx_qws.h
-		SOURCES +=embedded/qmousevr41xx_qws.cpp
-	}
-
-	contains( mouse-drivers, yopy ) {
-		HEADERS +=embedded/qmouseyopy_qws.h
-		SOURCES +=embedded/qmouseyopy_qws.cpp
-	}
-	
 	contains( mouse-drivers, tslib ) {
 		LIBS += -lts
 		HEADERS +=embedded/qmousetslib_qws.h
 		SOURCES +=embedded/qmousetslib_qws.cpp
 	}
+
+	contains( mouse-drivers, linuxinput ) {
+		HEADERS +=embedded/qmouselinuxinput_qws.h
+		SOURCES +=embedded/qmouselinuxinput_qws.cpp
+	}
 }
diff --git a/src/gui/embedded/qdirectpainter_qws.cpp b/src/gui/embedded/qdirectpainter_qws.cpp
index e97367c..b3dff06 100644
--- a/src/gui/embedded/qdirectpainter_qws.cpp
+++ b/src/gui/embedded/qdirectpainter_qws.cpp
@@ -150,14 +150,14 @@ QT_BEGIN_NAMESPACE
     \value ReservedSynchronous The allocated region will never change and
     each function that changes the allocated region will be blocking.
 
-    \sa reservedRegion(), allocatedRegion()
+    \sa allocatedRegion()
 */
 
 /*!
     \fn QRegion QDirectPainter::region()
     \obsolete
 
-    Use QDirectPainter::reservedRegion() instead.
+    Use QDirectPainter::allocatedRegion() instead.
 */
 
 static inline QScreen *getPrimaryScreen()
@@ -346,7 +346,7 @@ void QDirectPainter::setRegion(const QRegion &region)
     returned by the allocatedRegion() function. Otherwise they might
     differ (see \l {Dynamic Allocation} for details).
 
-    \sa geometry(), setRegion()
+    \sa geometry(), setRegion(), allocatedRegion()
 */
 QRegion QDirectPainter::requestedRegion() const
 {
@@ -540,7 +540,7 @@ void QDirectPainter::lower()
     any. If not released explicitly, the region will be released on
     application exit.
 
-    \sa reservedRegion(), {Static Allocation}
+    \sa allocatedRegion(), {Static Allocation}
 
     \obsolete
 
diff --git a/src/gui/embedded/qkbd_qws.cpp b/src/gui/embedded/qkbd_qws.cpp
index 7799339..756a398 100644
--- a/src/gui/embedded/qkbd_qws.cpp
+++ b/src/gui/embedded/qkbd_qws.cpp
@@ -453,8 +453,9 @@ void QWSKeyboardHandler::endAutoRepeat()
     Maps \a keycode according to a keymap and sends that key event to the
     \l{Qt for Embedded Linux} server application.
  
-    Please see the QWS_KEYBOARD documentation for a description on how to
-    create and use keymap files.
+    Please see the \l{Qt for Embedded Linux Character Input} and the \l
+    {kmap2qmap} documentations for a description on how to create and use
+    keymap files.
 
     The key event is identified by its \a keycode value and the \a isPress
     and \a autoRepeat parameters.
@@ -475,9 +476,6 @@ void QWSKeyboardHandler::endAutoRepeat()
     implementation needs to take care of a special action, like console
     switching or LED handling.
 
-    Standard Linux console keymaps can be found at the
-    \l {http://lct.sourceforege.net}{LCT project}
-
     If standard Linux console keymaps are used, \a keycode must be one of the
     standardized values defined in \c /usr/include/linux/input.h
 
diff --git a/src/gui/embedded/qkbddriverfactory_qws.cpp b/src/gui/embedded/qkbddriverfactory_qws.cpp
index c599396..b77eb72 100644
--- a/src/gui/embedded/qkbddriverfactory_qws.cpp
+++ b/src/gui/embedded/qkbddriverfactory_qws.cpp
@@ -47,10 +47,7 @@
 #include "qkbdtty_qws.h"
 #include "qkbdlinuxinput_qws.h"
 #include "qkbdum_qws.h"
-#include "qkbdsl5000_qws.h"
 #include "qkbdvfb_qws.h"
-#include "qkbdyopy_qws.h"
-#include "qkbdvr41xx_qws.h"
 #include <stdlib.h>
 #include "private/qfactoryloader_p.h"
 #include "qkbddriverplugin_qws.h"
@@ -104,18 +101,6 @@ Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader,
 QWSKeyboardHandler *QKbdDriverFactory::create(const QString& key, const QString& device)
 {
     QString driver = key.toLower();
-#ifndef QT_NO_QWS_KBD_SL5000
-    if (driver == QLatin1String("sl5000") || driver.isEmpty())
-        return new QWSSL5000KeyboardHandler(device);
-#endif
-#ifndef QT_NO_QWS_KBD_YOPY
-    if (driver == QLatin1String("yopy") || driver.isEmpty())
-        return new QWSYopyKeyboardHandler(device);
-#endif
-#ifndef QT_NO_QWS_KBD_VR41XX
-    if (driver == QLatin1String("vr41xx") || driver.isEmpty())
-        return new QWSVr41xxKeyboardHandler(device);
-#endif
 #ifndef QT_NO_QWS_KEYBOARD
 # ifndef QT_NO_QWS_KBD_TTY
     if (driver == QLatin1String("tty") || driver.isEmpty())
@@ -158,15 +143,6 @@ QStringList QKbdDriverFactory::keys()
 {
     QStringList list;
 
-#ifndef QT_NO_QWS_KBD_SL5000
-    list << QLatin1String("SL5000");
-#endif
-#ifndef QT_NO_QWS_KBD_YOPY
-    list << QLatin1String("YOPY");
-#endif
-#ifndef QT_NO_QWS_KBD_VR41XX
-    list << QLatin1String("VR41xx");
-#endif
 #ifndef QT_NO_QWS_KBD_TTY
     list << QLatin1String("TTY");
 #endif
diff --git a/src/gui/embedded/qkbdlinuxinput_qws.cpp b/src/gui/embedded/qkbdlinuxinput_qws.cpp
index e552731..6aa6633 100644
--- a/src/gui/embedded/qkbdlinuxinput_qws.cpp
+++ b/src/gui/embedded/qkbdlinuxinput_qws.cpp
@@ -76,6 +76,7 @@ private:
     int                           m_fd;
     int                           m_tty_fd;
     struct termios                m_tty_attr;
+    int                           m_orig_kbmode;
 };
 
 QWSLinuxInputKeyboardHandler::QWSLinuxInputKeyboardHandler(const QString &device)
@@ -95,8 +96,7 @@ bool QWSLinuxInputKeyboardHandler::filterInputEvent(quint16 &, qint32 &)
 }
 
 QWSLinuxInputKbPrivate::QWSLinuxInputKbPrivate(QWSLinuxInputKeyboardHandler *h, const QString &device)
-    : m_handler(h), m_fd(-1), m_tty_fd(-1)
-
+    : m_handler(h), m_fd(-1), m_tty_fd(-1), m_orig_kbmode(K_XLATE)
 {
     setObjectName(QLatin1String("LinuxInputSubsystem Keyboard Handler"));
 
@@ -135,7 +135,10 @@ QWSLinuxInputKbPrivate::QWSLinuxInputKbPrivate(QWSLinuxInputKeyboardHandler *h,
             struct ::termios termdata;
             tcgetattr(m_tty_fd, &termdata);
 
-            // setting this tranlation mode is also needed in INPUT mode to prevent
+            // record the original mode so we can restore it again in the destructor.
+            ::ioctl(m_tty_fd, KDGKBMODE, &m_orig_kbmode);
+
+            // setting this tranlation mode is even needed in INPUT mode to prevent
             // the shell from also interpreting codes, if the process has a tty
             // attached: e.g. Ctrl+C wouldn't copy, but kill the application.
             ::ioctl(m_tty_fd, KDSKBMODE, K_MEDIUMRAW);
@@ -152,7 +155,7 @@ QWSLinuxInputKbPrivate::QWSLinuxInputKbPrivate(QWSLinuxInputKeyboardHandler *h,
             tcsetattr(m_tty_fd, TCSANOW, &termdata);
         }
     } else {
-        qWarning("Cannot open input device '%s': %s", qPrintable(dev), strerror(errno));
+        qWarning("Cannot open keyboard input device '%s': %s", qPrintable(dev), strerror(errno));
         return;
     }
 }
@@ -160,7 +163,7 @@ QWSLinuxInputKbPrivate::QWSLinuxInputKbPrivate(QWSLinuxInputKeyboardHandler *h,
 QWSLinuxInputKbPrivate::~QWSLinuxInputKbPrivate()
 {
     if (m_tty_fd >= 0) {
-        ::ioctl(m_tty_fd, KDSKBMODE, K_XLATE);
+        ::ioctl(m_tty_fd, KDSKBMODE, m_orig_kbmode);
         tcsetattr(m_tty_fd, TCSANOW, &m_tty_attr);
     }
     if (m_fd >= 0)
diff --git a/src/gui/embedded/qkbdsl5000_qws.cpp b/src/gui/embedded/qkbdsl5000_qws.cpp
deleted file mode 100644
index cf82c10..0000000
--- a/src/gui/embedded/qkbdsl5000_qws.cpp
+++ /dev/null
@@ -1,367 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** 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 either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qkbdsl5000_qws.h"
-
-#ifndef QT_NO_QWS_KBD_SL5000
-
-#include "qwindowsystem_qws.h"
-#include "qwsutils_qws.h"
-#include "qscreen_qws.h"
-
-#include "qapplication.h"
-#include "qnamespace.h"
-#include "qtimer.h"
-
-#include <private/qcore_unix_p.h> // overrides QT_OPEN
-
-#include <unistd.h>
-#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <signal.h>
-
-#include <asm/sharp_char.h>
-
-#include <string.h>
-
-QT_BEGIN_NAMESPACE
-
-static const QWSKeyMap sl5000KeyMap[] = {
-    {        Qt::Key_unknown,        0xffff  , 0xffff  , 0xffff  }, // 00
-    {        Qt::Key_A,                'a'     , 'A'     , 'A'-64  }, // 01
-    {        Qt::Key_B,                'b'     , 'B'     , 'B'-64  }, // 02
-    {        Qt::Key_C,                'c'     , 'C'     , 'C'-64  }, // 03
-    {        Qt::Key_D,                'd'     , 'D'     , 'D'-64  }, // 04
-    {        Qt::Key_E,                'e'     , 'E'     , 'E'-64  }, // 05
-    {        Qt::Key_F,                'f'     , 'F'     , 'F'-64  }, // 06
-    {        Qt::Key_G,                'g'     , 'G'     , 'G'-64  }, // 07
-    {        Qt::Key_H,                'h'     , 'H'     , 'H'-64  }, // 08
-    {        Qt::Key_I,                'i'     , 'I'     , 'I'-64  }, // 09
-    {        Qt::Key_J,                'j'     , 'J'     , 'J'-64  }, // 0a 10
-    {        Qt::Key_K,                'k'     , 'K'     , 'K'-64  }, // 0b
-    {        Qt::Key_L,                'l'     , 'L'     , 'L'-64  }, // 0c
-    {        Qt::Key_M,                'm'     , 'M'     , 'M'-64  }, // 0d
-    {        Qt::Key_N,                'n'     , 'N'     , 'N'-64  }, // 0e
-    {        Qt::Key_O,                'o'     , 'O'     , 'O'-64  }, // 0f
-    {        Qt::Key_P,                'p'     , 'P'     , 'P'-64  }, // 10
-    {        Qt::Key_Q,                'q'     , 'Q'     , 'Q'-64  }, // 11
-    {        Qt::Key_R,                'r'     , 'R'     , 'R'-64  }, // 12
-    {        Qt::Key_S,                's'     , 'S'     , 'S'-64  }, // 13
-    {        Qt::Key_T,                't'     , 'T'     , 'T'-64  }, // 14 20
-    {        Qt::Key_U,                'u'     , 'U'     , 'U'-64  }, // 15
-    {        Qt::Key_V,                'v'     , 'V'     , 'V'-64  }, // 16
-    {        Qt::Key_W,                'w'     , 'W'     , 'W'-64  }, // 17
-    {        Qt::Key_X,                'x'     , 'X'     , 'X'-64  }, // 18
-    {        Qt::Key_Y,                'y'     , 'Y'     , 'Y'-64  }, // 19
-    {        Qt::Key_Z,                'z'     , 'Z'     , 'Z'-64  }, // 1a
-    {        Qt::Key_Shift,                0xffff  , 0xffff  , 0xffff  }, // 1b
-    {        Qt::Key_Return,                13      , 13      , 0xffff  }, // 1c
-    {        Qt::Key_F11,                0xffff  , 0xffff  , 0xffff  }, // 1d todo
-    {        Qt::Key_F22,                0xffff  , 0xffff  , 0xffff  }, // 1e 30
-    {        Qt::Key_Backspace,        8       , 8       , 0xffff  }, // 1f
-    {        Qt::Key_F31,                0xffff  , 0xffff  , 0xffff  }, // 20
-    {        Qt::Key_F35,                0xffff  , 0xffff  , 0xffff  }, // 21 light
-    {        Qt::Key_Escape,                0xffff  , 0xffff  , 0xffff  }, // 22
-
-    // Direction key code are for *UNROTATED* display.
-    {        Qt::Key_Up,                0xffff  , 0xffff  , 0xffff  }, // 23
-    {        Qt::Key_Right,                0xffff  , 0xffff  , 0xffff  }, // 24
-    {        Qt::Key_Left,                0xffff  , 0xffff  , 0xffff  }, // 25
-    {        Qt::Key_Down,                0xffff  , 0xffff  , 0xffff  }, // 26
-
-    {        Qt::Key_F33,                0xffff  , 0xffff  , 0xffff  }, // 27 OK
-    {        Qt::Key_F12,                0xffff  , 0xffff  , 0xffff  }, // 28 40 home
-    {        Qt::Key_1,                '1'     , 'q'     , 'Q'-64  }, // 29
-    {        Qt::Key_2,                '2'     , 'w'     , 'W'-64  }, // 2a
-    {        Qt::Key_3,                '3'     , 'e'     , 'E'-64  }, // 2b
-    {        Qt::Key_4,                '4'     , 'r'     , 'R'-64  }, // 2c
-    {        Qt::Key_5,                '5'     , 't'     , 'T'-64  }, // 2d
-    {        Qt::Key_6,                '6'     , 'y'     , 'Y'-64  }, // 2e
-    {        Qt::Key_7,                '7'     , 'u'     , 'U'-64  }, // 2f
-    {        Qt::Key_8,                '8'     , 'i'     , 'I'-64  }, // 30
-    {        Qt::Key_9,                '9'     , 'o'     , 'O'-64  }, // 31
-    {        Qt::Key_0,                '0'     , 'p'     , 'P'-64  }, // 32 50
-    {        Qt::Key_unknown,        0xffff  , 0xffff  , 0xffff  }, // 33
-    {        Qt::Key_unknown,        0xffff  , 0xffff  , 0xffff  }, // 34
-    {        Qt::Key_unknown,        0xffff  , 0xffff  , 0xffff  }, // 35
-    {        Qt::Key_unknown,        0xffff  , 0xffff  , 0xffff  }, // 36
-    {        Qt::Key_unknown,        0xffff  , 0xffff  , 0xffff  }, // 37
-    {        Qt::Key_unknown,        0xffff  , 0xffff  , 0xffff  }, // 38
-    {        Qt::Key_unknown,        0xffff  , 0xffff  , 0xffff  }, // 39
-    {        Qt::Key_Minus,                '-'     , 'b'     , 'B'-64  }, // 3a
-    {        Qt::Key_Plus,                '+'     , 'n'     , 'N'-64  }, // 3b
-    {        Qt::Key_CapsLock,        0xffff  , 0xffff  , 0xffff  }, // 3c 60
-    {        Qt::Key_At,                '@'     , 's'     , 'S'-64  }, // 3d
-    {        Qt::Key_Question,        '?'     , '?'     , 0xffff  }, // 3e
-    {        Qt::Key_Comma,                ','     , ','     , 0xffff  }, // 3f
-    {        Qt::Key_Period,                '.'     , '.'     , 0xffff  }, // 40
-    {        Qt::Key_Tab,                9       , '\\'    , 0xffff  }, // 41
-    {        Qt::Key_X,                0xffff         , 'x'            , 'X'-64  }, // 42
-    {        Qt::Key_C,                0xffff         , 'c'     , 'C'-64  }, // 43
-    {        Qt::Key_V,                0xffff         , 'v'     , 'V'-64  }, // 44
-    {        Qt::Key_Slash,                '/'     , '/'     , 0xffff  }, // 45
-    {        Qt::Key_Apostrophe,        '\''    , '\''    , 0xffff  }, // 46 70
-    {        Qt::Key_Semicolon,        ';'     , ';'     , 0xffff  }, // 47
-    {        Qt::Key_QuoteDbl,        '\"'    , '\"'    , 0xffff  }, // 48
-    {        Qt::Key_Colon,                ':'     , ':'     , 0xffff  }, // 49
-    {        Qt::Key_NumberSign,        '#'     , 'd'     , 'D'-64  }, // 4a
-    {        Qt::Key_Dollar,                '$'     , 'f'     , 'F'-64  }, // 4b
-    {        Qt::Key_Percent,        '%'     , 'g'     , 'G'-64  }, // 4c
-    {        Qt::Key_Underscore,        '_'     , 'h'     , 'H'-64  }, // 4d
-    {        Qt::Key_Ampersand,        '&'     , 'j'     , 'J'-64  }, // 4e
-    {        Qt::Key_Asterisk,        '*'     , 'k'     , 'K'-64  }, // 4f
-    {        Qt::Key_ParenLeft,        '('     , 'l'     , 'L'-64  }, // 50 80
-    {        Qt::Key_Delete,                '['     , '['     , '['     }, // 51
-    {        Qt::Key_Z,                0xffff         , 'z'     , 'Z'-64  }, // 52
-    {        Qt::Key_Equal,                '='     , 'm'     , 'M'-64  }, // 53
-    {        Qt::Key_ParenRight,        ')'     , ']'     , ']'     }, // 54
-    {        Qt::Key_AsciiTilde,        '~'     , '^'     , '^'     }, // 55
-    {        Qt::Key_Less,                '<'     , '{'     , '{'     }, // 56
-    {        Qt::Key_Greater,        '>'     , '}'     , '}'     }, // 57
-    {        Qt::Key_F9,                0xffff  , 0xffff  , 0xffff  }, // 58 datebook
-    {        Qt::Key_F10,                0xffff  , 0xffff  , 0xffff  }, // 59 address
-    {        Qt::Key_F13,                0xffff  , 0xffff  , 0xffff  }, // 5a 90 email
-    {        Qt::Key_F30,                ' '      , ' '    , 0xffff  }, // 5b select
-    {        Qt::Key_Space,                ' '     , '|'     , '`'     }, // 5c
-    {        Qt::Key_unknown,        0xffff  , 0xffff  , 0xffff  }, // 5d
-    {        Qt::Key_Exclam,                '!'     , 'a'     , 'A'-64  }, // 5e
-    {        Qt::Key_unknown,        0xffff  , 0xffff  , 0xffff  }, // 5f
-    {        Qt::Key_unknown,        0xffff  , 0xffff  , 0xffff  }, // 60
-    {        Qt::Key_unknown,        0xffff  , 0xffff  , 0xffff  }, // 61
-    {        Qt::Key_unknown,        0xffff  , 0xffff  , 0xffff  }, // 62
-    {        Qt::Key_unknown,        0xffff  , 0xffff  , 0xffff  }, // 63
-    {        Qt::Key_unknown,        0xffff  , 0xffff  , 0xffff  }, // 64
-    {        Qt::Key_unknown,        0xffff  , 0xffff  , 0xffff  }, // 65
-    {        Qt::Key_unknown,        0xffff  , 0xffff  , 0xffff  }, // 66
-    {        Qt::Key_Meta,                0xffff  , 0xffff  , 0xffff  }, // 67
-    {        Qt::Key_unknown,        0xffff  , 0xffff  , 0xffff  }, // 68
-    {        Qt::Key_unknown,        0xffff  , 0xffff  , 0xffff  }, // 69
-    {        Qt::Key_unknown,        0xffff  , 0xffff  , 0xffff  }, // 6a
-    {        Qt::Key_unknown,        0xffff  , 0xffff  , 0xffff  }, // 6b
-    {        Qt::Key_unknown,        0xffff  , 0xffff  , 0xffff  }, // 6c
-    {        Qt::Key_F34,                0xffff  , 0xffff  , 0xffff  }, // 6d power
-    {        Qt::Key_F13,                0xffff  , 0xffff  , 0xffff  }, // 6e mail long
-    {        Qt::Key_unknown,        0xffff  , 0xffff  , 0xffff  }, // 6f
-    {        Qt::Key_NumLock,        0xffff  , 0xffff  , 0xffff  }, // 70
-    {        Qt::Key_unknown,        0xffff  , 0xffff  , 0xffff  }, // 71
-    {        Qt::Key_unknown,        0xffff  , 0xffff  , 0xffff  }, // 72
-    {         0x20ac,        0xffff  , 0x20ac , 0x20ac }, // 73 Euro sign
-    {        Qt::Key_unknown,        0xffff  , 0xffff  , 0xffff  }, // 74
-    {        Qt::Key_F32,                0xffff  , 0xffff  , 0xffff  }, // 75 Sync
-    {        0,                        0xffff  , 0xffff  , 0xffff  }
-};
-
-static const int keyMSize = sizeof(sl5000KeyMap)/sizeof(QWSKeyMap)-1;
-
-QWSSL5000KeyboardHandler::QWSSL5000KeyboardHandler(const QString &device)
-    : QWSTtyKeyboardHandler(device)
-{
-    shift = false;
-    alt   = false;
-    ctrl  = false;
-    extended = 0;
-    prevuni = 0;
-    prevkey = 0;
-    caps = false;
-    meta = false;
-    fn = false;
-    numLock = false;
-
-    sharp_kbdctl_modifstat  st;
-    int dev = QT_OPEN(device.isEmpty()?"/dev/sharp_kbdctl":device.toLocal8Bit().constData(), O_RDWR);
-    if (dev >= 0) {
-        memset(&st, 0, sizeof(st));
-        st.which = 3;
-        int ret = ioctl(dev, SHARP_KBDCTL_GETMODIFSTAT, (char*)&st);
-        if(!ret)
-            numLock = (bool)st.stat;
-        QT_CLOSE(dev);
-    }
-}
-
-QWSSL5000KeyboardHandler::~QWSSL5000KeyboardHandler()
-{
-}
-
-const QWSKeyMap *QWSSL5000KeyboardHandler::keyMap() const
-{
-    return sl5000KeyMap;
-}
-
-bool QWSSL5000KeyboardHandler::filterKeycode(char &code)
-{
-    int keyCode = Qt::Key_unknown;
-    bool release = false;
-
-    if (code & 0x80) {
-        release = true;
-        code &= 0x7f;
-    }
-
-    if (fn && !meta && (code >= 0x42 && code <= 0x52)) {
-        ushort unicode=0;
-        int scan=0;
-        if (code == 0x42) { unicode='X'-'@'; scan=Qt::Key_X; } // Cut
-        else if (code == 0x43) { unicode='C'-'@'; scan=Qt::Key_C; } // Copy
-        else if (code == 0x44) { unicode='V'-'@'; scan=Qt::Key_V; } // Paste
-        else if (code == 0x52) { unicode='Z'-'@'; scan=Qt::Key_Z; } // Undo
-        if (scan) {
-            processKeyEvent(unicode, scan, Qt::ControlModifier, !release, false);
-            return true;
-        }
-    }
-
-    if (code < keyMSize) {
-        keyCode = keyMap()[int(code)].key_code;
-    }
-
-    bool repeatable = true;
-
-    if (release && (keyCode == Qt::Key_F34 || keyCode == Qt::Key_F35))
-        return true; // no release for power and light keys
-    if ((keyCode >= Qt::Key_F1 && keyCode <= Qt::Key_F35)
-            || keyCode == Qt::Key_Escape || keyCode == Qt::Key_Home
-            || keyCode == Qt::Key_Shift || keyCode == Qt::Key_Meta)
-        repeatable = false;
-
-    if (qt_screen->isTransformed()
-            && keyCode >= Qt::Key_Left && keyCode <= Qt::Key_Down)
-    {
-        keyCode = transformDirKey(keyCode);
-    }
-
-    // Ctrl-Alt-Delete exits qws
-    if (ctrl && alt && keyCode == Qt::Key_Delete) {
-        qApp->quit();
-    }
-
-    if (keyCode == Qt::Key_F22) { /* Fn key */
-        fn = !release;
-    } else if (keyCode == Qt::Key_NumLock) {
-        if (release)
-            numLock = !numLock;
-    } else if (keyCode == Qt::AltModifier) {
-        alt = !release;
-    } else if (keyCode == Qt::ControlModifier) {
-        ctrl = !release;
-    } else if (keyCode == Qt::ShiftModifier) {
-        shift = !release;
-    } else if (keyCode == Qt::MetaModifier) {
-        meta = !release;
-    } else if (keyCode == Qt::Key_CapsLock && release) {
-        caps = !caps;
-    }
-    if (keyCode != Qt::Key_unknown) {
-        bool bAlt = alt;
-        bool bCtrl = ctrl;
-        bool bShift = shift;
-        int unicode = 0;
-        if (code < keyMSize) {
-            bool bCaps = caps ^ shift;
-            if (fn) {
-                if (shift) {
-                    bCaps = bShift = false;
-                    bCtrl = true;
-                }
-                if (meta) {
-                    bCaps = bShift = true;
-                    bAlt = true;
-                }
-            } else if (meta) {
-                bCaps = bShift = true;
-            }
-            if (code > 40 && caps) {
-                // fn-keys should only react to shift, not caps
-                bCaps = bShift = shift;
-            }
-            if (numLock) {
-                if (keyCode != Qt::Key_Space && keyCode != Qt::Key_Tab)
-                    bCaps = bShift = false;
-            }
-            if (keyCode == Qt::Key_Delete && (bAlt || bCtrl)) {
-                keyCode = Qt::Key_BraceLeft;
-                unicode = '[';
-                bCaps = bShift = bAlt = bCtrl = false;
-            } else if (keyCode == Qt::Key_F31 && bCtrl) {
-                keyCode = Qt::Key_QuoteLeft;
-                unicode = '`';
-            } else if (bCtrl)
-                unicode =  keyMap()[int(code)].ctrl_unicode ?  keyMap()[int(code)].ctrl_unicode : 0xffff;
-            else if (bCaps)
-                unicode =  keyMap()[int(code)].shift_unicode ?  keyMap()[int(code)].shift_unicode : 0xffff;
-            else
-                unicode =  keyMap()[int(code)].unicode ?  keyMap()[int(code)].unicode : 0xffff;
-        }
-
-        modifiers = 0;
-        if (bAlt) modifiers |= Qt::AltModifier;
-        if (bCtrl) modifiers |= Qt::ControlModifier;
-        if (bShift) modifiers |= Qt::ShiftModifier;
-
-        // looks wrong -- WWA
-        bool repeat = false;
-        if (prevuni == unicode && prevkey == keyCode && !release)
-            repeat = true;
-
-        processKeyEvent(unicode, keyCode, modifiers, !release, repeat);
-
-        if (!release) {
-            prevuni = unicode;
-            prevkey = keyCode;
-        } else {
-            prevkey = prevuni = 0;
-        }
-    }
-
-    if (repeatable && !release)
-        beginAutoRepeat(prevuni, prevkey, modifiers);
-    else
-        endAutoRepeat();
-
-    return true;
-}
-
-QT_END_NAMESPACE
-
-#endif // QT_NO_QWS_KBD_SL5000
diff --git a/src/gui/embedded/qkbdsl5000_qws.h b/src/gui/embedded/qkbdsl5000_qws.h
deleted file mode 100644
index 42afbe1..0000000
--- a/src/gui/embedded/qkbdsl5000_qws.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** 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 either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QKBDSL5000_QWS_H
-#define QKBDSL5000_QWS_H
-
-#include <QtGui/qkbdtty_qws.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Gui)
-
-#ifndef QT_NO_QWS_KBD_SL5000
-
-struct QWSKeyMap {
-    uint key_code;
-    ushort unicode;
-    ushort shift_unicode;
-    ushort ctrl_unicode;
-};
-
-
-class QWSSL5000KeyboardHandler : public QWSTtyKeyboardHandler
-{
-public:
-    explicit QWSSL5000KeyboardHandler(const QString&);
-    virtual ~QWSSL5000KeyboardHandler();
-
-    bool filterKeycode(char &keycode);
-    virtual const QWSKeyMap *keyMap() const;
-
-private:
-    bool shift;
-    bool alt;
-    bool ctrl;
-    bool caps;
-    uint extended:2;
-    Qt::KeyboardModifiers modifiers;
-    int prevuni;
-    int prevkey;
-    bool meta;
-    bool fn;
-    bool numLock;
-};
-
-#endif // QT_NO_QWS_KBD_SL5000
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QKBDSL5000_QWS_H
diff --git a/src/gui/embedded/qkbdtty_qws.cpp b/src/gui/embedded/qkbdtty_qws.cpp
index 8c1e79b..f107567 100644
--- a/src/gui/embedded/qkbdtty_qws.cpp
+++ b/src/gui/embedded/qkbdtty_qws.cpp
@@ -90,7 +90,7 @@ private:
     struct termios         m_tty_attr;
     char                   m_last_keycode;
     int                    m_vt_qws;
-    int                    m_originalKbdMode;
+    int                    m_orig_kbmode;
 };
 
 
@@ -111,7 +111,7 @@ bool QWSTtyKeyboardHandler::filterKeycode(char &)
 }
 
 QWSTtyKbPrivate::QWSTtyKbPrivate(QWSTtyKeyboardHandler *h, const QString &device)
-    : m_handler(h), m_tty_fd(-1), m_last_keycode(0), m_vt_qws(0)
+    : m_handler(h), m_tty_fd(-1), m_last_keycode(0), m_vt_qws(0), m_orig_kbmode(K_XLATE)
 {
     setObjectName(QLatin1String("TTY Keyboard Handler"));
 #ifndef QT_NO_QWS_SIGNALHANDLER
@@ -152,15 +152,15 @@ QWSTtyKbPrivate::QWSTtyKbPrivate(QWSTtyKeyboardHandler *h, const QString &device
         tcgetattr(m_tty_fd, &termdata);
 
 #if defined(Q_OS_LINUX)
-        // record the original mode so we can restore it again in the constructor
-        ::ioctl(m_tty_fd, KDGKBMODE, m_originalKbdMode);
+        // record the original mode so we can restore it again in the destructor.
+        ::ioctl(m_tty_fd, KDGKBMODE, &m_orig_kbmode);
 
         // PLEASE NOTE:
-        // The tty keycode interface can only report keycodes 0x01 .. 0x7f
+        // the tty keycode interface can only report keycodes 0x01 .. 0x7f
         // KEY_MAX is however defined to 0x1ff. In practice this is sufficient
         // for a PC style keyboard though.
-        // we don't support K_RAW anymore - if you need, you habe to add a
-        // scan- to keycode converter.
+        // we don't support K_RAW anymore - if you need that, you have to add
+        // a scan- to keycode converter yourself.
         ::ioctl(m_tty_fd, KDSKBMODE, K_MEDIUMRAW);
 #endif
 
@@ -211,12 +211,10 @@ QWSTtyKbPrivate::~QWSTtyKbPrivate()
 {
     if (m_tty_fd >= 0) {
 #if defined(Q_OS_LINUX)
-        ::ioctl(m_tty_fd, KDSKBMODE, m_originalKbdMode);
+        ::ioctl(m_tty_fd, KDSKBMODE, m_orig_kbmode);
 #endif
         tcsetattr(m_tty_fd, TCSANOW, &m_tty_attr);
-
-        // we're leaking m_tty_fd here?
-        //QT_CLOSE(m_tty_fd);
+        QT_CLOSE(m_tty_fd);
     }
 }
 
diff --git a/src/gui/embedded/qkbdvr41xx_qws.cpp b/src/gui/embedded/qkbdvr41xx_qws.cpp
deleted file mode 100644
index 6d8299b..0000000
--- a/src/gui/embedded/qkbdvr41xx_qws.cpp
+++ /dev/null
@@ -1,186 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** 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 either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qkbdvr41xx_qws.h"
-
-#if !defined(QT_NO_QWS_KEYBOARD) && !defined(QT_NO_QWS_KBD_VR41XX)
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <fcntl.h>
-#include <termios.h>
-#include <unistd.h>
-#include <errno.h>
-
-#include <qsocketnotifier.h>
-#include <private/qcore_unix_p.h> // overrides QT_OPEN
-
-QT_BEGIN_NAMESPACE
-
-class QWSVr41xxKbPrivate : public QObject
-{
-    Q_OBJECT
-public:
-    QWSVr41xxKbPrivate(QWSVr41xxKeyboardHandler *h, const QString&);
-    virtual ~QWSVr41xxKbPrivate();
-
-    bool isOpen() { return buttonFD > 0; }
-
-private slots:
-    void readKeyboardData();
-
-private:
-    QString terminalName;
-    int buttonFD;
-    int kbdIdx;
-    int kbdBufferLen;
-    unsigned char *kbdBuffer;
-    QSocketNotifier *notifier;
-    QWSVr41xxKeyboardHandler *handler;
-};
-
-QWSVr41xxKeyboardHandler::QWSVr41xxKeyboardHandler(const QString &device)
-{
-    d = new QWSVr41xxKbPrivate(this, device);
-}
-
-QWSVr41xxKeyboardHandler::~QWSVr41xxKeyboardHandler()
-{
-    delete d;
-}
-
-QWSVr41xxKbPrivate::QWSVr41xxKbPrivate(QWSVr41xxKeyboardHandler *h, const QString &device) : handler(h)
-{
-    terminalName = device;
-    if (terminalName.isEmpty())
-        terminalName = QLatin1String("/dev/buttons");
-    buttonFD = -1;
-    notifier = 0;
-
-    buttonFD = QT_OPEN(terminalName.toLatin1().constData(), O_RDWR | O_NDELAY, 0);;
-    if (buttonFD < 0) {
-        qWarning("Cannot open %s\n", qPrintable(terminalName));
-        return;
-    }
-
-    if (buttonFD >= 0) {
-        notifier = new QSocketNotifier(buttonFD, QSocketNotifier::Read, this);
-        connect(notifier, SIGNAL(activated(int)),this,
-                SLOT(readKeyboardData()));
-    }
-
-    kbdBufferLen = 80;
-    kbdBuffer = new unsigned char [kbdBufferLen];
-    kbdIdx = 0;
-}
-
-QWSVr41xxKbPrivate::~QWSVr41xxKbPrivate()
-{
-    if (buttonFD > 0) {
-        QT_CLOSE(buttonFD);
-        buttonFD = -1;
-    }
-    delete notifier;
-    notifier = 0;
-    delete [] kbdBuffer;
-}
-
-void QWSVr41xxKbPrivate::readKeyboardData()
-{
-    int n = 0;
-    do {
-        n  = QT_READ(buttonFD, kbdBuffer+kbdIdx, kbdBufferLen - kbdIdx);
-        if (n > 0)
-            kbdIdx += n;
-    } while (n > 0);
-
-    int idx = 0;
-    while (kbdIdx - idx >= 2) {
-        unsigned char *next = kbdBuffer + idx;
-        unsigned short *code = (unsigned short *)next;
-        int keycode = Qt::Key_unknown;
-        switch ((*code) & 0x0fff) {
-            case 0x7:
-                keycode = Qt::Key_Up;
-                break;
-            case 0x9:
-                keycode = Qt::Key_Right;
-                break;
-            case 0x8:
-                keycode = Qt::Key_Down;
-                break;
-            case 0xa:
-                keycode = Qt::Key_Left;
-                break;
-            case 0x3:
-                keycode = Qt::Key_Up;
-                break;
-            case 0x4:
-                keycode = Qt::Key_Down;
-                break;
-            case 0x1:
-                keycode = Qt::Key_Return;
-                break;
-            case 0x2:
-                keycode = Qt::Key_F4;
-                break;
-            default:
-                qDebug("Unrecognised key sequence %d", *code);
-        }
-        if ((*code) & 0x8000)
-            handler->processKeyEvent(0, keycode, 0, false, false);
-        else
-            handler->processKeyEvent(0, keycode, 0, true, false);
-        idx += 2;
-    }
-
-    int surplus = kbdIdx - idx;
-    for (int i = 0; i < surplus; i++)
-        kbdBuffer[i] = kbdBuffer[idx+i];
-    kbdIdx = surplus;
-}
-
-QT_END_NAMESPACE
-
-#include "qkbdvr41xx_qws.moc"
-
-#endif // QT_NO_QWS_KBD_VR41XX
diff --git a/src/gui/embedded/qkbdyopy_qws.cpp b/src/gui/embedded/qkbdyopy_qws.cpp
deleted file mode 100644
index edb732c..0000000
--- a/src/gui/embedded/qkbdyopy_qws.cpp
+++ /dev/null
@@ -1,211 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** 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 either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*
- * YOPY buttons driver
- * Contributed by Ron Victorelli (victorrj at icubed.com)
- */
-
-#include "qkbdyopy_qws.h"
-
-#ifndef QT_NO_QWS_KBD_YOPY
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <fcntl.h>
-#include <termios.h>
-#include <unistd.h>
-#include <errno.h>
-
-#include <linux/kd.h>
-#include <linux/fb.h>
-#include <linux/yopy_button.h>
-
-#include <private/qcore_unix_p.h> // overrides QT_OPEN
-
-extern "C" {
-    int getpgid(int);
-}
-
-#include <qwidget.h>
-#include <qsocketnotifier.h>
-
-QT_BEGIN_NAMESPACE
-
-class QWSYopyKbPrivate : public QObject
-{
-    Q_OBJECT
-public:
-    QWSYopyKbPrivate(QWSYopyKeyboardHandler *h, const QString&);
-    virtual ~QWSYopyKbPrivate();
-
-    bool isOpen() { return buttonFD > 0; }
-
-private slots:
-    void readKeyboardData();
-
-private:
-    QString terminalName;
-    int buttonFD;
-    struct termios newT, oldT;
-    QSocketNotifier *notifier;
-    QWSYopyKeyboardHandler *handler;
-};
-
-QWSYopyKeyboardHandler::QWSYopyKeyboardHandler(const QString &device)
-{
-    d = new QWSYopyKbPrivate(this, device);
-}
-
-QWSYopyKeyboardHandler::~QWSYopyKeyboardHandler()
-{
-    delete d;
-}
-
-QWSYopyKbPrivate::QWSYopyKbPrivate(QWSYopyKeyboardHandler *h, const QString &device) : handler(h)
-{
-    terminalName = device.isEmpty()?"/dev/tty1":device.toLatin1().constData();
-    buttonFD = -1;
-    notifier = 0;
-
-    buttonFD = QT_OPEN(terminalName.toLatin1().constData(), O_RDWR | O_NDELAY, 0);
-    if (buttonFD < 0) {
-        qWarning("Cannot open %s\n", qPrintable(terminalName));
-        return;
-    } else {
-
-       tcsetpgrp(buttonFD, getpgid(0));
-
-       /* put tty into "straight through" mode.
-       */
-       if (tcgetattr(buttonFD, &oldT) < 0) {
-           qFatal("Linux-kbd: tcgetattr failed");
-       }
-
-       newT = oldT;
-       newT.c_lflag &= ~(ICANON | ECHO  | ISIG);
-       newT.c_iflag &= ~(ISTRIP | IGNCR | ICRNL | INLCR | IXOFF | IXON);
-       newT.c_iflag |= IGNBRK;
-       newT.c_cc[VMIN]  = 0;
-       newT.c_cc[VTIME] = 0;
-
-
-       if (tcsetattr(buttonFD, TCSANOW, &newT) < 0) {
-           qFatal("Linux-kbd: TCSANOW tcsetattr failed");
-       }
-
-       if (ioctl(buttonFD, KDSKBMODE, K_MEDIUMRAW) < 0) {
-           qFatal("Linux-kbd: KDSKBMODE tcsetattr failed");
-       }
-
-        notifier = new QSocketNotifier(buttonFD, QSocketNotifier::Read, this);
-        connect(notifier, SIGNAL(activated(int)),this,
-                 SLOT(readKeyboardData()));
-    }
-}
-
-QWSYopyKbPrivate::~QWSYopyKbPrivate()
-{
-    if (buttonFD > 0) {
-        ::close(buttonFD);
-        buttonFD = -1;
-    }
-}
-
-void QWSYopyKbPrivate::readKeyboardData()
-{
-    uchar buf[1];
-    char c='1';
-    int fd;
-
-    int n=read(buttonFD,buf,1);
-    if (n<0) {
-        qDebug("Keyboard read error %s",strerror(errno));
-    } else {
-        uint code = buf[0]&YPBUTTON_CODE_MASK;
-        bool press = !(buf[0]&0x80);
-        // printf("Key=%d/%d/%d\n",buf[1],code,press);
-        int k=(-1);
-        switch(code) {
-          case 39:       k=Qt::Key_Up;     break;
-          case 44:       k=Qt::Key_Down;   break;
-          case 41:       k=Qt::Key_Left;   break;
-          case 42:       k=Qt::Key_Right;  break;
-          case 56:       k=Qt::Key_F1;     break; //windows
-          case 29:       k=Qt::Key_F2;     break; //cycle
-          case 24:       k=Qt::Key_F3;     break; //record
-          case 23:       k=Qt::Key_F4;     break; //mp3
-          case 4:        k=Qt::Key_F5;     break; // PIMS
-          case 1:        k=Qt::Key_Escape; break; // Escape
-          case 40:       k=Qt::Key_Up;     break; // prev
-          case 45:       k=Qt::Key_Down;   break; // next
-          case 35:       if(!press) {
-                           fd = QT_OPEN("/proc/sys/pm/sleep",O_RDWR,0);
-                           if(fd >= 0) {
-                               QT_WRITE(fd,&c,sizeof(c));
-                               QT_CLOSE(fd);
-                               //
-                               // Updates all widgets.
-                               //
-                               QWidgetList list = QApplication::allWidgets();
-                               for (int i = 0; i < list.size(); ++i) {
-                                   QWidget *w = list.at(i);
-                                   w->update();
-                               }
-                           }
-                         }
-                         break;
-
-          default: k=(-1); break;
-        }
-
-        if (k >= 0) {
-            handler->processKeyEvent(0, k, 0, press, false);
-        }
-    }
-}
-
-QT_END_NAMESPACE
-
-#include "qkbdyopy_qws.moc"
-
-#endif // QT_NO_QWS_KBD_YOPY
diff --git a/src/gui/embedded/qkbdyopy_qws.h b/src/gui/embedded/qkbdyopy_qws.h
deleted file mode 100644
index b4e45bd..0000000
--- a/src/gui/embedded/qkbdyopy_qws.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** 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 either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QKBDYOPY_QWS_H
-#define QKBDYOPY_QWS_H
-
-#include <QtGui/qkbd_qws.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Gui)
-
-#ifndef QT_NO_QWS_KBD_YOPY
-
-class QWSYopyKbPrivate;
-
-class QWSYopyKeyboardHandler : public QWSKeyboardHandler
-{
-public:
-    explicit QWSYopyKeyboardHandler(const QString&);
-    virtual ~QWSYopyKeyboardHandler();
-
-private:
-    QWSYopyKbPrivate *d;
-};
-
-#endif // QT_NO_QWS_KBD_YOPY
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QKBDYOPY_QWS_H
diff --git a/src/gui/embedded/qmousebus_qws.cpp b/src/gui/embedded/qmousebus_qws.cpp
deleted file mode 100644
index 0b674b6..0000000
--- a/src/gui/embedded/qmousebus_qws.cpp
+++ /dev/null
@@ -1,239 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** 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 either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmousebus_qws.h"
-
-#ifndef QT_NO_QWS_MOUSE_BUS
-
-#include "qwindowsystem_qws.h"
-#include "qsocketnotifier.h"
-
-#include "qapplication.h"
-#include <private/qcore_unix_p.h> // overrides QT_OPEN
-
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <termios.h>
-
-QT_BEGIN_NAMESPACE
-
-/*
- * bus mouse driver (a.k.a. Logitech busmouse)
- */
-
-class QWSBusMouseHandlerPrivate : public QObject
-{
-    Q_OBJECT
-public:
-    QWSBusMouseHandlerPrivate(QWSBusMouseHandler *h, const QString &driver, const QString &device);
-    ~QWSBusMouseHandlerPrivate();
-
-    void suspend();
-    void resume();
-
-private slots:
-    void readMouseData();
-
-protected:
-    enum { mouseBufSize = 128 };
-    QWSBusMouseHandler *handler;
-    QSocketNotifier *mouseNotifier;
-    int mouseFD;
-    int mouseIdx;
-    int obstate;
-    uchar mouseBuf[mouseBufSize];
-};
-
-QWSBusMouseHandler::QWSBusMouseHandler(const QString &driver, const QString &device)
-    : QWSMouseHandler(driver, device)
-{
-    d = new QWSBusMouseHandlerPrivate(this, driver, device);
-}
-
-QWSBusMouseHandler::~QWSBusMouseHandler()
-{
-    delete d;
-}
-
-void QWSBusMouseHandler::suspend()
-{
-    d->suspend();
-}
-
-void QWSBusMouseHandler::resume()
-{
-    d->resume();
-}
-
-
-QWSBusMouseHandlerPrivate::QWSBusMouseHandlerPrivate(QWSBusMouseHandler *h,
-    const QString &, const QString &device)
-    : handler(h)
-
-{
-    QString mouseDev = device;
-    if (mouseDev.isEmpty())
-        mouseDev = QLatin1String("/dev/mouse");
-    obstate = -1;
-    mouseFD = -1;
-    mouseFD = QT_OPEN(mouseDev.toLocal8Bit(), O_RDWR | O_NDELAY);
-    if (mouseFD < 0)
-        mouseFD = QT_OPEN(mouseDev.toLocal8Bit(), O_RDONLY | O_NDELAY);
-    if (mouseFD < 0)
-        qDebug("Cannot open %s (%s)", qPrintable(mouseDev), strerror(errno));
-
-    // Clear pending input
-    tcflush(mouseFD,TCIFLUSH);
-    usleep(50000);
-
-    char buf[100];                                // busmouse driver will not read if bufsize < 3,  YYD
-    while (QT_READ(mouseFD, buf, 100) > 0) { }  // eat unwanted replies
-
-    mouseIdx = 0;
-
-    mouseNotifier = new QSocketNotifier(mouseFD, QSocketNotifier::Read, this);
-    connect(mouseNotifier, SIGNAL(activated(int)),this, SLOT(readMouseData()));
-}
-
-QWSBusMouseHandlerPrivate::~QWSBusMouseHandlerPrivate()
-{
-    if (mouseFD >= 0) {
-        tcflush(mouseFD,TCIFLUSH);            // yyd.
-        QT_CLOSE(mouseFD);
-    }
-}
-
-
-void QWSBusMouseHandlerPrivate::suspend()
-{
-    mouseNotifier->setEnabled(false);
-}
-
-
-void QWSBusMouseHandlerPrivate::resume()
-{
-    mouseIdx = 0;
-    obstate = -1;
-    mouseNotifier->setEnabled(true);
-}
-
-void QWSBusMouseHandlerPrivate::readMouseData()
-{
-    int n;
-    // It'll only read 3 bytes a time and return all other buffer zeroed, thus cause protocol errors
-    for (;;) {
-        if (mouseBufSize - mouseIdx < 3)
-            break;
-        n = QT_READ(mouseFD, mouseBuf+mouseIdx, 3);
-        if (n != 3)
-            break;
-        mouseIdx += 3;
-    }
-
-    static const int accel_limit = 5;
-    static const int accel = 2;
-
-    int idx = 0;
-    int bstate = 0;
-    int dx = 0, dy = 0;
-    bool sendEvent = false;
-    int tdx = 0, tdy = 0;
-
-    while (mouseIdx-idx >= 3) {
-#if 0 // debug
-        qDebug("Got mouse data");
-#endif
-        uchar *mb = mouseBuf+idx;
-        bstate = 0;
-        dx = 0;
-        dy = 0;
-        sendEvent = false;
-        if (((mb[0] & 0x04)))
-            bstate |= Qt::LeftButton;
-        if (((mb[0] & 0x01)))
-            bstate |= Qt::RightButton;
-
-        dx=(signed char)mb[1];
-        dy=(signed char)mb[2];
-        sendEvent=true;
-
-        if (sendEvent) {
-            if (qAbs(dx) > accel_limit || qAbs(dy) > accel_limit) {
-                dx *= accel;
-                dy *= accel;
-            }
-            tdx += dx;
-            tdy += dy;
-            if (bstate != obstate) {
-                QPoint pos = handler->pos() + QPoint(tdx,-tdy);
-                handler->limitToScreen(pos);
-                handler->mouseChanged(pos,bstate);
-                sendEvent = false;
-                tdx = 0;
-                tdy = 0;
-                obstate = bstate;
-            }
-        }
-        idx += 3;
-    }
-    if (sendEvent) {
-        QPoint pos = handler->pos() + QPoint(tdx,-tdy);
-        handler->limitToScreen(pos);
-        handler->mouseChanged(pos,bstate);
-    }
-
-    int surplus = mouseIdx - idx;
-    for (int i = 0; i < surplus; i++)
-        mouseBuf[i] = mouseBuf[idx+i];
-    mouseIdx = surplus;
-}
-
-QT_END_NAMESPACE
-
-#include "qmousebus_qws.moc"
-
-#endif // QT_NO_QWS_MOUSE_BUS
diff --git a/src/gui/embedded/qmousedriverfactory_qws.cpp b/src/gui/embedded/qmousedriverfactory_qws.cpp
index 7e51818..46898ae 100644
--- a/src/gui/embedded/qmousedriverfactory_qws.cpp
+++ b/src/gui/embedded/qmousedriverfactory_qws.cpp
@@ -43,10 +43,8 @@
 
 #include "qapplication.h"
 #include "qmousepc_qws.h"
-#include "qmousebus_qws.h"
-#include "qmousevr41xx_qws.h"
-#include "qmouseyopy_qws.h"
 #include "qmouselinuxtp_qws.h"
+#include "qmouselinuxinput_qws.h"
 #include "qmousevfb_qws.h"
 #include "qmousetslib_qws.h"
 #include <stdlib.h>
@@ -108,14 +106,6 @@ QWSMouseHandler *QMouseDriverFactory::create(const QString& key, const QString &
     if (driver == QLatin1String("linuxtp") || driver.isEmpty())
         return new QWSLinuxTPMouseHandler(key, device);
 #endif
-#ifndef QT_NO_QWS_MOUSE_YOPY
-    if (driver == QLatin1String("yopy") || driver.isEmpty())
-        return new QWSYopyMouseHandler(key, device);
-#endif
-#ifndef QT_NO_QWS_MOUSE_VR41XX
-    if (driver == QLatin1String("vr41xx") || driver.isEmpty())
-        return new QWSVr41xxMouseHandler(key, device);
-#endif
 #ifndef QT_NO_QWS_MOUSE_PC
     if (driver == QLatin1String("auto")
         || driver == QLatin1String("intellimouse")
@@ -126,14 +116,16 @@ QWSMouseHandler *QMouseDriverFactory::create(const QString& key, const QString &
         return new QWSPcMouseHandler(key, device);
     }
 #endif
-#ifndef QT_NO_QWS_MOUSE_BUS
-    if (driver == QLatin1String("bus"))
-        return new QWSBusMouseHandler(key, device);
-#endif
 #ifndef QT_NO_QWS_MOUSE_TSLIB
     if (driver == QLatin1String("tslib") || driver.isEmpty())
         return new QWSTslibMouseHandler(key, device);
 #endif
+# ifndef QT_NO_QWS_MOUSE_LINUXINPUT
+    if (driver == QLatin1String("linuxinput") || \
+        driver == QLatin1String("usb") || \
+        driver == QLatin1String("linuxis"))
+        return new QWSLinuxInputMouseHandler(device);
+# endif
 #ifndef QT_NO_QWS_MOUSE_QVFB
     if (driver == QLatin1String("qvfbmouse") || driver == QLatin1String("qvfb"))
         return new QVFbMouseHandler(key, device);
@@ -160,12 +152,6 @@ QStringList QMouseDriverFactory::keys()
 #ifndef QT_NO_QWS_MOUSE_LINUXTP
     list << QLatin1String("LinuxTP");
 #endif
-#ifndef QT_NO_QWS_MOUSE_YOPY
-    list << QLatin1String("Yopy");
-#endif
-#ifndef QT_NO_QWS_MOUSE_VR41XX
-    list << QLatin1String("VR41xx");
-#endif
 #ifndef QT_NO_QWS_MOUSE_PC
     list << QLatin1String("Auto")
          << QLatin1String("IntelliMouse")
@@ -173,12 +159,12 @@ QStringList QMouseDriverFactory::keys()
          << QLatin1String("MouseSystems")
          << QLatin1String("MouseMan");
 #endif
-#ifndef QT_NO_QWS_MOUSE_BUS
-    list << QLatin1String("Bus");
-#endif
 #ifndef QT_NO_QWS_MOUSE_TSLIB
     list << QLatin1String("Tslib");
 #endif
+#ifndef QT_NO_QWS_MOUSE_LINUXINPUT
+    list << QLatin1String("LinuxInput");
+#endif
 
 #if !defined(Q_OS_WIN32) || defined(QT_MAKEDLL)
 #ifndef QT_NO_LIBRARY
diff --git a/src/gui/embedded/qmouselinuxinput_qws.cpp b/src/gui/embedded/qmouselinuxinput_qws.cpp
new file mode 100644
index 0000000..6ea8807
--- /dev/null
+++ b/src/gui/embedded/qmouselinuxinput_qws.cpp
@@ -0,0 +1,205 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://www.qtsoftware.com/contact.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qmouselinuxinput_qws.h"
+
+#include <QScreen>
+#include <QSocketNotifier>
+
+#include <qplatformdefs.h>
+#include <private/qcore_unix_p.h> // overrides QT_OPEN
+
+#include <errno.h>
+
+#include <linux/input.h>
+
+QT_BEGIN_NAMESPACE
+
+
+class QWSLinuxInputMousePrivate : public QObject
+{
+    Q_OBJECT
+public:
+    QWSLinuxInputMousePrivate(QWSLinuxInputMouseHandler *, const QString &);
+    ~QWSLinuxInputMousePrivate();
+
+    void enable(bool on);
+
+private Q_SLOTS:
+    void readMouseData();
+
+private:
+    QWSLinuxInputMouseHandler *m_handler;
+    QSocketNotifier *          m_notify;
+    int                        m_fd;
+    int                        m_x, m_y;
+    int                        m_buttons;
+};
+
+QWSLinuxInputMouseHandler::QWSLinuxInputMouseHandler(const QString &device)
+    : QWSCalibratedMouseHandler(device)
+{
+    d = new QWSLinuxInputMousePrivate(this, device);
+}
+
+QWSLinuxInputMouseHandler::~QWSLinuxInputMouseHandler()
+{
+    delete d;
+}
+
+void QWSLinuxInputMouseHandler::suspend()
+{
+    d->enable(false);
+}
+
+void QWSLinuxInputMouseHandler::resume()
+{
+    d->enable(true);
+}
+
+QWSLinuxInputMousePrivate::QWSLinuxInputMousePrivate(QWSLinuxInputMouseHandler *h, const QString &device)
+    : m_handler(h), m_notify(0), m_x(0), m_y(0), m_buttons(0)
+{
+    setObjectName(QLatin1String("LinuxInputSubsystem Mouse Handler"));
+
+    QString dev = QLatin1String("/dev/input/event0");
+    if (device.startsWith(QLatin1String("/dev/")))
+        dev = device;
+
+    m_fd = QT_OPEN(dev.toLocal8Bit().constData(), O_RDONLY | O_NDELAY, 0);
+    if (m_fd >= 0) {
+        m_notify = new QSocketNotifier(m_fd, QSocketNotifier::Read, this);
+        connect(m_notify, SIGNAL(activated(int)), this, SLOT(readMouseData()));
+    } else {
+        qWarning("Cannot open mouse input device '%s': %s", qPrintable(dev), strerror(errno));
+        return;
+    }
+}
+
+QWSLinuxInputMousePrivate::~QWSLinuxInputMousePrivate()
+{
+    if (m_fd >= 0)
+        QT_CLOSE(m_fd);
+}
+
+void QWSLinuxInputMousePrivate::enable(bool on)
+{
+    if (m_notify)
+        m_notify->setEnabled(on);
+}
+
+void QWSLinuxInputMousePrivate::readMouseData()
+{
+    if (!qt_screen)
+        return;
+
+    struct ::input_event buffer[32];
+    int n = 0;
+
+    forever {
+        n = QT_READ(m_fd, reinterpret_cast<char *>(buffer) + n, sizeof(buffer) - n);
+
+        if (n == 0) {
+            qWarning("Got EOF from the input device.");
+            return;
+        } else if (n < 0 && (errno != EINTR && errno != EAGAIN)) {
+            qWarning("Could not read from input device: %s", strerror(errno));
+            return;
+        } else if (n % sizeof(buffer[0]) == 0) {
+            break;
+        }
+    }
+
+    n /= sizeof(buffer[0]);
+
+    for (int i = 0; i < n; ++i) {
+        struct ::input_event *data = &buffer[i];
+
+        bool unknown = false;
+        if (data->type == EV_ABS) {
+            if (data->code == ABS_X) {
+                m_x = data->value;
+            } else if (data->code == ABS_Y) {
+                m_y = data->value;
+            } else {
+                unknown = true;
+            }
+        } else if (data->type == EV_REL) {
+            if (data->code == REL_X) {
+                m_x += data->value;
+            } else if (data->code == REL_Y) {
+                m_y += data->value;
+            } else {
+                unknown = true;
+            }
+        } else if (data->type == EV_KEY && data->code == BTN_TOUCH) {
+            m_buttons = data->value ? Qt::LeftButton : 0;
+        } else if (data->type == EV_KEY) {
+            int button = 0;
+            switch (data->code) {
+            case BTN_LEFT: button = Qt::LeftButton; break;
+            case BTN_MIDDLE: button = Qt::MidButton; break;
+            case BTN_RIGHT: button = Qt::RightButton; break;
+            }
+            if (data->value)
+                m_buttons |= button;
+            else
+                m_buttons &= ~button;
+        } else if (data->type == EV_SYN && data->code == SYN_REPORT) {
+            QPoint pos(m_x, m_y);
+            pos = m_handler->transform(pos);
+            m_handler->limitToScreen(pos);
+            m_handler->mouseChanged(pos, m_buttons);
+        } else if (data->type == EV_MSC && data->code == MSC_SCAN) {
+            // kernel encountered an unmapped key - just ignore it
+            continue;
+        } else {
+            unknown = true;
+        }
+        if (unknown) {
+            qWarning("unknown mouse event type=%x, code=%x, value=%x", data->type, data->code, data->value);
+        }
+    }
+}
+
+QT_END_NAMESPACE
+
+#include "qmouselinuxinput_qws.moc"
diff --git a/src/gui/embedded/qmousebus_qws.h b/src/gui/embedded/qmouselinuxinput_qws.h
index 407da98..25e351f 100644
--- a/src/gui/embedded/qmousebus_qws.h
+++ b/src/gui/embedded/qmouselinuxinput_qws.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtGui module of the Qt Toolkit.
+** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#ifndef QMOUSEBUS_QWS_H
-#define QMOUSEBUS_QWS_H
+#ifndef QMOUSELINUXINPUT_QWS_H
+#define QMOUSELINUXINPUT_QWS_H
 
-#include <QtGui/qmouse_qws.h>
+#include <QtGui/QWSCalibratedMouseHandler>
 
 QT_BEGIN_HEADER
 
@@ -50,27 +50,29 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Gui)
 
-#ifndef QT_NO_QWS_MOUSE_BUS
+#ifndef QT_NO_QWS_MOUSE_LINUXINPUT
 
-class QWSBusMouseHandlerPrivate;
+class QWSLinuxInputMousePrivate;
 
-class QWSBusMouseHandler : public QWSMouseHandler
+class QWSLinuxInputMouseHandler : public QWSCalibratedMouseHandler
 {
 public:
-    explicit QWSBusMouseHandler(const QString & = QString(),
-                                const QString & = QString());
-    ~QWSBusMouseHandler();
+    QWSLinuxInputMouseHandler(const QString &);
+    ~QWSLinuxInputMouseHandler();
 
     void suspend();
     void resume();
-protected:
-    QWSBusMouseHandlerPrivate *d;
+
+private:
+    QWSLinuxInputMousePrivate *d;
+
+    friend class QWSLinuxInputMousePrivate;
 };
 
-#endif // QT_NO_QWS_MOUSE_BUS
+#endif // QT_NO_QWS_MOUSE_LINUXINPUT
 
 QT_END_NAMESPACE
 
 QT_END_HEADER
 
-#endif // QMOUSEBUS_QWS_H
+#endif // QMOUSELINUXINPUT_QWS_H
diff --git a/src/gui/embedded/qmousevr41xx_qws.cpp b/src/gui/embedded/qmousevr41xx_qws.cpp
deleted file mode 100644
index b7491d9..0000000
--- a/src/gui/embedded/qmousevr41xx_qws.cpp
+++ /dev/null
@@ -1,251 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** 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 either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmousevr41xx_qws.h"
-
-#ifndef QT_NO_QWS_MOUSE_VR41XX
-#include "qwindowsystem_qws.h"
-#include "qsocketnotifier.h"
-#include "qtimer.h"
-#include "qapplication.h"
-#include "qscreen_qws.h"
-#include <qstringlist.h>
-#include <qvarlengtharray.h>
-#include <private/qcore_unix_p.h> // overrides QT_OPEN
-
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <termios.h>
-
-QT_BEGIN_NAMESPACE
-
-static const int defaultFilterSize = 3;
-
-class QWSVr41xxMouseHandlerPrivate : public QObject
-{
-    Q_OBJECT
-public:
-    QWSVr41xxMouseHandlerPrivate(QWSVr41xxMouseHandler *, const QString &, const QString &);
-    ~QWSVr41xxMouseHandlerPrivate();
-
-    void resume();
-    void suspend();
-
-private slots:
-    void sendRelease();
-    void readMouseData();
-
-private:
-    bool getSample();
-    ushort currSample[6];
-    uint currLength;
-
-    int mouseFD;
-    int mouseIdx;
-    QTimer *rtimer;
-    QSocketNotifier *mouseNotifier;
-    QWSVr41xxMouseHandler *handler;
-    QPoint lastPos;
-    bool isPressed;
-    int filterSize;
-    int pressLimit;
-};
-
-QWSVr41xxMouseHandler::QWSVr41xxMouseHandler(const QString &drv, const QString &dev)
-    : QWSCalibratedMouseHandler(drv, dev)
-{
-    d = new QWSVr41xxMouseHandlerPrivate(this, drv, dev);
-}
-
-QWSVr41xxMouseHandler::~QWSVr41xxMouseHandler()
-{
-    delete d;
-}
-
-void QWSVr41xxMouseHandler::resume()
-{
-    d->resume();
-}
-
-void QWSVr41xxMouseHandler::suspend()
-{
-    d->suspend();
-}
-
-QWSVr41xxMouseHandlerPrivate::QWSVr41xxMouseHandlerPrivate(QWSVr41xxMouseHandler *h, const QString &, const QString &device)
-    : currLength(0), handler(h)
-{
-    QStringList options = device.split(QLatin1String(":"));
-    int index = -1;
-
-    filterSize = defaultFilterSize;
-    QRegExp filterRegExp(QLatin1String("filter=(\\d+)"));
-    index = options.indexOf(filterRegExp);
-    if (index != -1) {
-        filterSize = qMax(1, filterRegExp.cap(1).toInt());
-        options.removeAt(index);
-    }
-    handler->setFilterSize(filterSize);
-
-    pressLimit = 750;
-    QRegExp pressRegExp(QLatin1String("press=(\\d+)"));
-    index = options.indexOf(pressRegExp);
-    if (index != -1) {
-        pressLimit = filterRegExp.cap(1).toInt();
-        options.removeAt(index);
-    }
-
-    QString dev;
-    if (options.isEmpty())
-        dev = QLatin1String("/dev/vrtpanel");
-    else
-        dev = options.first();
-
-    if ((mouseFD = QT_OPEN(dev.toLocal8Bit().constData(), O_RDONLY)) < 0) {
-        qWarning("Cannot open %s (%s)", qPrintable(dev), strerror(errno));
-        return;
-    }
-    sleep(1);
-
-    if (fcntl(mouseFD, F_SETFL, O_NONBLOCK) < 0) {
-        qWarning("Error initializing touch panel.");
-        return;
-    }
-
-    mouseNotifier = new QSocketNotifier(mouseFD, QSocketNotifier::Read, this);
-    connect(mouseNotifier, SIGNAL(activated(int)),this, SLOT(readMouseData()));
-
-    rtimer = new QTimer(this);
-    rtimer->setSingleShot(true);
-    connect(rtimer, SIGNAL(timeout()), this, SLOT(sendRelease()));
-    mouseIdx = 0;
-}
-
-QWSVr41xxMouseHandlerPrivate::~QWSVr41xxMouseHandlerPrivate()
-{
-    if (mouseFD >= 0)
-        QT_CLOSE(mouseFD);
-}
-
-void QWSVr41xxMouseHandlerPrivate::suspend()
-{
-    mouseNotifier->setEnabled(false);
-}
-
-
-void QWSVr41xxMouseHandlerPrivate::resume()
-{
-    mouseIdx = 0;
-    mouseNotifier->setEnabled(true);
-}
-
-void QWSVr41xxMouseHandlerPrivate::sendRelease()
-{
-    handler->sendFiltered(lastPos, Qt::NoButton);
-    isPressed = false;
-}
-
-bool QWSVr41xxMouseHandlerPrivate::getSample()
-{
-    const int n = QT_READ(mouseFD,
-                          reinterpret_cast<uchar*>(currSample) + currLength,
-                          sizeof(currSample) - currLength);
-
-    if (n > 0)
-        currLength += n;
-
-    if (currLength < sizeof(currSample))
-        return false;
-
-    currLength = 0;
-    return true;
-}
-
-void QWSVr41xxMouseHandlerPrivate::readMouseData()
-{
-    const int sampleLength = sizeof(currSample) / sizeof(ushort);
-    QVarLengthArray<ushort, sampleLength * defaultFilterSize> samples(sampleLength * filterSize);
-
-    // Only return last 'filterSize' samples
-    int head = 0;
-    int tail = 0;
-    int nSamples = 0;
-    while (getSample()) {
-        if (!(currSample[0] & 0x8000) || (currSample[5] < pressLimit))
-            continue;
-
-        ushort *data = samples.data() + head * sampleLength;
-        memcpy(data, currSample, sizeof(currSample));
-        ++nSamples;
-        head = (head + 1) % filterSize;
-        if (nSamples >= filterSize)
-            tail = (tail + 1) % filterSize;
-    }
-
-    if (nSamples == 0)
-        return;
-
-    // send mouse events
-    while (tail != head || filterSize == 1) {
-        const ushort *data = samples.data() + tail * sampleLength;
-        lastPos = QPoint(data[3] - data[4], data[2] - data[1]);
-        handler->sendFiltered(lastPos, Qt::LeftButton);
-        isPressed = true;
-        tail = (tail + 1) % filterSize;
-        if (filterSize == 1)
-            break;
-    }
-
-    if (isPressed)
-        rtimer->start(50); // release unreliable
-}
-
-QT_END_NAMESPACE
-
-#include "qmousevr41xx_qws.moc"
-
-#endif //QT_NO_QWS_MOUSE_VR41
diff --git a/src/gui/embedded/qmousevr41xx_qws.h b/src/gui/embedded/qmousevr41xx_qws.h
deleted file mode 100644
index 46d07e0..0000000
--- a/src/gui/embedded/qmousevr41xx_qws.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** 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 either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMOUSEVR41XX_QWS_H
-#define QMOUSEVR41XX_QWS_H
-
-#include <QtGui/qmouse_qws.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Gui)
-
-#ifndef QT_NO_QWS_MOUSE_VR41XX
-
-class QWSVr41xxMouseHandlerPrivate;
-
-class QWSVr41xxMouseHandler : public QWSCalibratedMouseHandler
-{
-public:
-    explicit QWSVr41xxMouseHandler(const QString & = QString(),
-                                   const QString & = QString());
-    ~QWSVr41xxMouseHandler();
-
-    void resume();
-    void suspend();
-
-protected:
-    QWSVr41xxMouseHandlerPrivate *d;
-
-private:
-    friend class QWSVr41xxMouseHandlerPrivate;
-};
-
-#endif // QT_NO_QWS_MOUSE_VR41XX
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QMOUSEVR41XX_QWS_H
diff --git a/src/gui/embedded/qmouseyopy_qws.cpp b/src/gui/embedded/qmouseyopy_qws.cpp
deleted file mode 100644
index 3a541d3..0000000
--- a/src/gui/embedded/qmouseyopy_qws.cpp
+++ /dev/null
@@ -1,185 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** 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 either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmouseyopy_qws.h"
-
-#ifndef QT_NO_QWS_MOUSE_YOPY
-#include "qwindowsystem_qws.h"
-#include "qsocketnotifier.h"
-#include "qapplication.h"
-#include "qscreen_qws.h"
-#include <private/qcore_unix_p.h> // overrides QT_OPEN
-
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <termios.h>
-
-QT_BEGIN_NAMESPACE
-
-class QWSYopyMouseHandlerPrivate : public QObject
-{
-    Q_OBJECT
-public:
-    QWSYopyMouseHandlerPrivate(QWSYopyMouseHandler *h);
-    ~QWSYopyMouseHandlerPrivate();
-
-    void suspend();
-    void resume();
-
-private slots:
-    void readMouseData();
-
-private:
-    int mouseFD;
-    int prevstate;
-    QSocketNotifier *mouseNotifier;
-    QWSYopyMouseHandler *handler;
-};
-
-QWSYopyMouseHandler::QWSYopyMouseHandler(const QString &driver, const QString &device)
-    : QWSMouseHandler(driver, device)
-{
-    d = new QWSYopyMouseHandlerPrivate(this);
-}
-
-QWSYopyMouseHandler::~QWSYopyMouseHandler()
-{
-    delete d;
-}
-
-void QWSYopyMouseHandler::resume()
-{
-    d->resume();
-}
-
-void QWSYopyMouseHandler::suspend()
-{
-    d->suspend();
-}
-
-QWSYopyMouseHandlerPrivate::QWSYopyMouseHandlerPrivate(QWSYopyMouseHandler *h)
-    : handler(h)
-{
-    if ((mouseFD = QT_OPEN("/dev/ts", O_RDONLY)) < 0) {
-        qWarning("Cannot open /dev/ts (%s)", strerror(errno));
-        return;
-    } else {
-        sleep(1);
-    }
-    prevstate=0;
-    mouseNotifier = new QSocketNotifier(mouseFD, QSocketNotifier::Read,
-                                         this);
-    connect(mouseNotifier, SIGNAL(activated(int)),this, SLOT(readMouseData()));
-}
-
-QWSYopyMouseHandlerPrivate::~QWSYopyMouseHandlerPrivate()
-{
-    if (mouseFD >= 0)
-        QT_CLOSE(mouseFD);
-}
-
-#define YOPY_XPOS(d) (d[1]&0x3FF)
-#define YOPY_YPOS(d) (d[2]&0x3FF)
-#define YOPY_PRES(d) (d[0]&0xFF)
-#define YOPY_STAT(d) (d[3]&0x01)
-
-struct YopyTPdata {
-
-  unsigned char status;
-  unsigned short xpos;
-  unsigned short ypos;
-
-};
-
-void QWSYopyMouseHandlerPrivate::suspend()
-{
-    mouseNotifier->setEnabled(false);
-}
-
-
-void QWSYopyMouseHandlerPrivate::resume()
-{
-    prevstate = 0;
-    mouseNotifier->setEnabled(true);
-}
-
-void QWSYopyMouseHandlerPrivate::readMouseData()
-{
-    if(!qt_screen)
-        return;
-    YopyTPdata data;
-
-    unsigned int yopDat[4];
-
-    int ret;
-
-    ret=QT_READ(mouseFD,&yopDat,sizeof(yopDat));
-
-    if(ret) {
-        data.status= (YOPY_PRES(yopDat)) ? 1 : 0;
-        data.xpos=YOPY_XPOS(yopDat);
-        data.ypos=YOPY_YPOS(yopDat);
-        QPoint q;
-        q.setX(data.xpos);
-        q.setY(data.ypos);
-        if (data.status && !prevstate) {
-          handler->mouseChanged(q,Qt::LeftButton);
-        } else if(!data.status && prevstate) {
-          handler->mouseChanged(q,0);
-        }
-        prevstate = data.status;
-    }
-    if(ret<0) {
-        qDebug("Error %s",strerror(errno));
-    }
-}
-
-QT_END_NAMESPACE
-
-#include "qmouseyopy_qws.moc"
-
-#endif //QT_NO_QWS_MOUSE_YOPY
diff --git a/src/gui/embedded/qmouseyopy_qws.h b/src/gui/embedded/qmouseyopy_qws.h
deleted file mode 100644
index 0d24a8f..0000000
--- a/src/gui/embedded/qmouseyopy_qws.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** 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 either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMOUSEYOPY_QWS_H
-#define QMOUSEYOPY_QWS_H
-
-#include <QtGui/qmouse_qws.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Gui)
-
-#ifndef QT_NO_QWS_MOUSE_YOPY
-
-// YOPY touch panel support based on changes contributed by Ron Victorelli
-// (victorrj at icubed.com) to Custom TP driver.
-
-class QWSYopyMouseHandlerPrivate;
-
-class QWSYopyMouseHandler : public QWSMouseHandler
-{
-public:
-    explicit QWSYopyMouseHandler(const QString & = QString(),
-                                 const QString & = QString());
-    ~QWSYopyMouseHandler();
-
-    void resume();
-    void suspend();
-
-protected:
-    QWSYopyMouseHandlerPrivate *d;
-};
-
-#endif // QT_NO_QWS_MOUSE_YOPY
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QMOUSEYOPY_QWS_H
diff --git a/src/gui/graphicsview/graphicsview.pri b/src/gui/graphicsview/graphicsview.pri
index 0c0747e..9d232e4 100644
--- a/src/gui/graphicsview/graphicsview.pri
+++ b/src/gui/graphicsview/graphicsview.pri
@@ -16,12 +16,13 @@ HEADERS += graphicsview/qgraphicsgridlayout.h \
     graphicsview/qgraphicssceneevent.h \
     graphicsview/qgraphicssceneindex_p.h \
     graphicsview/qgraphicsscenelinearindex_p.h \
+    graphicsview/qgraphicstransform.h \
+    graphicsview/qgraphicstransform_p.h \
     graphicsview/qgraphicsview.h \
     graphicsview/qgraphicsview_p.h \
     graphicsview/qgraphicswidget.h \
     graphicsview/qgraphicswidget_p.h \
     graphicsview/qgridlayoutengine_p.h
-
 SOURCES += graphicsview/qgraphicsgridlayout.cpp \
     graphicsview/qgraphicsitem.cpp \
     graphicsview/qgraphicsitemanimation.cpp \
@@ -36,6 +37,7 @@ SOURCES += graphicsview/qgraphicsgridlayout.cpp \
     graphicsview/qgraphicssceneevent.cpp \
     graphicsview/qgraphicssceneindex.cpp \
     graphicsview/qgraphicsscenelinearindex.cpp \
+    graphicsview/qgraphicstransform.cpp \
     graphicsview/qgraphicsview.cpp \
     graphicsview/qgraphicswidget.cpp \
     graphicsview/qgraphicswidget_p.cpp \
diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp
index 37c034a..b5fb15c 100644
--- a/src/gui/graphicsview/qgraphicsitem.cpp
+++ b/src/gui/graphicsview/qgraphicsitem.cpp
@@ -303,13 +303,12 @@
     drop shadow effects and for decoration objects that follow the parent
     item's geometry without drawing on top of it.
 
-    \value ItemUsesExtendedStyleOption The item makes use of either
-    QStyleOptionGraphicsItem::exposedRect or QStyleOptionGraphicsItem::matrix.
+    \value ItemUsesExtendedStyleOption The item makes use of either the
+    exposedRect or matrix member of the QStyleOptionGraphicsItem. Implementers
+    of QGraphicsItem subclasses should set that flag if this data is required.
     By default, the exposedRect is initialized to the item's boundingRect and
     the matrix is untransformed. Enable this flag for more fine-grained values.
-    Note that QStyleOptionGraphicsItem::levelOfDetail is unaffected by this flag
-    and is always initialized to 1.
-    Use QStyleOptionGraphicsItem::levelOfDetailFromTransform for a more
+    Use QStyleOptionGraphicsItem::levelOfDetailFromTransform() for a more
     fine-grained value.
 
     \value ItemHasNoContents The item does not paint anything (i.e., calling
@@ -330,6 +329,9 @@
 
     \value ItemNegativeZStacksBehindParent The item automatically stacks
     it's parent if it's z-value is negative.
+
+    \value ItemAutoDetectsFocusProxy The item will assign any child that
+    gains input focus as its focus proxy. See also focusProxy().
     This flag was introduced in Qt 4.6.
 */
 
@@ -913,12 +915,12 @@ void QGraphicsItemPrivate::setParentItemHelper(QGraphicsItem *newParent)
         scene->d_func()->index->itemChange(q, QGraphicsItem::ItemParentChange, newParentVariant);
     }
 
-    if (QGraphicsWidget *w = isWidget ? static_cast<QGraphicsWidget *>(q) : q->parentWidget()) {
-        // Update the child focus chain; when reparenting a widget that has a
+    QGraphicsItem *lastSubFocusItem = subFocusItem;
+    if (subFocusItem) {
+        // Update the child focus chain; when reparenting an item that has a
         // focus child, ensure that that focus child clears its focus child
         // chain from our parents before it's reparented.
-        if (QGraphicsWidget *focusChild = w->focusWidget())
-            focusChild->clearFocus();
+        subFocusItem->clearFocus();
     }
 
     // We anticipate geometry changes. If the item is deleted, it will be
@@ -1006,6 +1008,21 @@ void QGraphicsItemPrivate::setParentItemHelper(QGraphicsItem *newParent)
     resolveDepth(parent ? parent->d_ptr->depth : -1);
     dirtySceneTransform = 1;
 
+    // Restore the sub focus chain.
+    if (lastSubFocusItem)
+        lastSubFocusItem->d_ptr->setSubFocus();
+
+    // Auto-update focus proxy. The closest parent that detects
+    // focus proxies is updated as the proxy gains or loses focus.
+    QGraphicsItem *p = newParent;
+    while (p) {
+        if (p->d_ptr->flags & QGraphicsItem::ItemAutoDetectsFocusProxy) {
+            p->setFocusProxy(q);
+            break;
+        }
+        p = p->d_ptr->parent;
+    }
+
     // Deliver post-change notification
     q->itemChange(QGraphicsItem::ItemParentHasChanged, newParentVariant);
 
@@ -1171,16 +1188,6 @@ QGraphicsItem::~QGraphicsItem()
     d_ptr->inDestructor = 1;
     d_ptr->removeExtraItemCache();
 
-    if (d_ptr->isFocusRealm && d_ptr->scene)
-        d_ptr->scene->d_func()->focusItemForFocusArea.remove(this);
-    if (d_ptr->isFocusItemForArea && d_ptr->scene) {
-        QGraphicsItem *prnt = parentItem();
-        while (prnt && !prnt->d_func()->isFocusRealm)
-            prnt = prnt->parentItem();
-        if (prnt && d_ptr->scene->d_func()->focusItemForFocusArea.value(prnt) == this)
-            d_ptr->scene->d_func()->focusItemForFocusArea.remove(prnt);
-    }
-
     clearFocus();
     if (!d_ptr->children.isEmpty()) {
         QList<QGraphicsItem *> oldChildren = d_ptr->children;
@@ -1193,6 +1200,13 @@ QGraphicsItem::~QGraphicsItem()
     else
         d_ptr->setParentItemHelper(0);
 
+    if (d_ptr->transformData) {
+        for(int i = 0; i < d_ptr->transformData->graphicsTransforms.size(); ++i) {
+            QGraphicsTransform *t = d_ptr->transformData->graphicsTransforms.at(i);
+            static_cast<QGraphicsTransformPrivate *>(t->d_ptr)->item = 0;
+            delete t;
+        }
+    }
     delete d_ptr->transformData;
     delete d_ptr;
 
@@ -1251,7 +1265,7 @@ void QGraphicsItem::setGroup(QGraphicsItemGroup *group)
     Returns a pointer to this item's parent item. If this item does not have a
     parent, 0 is returned.
 
-    \sa setParentItem(), children()
+    \sa setParentItem(), childItems()
 */
 QGraphicsItem *QGraphicsItem::parentItem() const
 {
@@ -1367,7 +1381,7 @@ const QGraphicsObject *QGraphicsItem::toGraphicsObject() const
     the parent. You should not \l{QGraphicsScene::addItem()}{add} the
     item to the scene yourself.
 
-    \sa parentItem(), children()
+    \sa parentItem(), childItems()
 */
 void QGraphicsItem::setParentItem(QGraphicsItem *parent)
 {
@@ -2312,10 +2326,10 @@ bool QGraphicsItem::acceptsHoverEvents() const
     stays "hovered" until the cursor leaves its area, including its
     children's areas.
 
-    If a parent item handles child events (setHandlesChildEvents()), it will
-    receive hover move, drag move, and drop events as the cursor passes
-    through its children, but it does not receive hover enter and hover leave,
-    nor drag enter and drag leave events on behalf of its children.
+    If a parent item handles child events, it will receive hover move,
+    drag move, and drop events as the cursor passes through its
+    children, but it does not receive hover enter and hover leave, nor
+    drag enter and drag leave events on behalf of its children.
 
     A QGraphicsWidget with window decorations will accept hover events
     regardless of the value of acceptHoverEvents().
@@ -2462,73 +2476,166 @@ void QGraphicsItem::setHandlesChildEvents(bool enabled)
 }
 
 /*!
-    Returns true if this item has keyboard input focus; otherwise, returns
-    false.
+    Returns true if this item or its \l{focusProxy()}{focus proxy} has keyboard
+    input focus; otherwise, returns false.
 
-    \sa QGraphicsScene::focusItem(), setFocus(), QGraphicsScene::setFocusItem()
+    \sa focusItem(), setFocus(), QGraphicsScene::setFocusItem()
 */
 bool QGraphicsItem::hasFocus() const
 {
+    if (d_ptr->focusProxy)
+        return d_ptr->focusProxy->hasFocus();
     return (d_ptr->scene && d_ptr->scene->focusItem() == this);
 }
 
 /*!
     Gives keyboard input focus to this item. The \a focusReason argument will
-    be passed into any focus event generated by this function; it is used to
-    give an explanation of what caused the item to get focus.
+    be passed into any \l{QFocusEvent}{focus event} generated by this function;
+    it is used to give an explanation of what caused the item to get focus.
 
-    Only items that set the ItemIsFocusable flag can accept keyboard focus.
+    Only enabled items that set the ItemIsFocusable flag can accept keyboard
+    focus.
 
-    If this item is not visible (i.e., isVisible() returns false), not
-    enabled, not associated with a scene, or if it already has input focus,
-    this function will do nothing.
+    If this item is not visible, or not associated with a scene, it will not
+    gain immediate input focus. However, it will be registered as the preferred
+    focus item for its subtree of items, should it later become visible.
 
-    As a result of calling this function, this item will receive a focus in
-    event with \a focusReason. If another item already has focus, that item
-    will first receive a focus out event indicating that it has lost input
-    focus.
+    As a result of calling this function, this item will receive a 
+    \l{focusInEvent()}{focus in event} with \a focusReason. If another item
+    already has focus, that item will first receive a \l{focusOutEvent()}
+    {focus out event} indicating that it has lost input focus.
 
-    \sa clearFocus(), hasFocus()
+    \sa clearFocus(), hasFocus(), focusItem(), focusProxy()
 */
 void QGraphicsItem::setFocus(Qt::FocusReason focusReason)
 {
-    if (!d_ptr->scene || !isEnabled() || hasFocus() || !(d_ptr->flags & ItemIsFocusable))
+    // Disabled / unfocusable items cannot accept focus.
+    if (!isEnabled() || !(d_ptr->flags & QGraphicsItem::ItemIsFocusable))
+        return;
+
+    // Find focus proxy.
+    QGraphicsItem *f = this;
+    while (f->d_ptr->focusProxy)
+        f = f->d_ptr->focusProxy;
+
+    // Return if it already has focus.
+    if (d_ptr->scene && d_ptr->scene->focusItem() == f)
         return;
-    if (isVisible()) {
-        // Visible items immediately gain focus from scene.
-        d_ptr->scene->setFocusItem(this, focusReason);
-    } else if (d_ptr->isWidget) {
-        // Just set up subfocus.
-        static_cast<QGraphicsWidget *>(this)->d_func()->setFocusWidget();
+
+    // Update the child focus chain.
+    d_ptr->setSubFocus();
+
+    // Update the scene's focus item.
+    if (d_ptr->scene) {
+        QGraphicsWidget *w = window();
+        if (!w || w->isActiveWindow()) {
+            // Visible items immediately gain focus from scene.
+            d_ptr->scene->d_func()->setFocusItemHelper(f, focusReason);
+        }
     }
 }
 
 /*!
     Takes keyboard input focus from the item.
 
-    If it has focus, a focus out event is sent to this item to tell it that it
-    is about to lose the focus.
+    If it has focus, a \l{focusOutEvent()}{focus out event} is sent to this item
+    to tell it that it is about to lose the focus.
 
     Only items that set the ItemIsFocusable flag, or widgets that set an
     appropriate focus policy, can accept keyboard focus.
 
-    \sa setFocus(), QGraphicsWidget::focusPolicy
+    \sa setFocus(), hasFocus(), QGraphicsWidget::focusPolicy
 */
 void QGraphicsItem::clearFocus()
 {
     if (!d_ptr->scene)
         return;
-    if (d_ptr->isWidget) {
-        // Invisible widget items with focus must explicitly clear subfocus.
-        static_cast<QGraphicsWidget *>(this)->d_func()->clearFocusWidget();
-    }
-    if (d_ptr->scene->focusItem() == this) {
+    // Invisible items with focus must explicitly clear subfocus.
+    d_ptr->clearSubFocus();
+    if (hasFocus()) {
         // If this item has the scene's input focus, clear it.
         d_ptr->scene->setFocusItem(0);
     }
 }
 
 /*!
+    \since 4.6
+
+    Returns this item's focus proxy, or 0 if this item has no
+    focus proxy.
+
+    \sa setFocusProxy(), ItemAutoDetectsFocusProxy, setFocus(), hasFocus()
+*/
+QGraphicsItem *QGraphicsItem::focusProxy() const
+{
+    return d_ptr->focusProxy;
+}
+
+/*!
+    \since 4.6
+
+    Sets the item's focus proxy to \a item.
+
+    If an item has a focus proxy, the focus proxy will receive
+    input focus when the item gains input focus. The item itself
+    will still have focus (i.e., hasFocus() will return true),
+    but only the focus proxy will receive the keyboard input.
+
+    A focus proxy can itself have a focus proxy, and so on. In
+    such case, keyboard input will be handled by the outermost
+    focus proxy.
+
+    The focus proxy \a item must belong to the same scene as
+    this item.
+
+    \sa focusProxy(), ItemAutoDetectsFocusProxy, setFocus(), hasFocus()
+*/
+void QGraphicsItem::setFocusProxy(QGraphicsItem *item)
+{
+    if (item == d_ptr->focusProxy)
+        return;
+    if (item == this) {
+        qWarning("QGraphicsItem::setFocusProxy: cannot assign self as focus proxy");
+        return;
+    }
+    if (item) {
+        if (item->d_ptr->scene != d_ptr->scene) {
+            qWarning("QGraphicsItem::setFocusProxy: focus proxy must be in same scene");
+            return;
+        }
+        for (QGraphicsItem *f = item->focusProxy(); f != 0; f = f->focusProxy()) {
+            if (f == this) {
+                qWarning("QGraphicsItem::setFocusProxy: %p is already in the focus proxy chain", item);
+                return;
+            }
+        }
+    }
+
+    QGraphicsItem *lastFocusProxy = d_ptr->focusProxy;
+    d_ptr->focusProxy = item;
+    if (d_ptr->scene) {
+        if (lastFocusProxy)
+            d_ptr->scene->d_func()->focusProxyReverseMap.remove(lastFocusProxy, this);
+        if (item)
+            d_ptr->scene->d_func()->focusProxyReverseMap.insert(item, this);
+    }
+}
+
+/*!
+    \since 4.6
+
+    If this item, a child or descendant of this item currently has input
+    focus, this function will return a pointer to that item. If
+    no descendant has input focus, 0 is returned.
+
+    \sa hasFocus(), setFocus(), QWidget::focusWidget()
+*/
+QGraphicsItem *QGraphicsItem::focusItem() const
+{
+    return d_ptr->subFocusItem;
+}
+
+/*!
     \since 4.4
     Grabs the mouse input.
 
@@ -2663,7 +2770,7 @@ void QGraphicsItem::ungrabKeyboard()
     For convenience, you can also call scenePos() to determine the
     item's position in scene coordinates, regardless of its parent.
 
-    \sa x(), y(), setPos(), matrix(), {The Graphics View Coordinate System}
+    \sa x(), y(), setPos(), transform(), {The Graphics View Coordinate System}
 */
 QPointF QGraphicsItem::pos() const
 {
@@ -2883,94 +2990,19 @@ QTransform QGraphicsItem::transform() const
 /*!
     \since 4.6
 
-    Returns the rotation around the X axis.
-
-    The default is 0
-
-    \warning The value doesn't take in account any rotation set with
-    the setTransform() method.
-
-    \sa setXRotation(), {Transformations}
-*/
-qreal QGraphicsItem::xRotation() const
-{
-    if (!d_ptr->transformData)
-        return 0;
-    return d_ptr->transformData->xRotation;
-}
-
-/*!
-    \since 4.6
-
-    Sets the rotation around the X axis to \a angle degrees.
-
-    \warning The value doesn't take in account any rotation set with the setTransform() method.
-
-    \sa xRotation(), setTransformOrigin(), {Transformations}
-*/
-void QGraphicsItem::setXRotation(qreal angle)
-{
-    prepareGeometryChange();
-    if (!d_ptr->transformData)
-        d_ptr->transformData = new QGraphicsItemPrivate::TransformData;
-    d_ptr->transformData->xRotation = angle;
-    d_ptr->transformData->onlyTransform = false;
-    d_ptr->dirtySceneTransform = 1;
-}
-
-/*!
-    \since 4.6
-
-    Returns the rotation around the Y axis.
-
-    The default is 0
-
-    \warning The value doesn't take in account any rotation set with the setTransform() method.
-
-    \sa setYRotation(), {Transformations}
-*/
-qreal QGraphicsItem::yRotation() const
-{
-    if (!d_ptr->transformData)
-        return 0;
-    return d_ptr->transformData->yRotation;
-}
-
-/*!
-    \since 4.6
-
-    Sets the rotation around the Y axis to \a angle degrees.
-
-    \warning The value doesn't take in account any rotation set with the setTransform() method.
-
-    \sa yRotation(), setTransformOrigin() {Transformations}
-*/
-void QGraphicsItem::setYRotation(qreal angle)
-{
-    prepareGeometryChange();
-    if (!d_ptr->transformData)
-        d_ptr->transformData = new QGraphicsItemPrivate::TransformData;
-    d_ptr->transformData->yRotation = angle;
-    d_ptr->transformData->onlyTransform = false;
-    d_ptr->dirtySceneTransform = 1;
-}
-
-/*!
-    \since 4.6
-
     Returns the rotation around the Z axis.
 
     The default is 0
 
     \warning The value doesn't take in account any rotation set with the setTransform() method.
 
-    \sa setZRotation(), {Transformations}
+    \sa setRotation(), {Transformations}
 */
-qreal QGraphicsItem::zRotation() const
+qreal QGraphicsItem::rotation() const
 {
     if (!d_ptr->transformData)
         return 0;
-    return d_ptr->transformData->zRotation;
+    return d_ptr->transformData->rotation;
 }
 
 /*!
@@ -2980,224 +3012,107 @@ qreal QGraphicsItem::zRotation() const
 
     \warning The value doesn't take in account any rotation set with the setTransform() method.
 
-    \sa zRotation(), setTransformOrigin(), {Transformations}
+    \sa rotation(), setTransformOriginPoint(), {Transformations}
 */
-void QGraphicsItem::setZRotation(qreal angle)
+void QGraphicsItem::setRotation(qreal angle)
 {
     prepareGeometryChange();
     if (!d_ptr->transformData)
         d_ptr->transformData = new QGraphicsItemPrivate::TransformData;
-    d_ptr->transformData->zRotation = angle;
+    d_ptr->transformData->rotation = angle;
     d_ptr->transformData->onlyTransform = false;
     d_ptr->dirtySceneTransform = 1;
-}
 
-/*!
-    \since 4.6
-
-    This convenience function set the rotation angles around the 3 axes
-    to \a x, \a y and \a z.
-
-    \sa setXRotation(), setYRotation(), setZRotation(), {Transformations}
-*/
-void QGraphicsItem::setRotation(qreal x, qreal y, qreal z)
-{
-    prepareGeometryChange();
-    if (!d_ptr->transformData)
-        d_ptr->transformData = new QGraphicsItemPrivate::TransformData;
-    d_ptr->transformData->xRotation = x;
-    d_ptr->transformData->yRotation = y;
-    d_ptr->transformData->zRotation = z;
-    d_ptr->transformData->onlyTransform = false;
-    d_ptr->dirtySceneTransform = 1;
+    if (d_ptr->isObject)
+        emit static_cast<QGraphicsObject *>(this)->rotationChanged();
 }
 
 /*!
     \since 4.6
 
-    Returns the scale factor on the X axis.
+    Returns the scale factor of the item.
 
     The default is 1
 
     \warning The value doesn't take in account any scaling set with the setTransform() method.
 
-    \sa setXScale(), {Transformations}
+    \sa setScale(), {Transformations}
 */
-qreal QGraphicsItem::xScale() const
+qreal QGraphicsItem::scale() const
 {
     if (!d_ptr->transformData)
-        return 1;
-    return d_ptr->transformData->xScale;
+        return 1.;
+    return d_ptr->transformData->scale;
 }
 
 /*!
     \since 4.6
 
-    Sets the scale factor on the X axis to \a factor.
+    Sets the scale factor of the item to \a factor.
 
     \warning The value doesn't take in account any scaling set with the setTransform() method.
 
-    \sa xScale(), setTransformOrigin(), {Transformations}
+    \sa scale(), setTransformOriginPoint(), {Transformations}
 */
-void QGraphicsItem::setXScale(qreal factor)
+void QGraphicsItem::setScale(qreal factor)
 {
     prepareGeometryChange();
     if (!d_ptr->transformData)
         d_ptr->transformData = new QGraphicsItemPrivate::TransformData;
-    d_ptr->transformData->xScale = factor;
+    d_ptr->transformData->scale = factor;
     d_ptr->transformData->onlyTransform = false;
     d_ptr->dirtySceneTransform = 1;
-}
-
-/*!
-    \since 4.6
-
-    Returns the scale factor on the Y axis.
-
-    The default is 1
-
-    \warning The value doesn't take in account any scaling set with the setTransform() method.
-
-    \sa setYScale(), {Transformations}
-*/
-qreal QGraphicsItem::yScale() const
-{
-    if (!d_ptr->transformData)
-        return 1;
-    return d_ptr->transformData->yScale;
-}
-
-/*!
-    \since 4.6
-
-    Sets the scale factor on the Y axis to \a factor.
-
-    \warning The value doesn't take in account any scaling set with the setTransform() method.
 
-    \sa yScale(), setTransformOrigin(), {Transformations}
-*/
-void QGraphicsItem::setYScale(qreal factor)
-{
-    prepareGeometryChange();
-    if (!d_ptr->transformData)
-        d_ptr->transformData = new QGraphicsItemPrivate::TransformData;
-    d_ptr->transformData->yScale = factor;
-    d_ptr->transformData->onlyTransform = false;
-    d_ptr->dirtySceneTransform = 1;
+    if (d_ptr->isObject)
+        emit static_cast<QGraphicsObject *>(this)->scaleChanged();
 }
 
-/*!
-    \since 4.6
-
-    This convenience function set the scaling factors on X and Y axis to \a sx and \a sy.
-
-    \warning The value doesn't take in account any scaling set with the setTransform() method.
-
-    \sa setXScale(), setYScale(), {Transformations}
-*/
-void QGraphicsItem::setScale(qreal sx, qreal sy)
-{
-    prepareGeometryChange();
-    if (!d_ptr->transformData)
-        d_ptr->transformData = new QGraphicsItemPrivate::TransformData;
-    d_ptr->transformData->xScale = sx;
-    d_ptr->transformData->yScale = sy;
-    d_ptr->transformData->onlyTransform = false;
-    d_ptr->dirtySceneTransform = 1;
-}
 
 /*!
     \since 4.6
 
-    Returns the horizontal shear.
-
-    The default is 0
-
-    \warning The value doesn't take in account any shearing set with the setTransform() method.
+    returns list of graphics transformations on the item.
 
-    \sa setHorizontalShear(), {Transformations}
+    \sa scale(), setTransformOriginPoint(), {Transformations}
 */
-qreal QGraphicsItem::horizontalShear() const
+QList<QGraphicsTransform *> QGraphicsItem::transformations() const
 {
     if (!d_ptr->transformData)
-        return 0;
-    return d_ptr->transformData->horizontalShear;
+        return QList<QGraphicsTransform *>();
+    return d_ptr->transformData->graphicsTransforms;
 }
 
 /*!
     \since 4.6
 
-    Sets the horizontal shear to \a shear.
+    Sets a list of graphics transformations on the item to \a transformations.
 
-    \warning The value doesn't take in account any shearing set with the setTransform() method.
-
-    \sa horizontalShear(), {Transformations}
+    \sa scale(), setTransformOriginPoint(), {Transformations}
 */
-void QGraphicsItem::setHorizontalShear(qreal shear)
+void QGraphicsItem::setTransformations(const QList<QGraphicsTransform *> &transformations)
 {
     prepareGeometryChange();
     if (!d_ptr->transformData)
         d_ptr->transformData = new QGraphicsItemPrivate::TransformData;
-    d_ptr->transformData->horizontalShear = shear;
+    d_ptr->transformData->graphicsTransforms = transformations;
+    for (int i = 0; i < transformations.size(); ++i)
+        transformations.at(i)->d_func()->setItem(this);
     d_ptr->transformData->onlyTransform = false;
     d_ptr->dirtySceneTransform = 1;
 }
 
-/*!
-    \since 4.6
-
-    Returns the vertical shear.
-
-    The default is 0
-
-    \warning The value doesn't take in account any shearing set with the setTransform() method.
 
-    \sa setHorizontalShear(), {Transformations}
-*/
-qreal QGraphicsItem::verticalShear() const
+void QGraphicsItemPrivate::appendGraphicsTransform(QGraphicsTransform *t)
 {
-    if (!d_ptr->transformData)
-        return 0;
-    return d_ptr->transformData->verticalShear;
-}
-
-/*!
-    \since 4.6
+    if (!transformData)
+        transformData = new QGraphicsItemPrivate::TransformData;
+    if (!transformData->graphicsTransforms.contains(t))
+        transformData->graphicsTransforms.append(t);
 
-    Sets the vertical shear to \a shear.
-
-    \warning The value doesn't take in account any shearing set with the setTransform() method.
-
-    \sa verticalShear(), {Transformations}
-*/
-void QGraphicsItem::setVerticalShear(qreal shear)
-{
-    prepareGeometryChange();
-    if (!d_ptr->transformData)
-        d_ptr->transformData = new QGraphicsItemPrivate::TransformData;
-    d_ptr->transformData->verticalShear = shear;
-    d_ptr->transformData->onlyTransform = false;
-    d_ptr->dirtySceneTransform = 1;
-}
-
-/*!
-    \since 4.6
-
-    This convenience function sets the horizontal shear to \a sh and the vertical shear to \a sv.
-
-    \warning The value doesn't take in account any shearing set with the setTransform() method.
-
-    \sa setHorizontalShear(), setVerticalShear()
-*/
-void QGraphicsItem::setShear(qreal sh, qreal sv)
-{
-    prepareGeometryChange();
-    if (!d_ptr->transformData)
-        d_ptr->transformData = new QGraphicsItemPrivate::TransformData;
-    d_ptr->transformData->horizontalShear = sh;
-    d_ptr->transformData->verticalShear = sv;
-    d_ptr->transformData->onlyTransform = false;
-    d_ptr->dirtySceneTransform = 1;
+    Q_Q(QGraphicsItem);
+    t->d_func()->setItem(q);
+    transformData->onlyTransform = false;
+    dirtySceneTransform = 1;
 }
 
 /*!
@@ -3207,9 +3122,9 @@ void QGraphicsItem::setShear(qreal sh, qreal sv)
 
     The default is QPointF(0,0).
 
-    \sa setTransformOrigin(), {Transformations}
+    \sa setTransformOriginPoint(), {Transformations}
 */
-QPointF QGraphicsItem::transformOrigin() const
+QPointF QGraphicsItem::transformOriginPoint() const
 {
     if (!d_ptr->transformData)
         return QPointF(0,0);
@@ -3221,9 +3136,9 @@ QPointF QGraphicsItem::transformOrigin() const
 
     Sets the \a origin point for the transformation in item coordinates.
 
-    \sa transformOrigin(), {Transformations}
+    \sa transformOriginPoint(), {Transformations}
 */
-void QGraphicsItem::setTransformOrigin(const QPointF &origin)
+void QGraphicsItem::setTransformOriginPoint(const QPointF &origin)
 {
     prepareGeometryChange();
     if (!d_ptr->transformData)
@@ -3235,15 +3150,15 @@ void QGraphicsItem::setTransformOrigin(const QPointF &origin)
 }
 
 /*!
-    \fn void QGraphicsItem::setTransformOrigin(qreal x, qreal y)
+    \fn void QGraphicsItem::setTransformOriginPoint(qreal x, qreal y)
 
     \since 4.6
     \overload
 
     Sets the origin point for the transformation in item coordinates.
-    This is equivalent to calling setTransformOrigin(QPointF(\a x, \a y)).
+    This is equivalent to calling setTransformOriginPoint(QPointF(\a x, \a y)).
 
-    \sa setTransformOrigin(), {Transformations}
+    \sa setTransformOriginPoint(), {Transformations}
 */
 
 
@@ -3522,7 +3437,7 @@ void QGraphicsItem::setMatrix(const QMatrix &matrix, bool combine)
 
     \warning using this function doesnt affect the value of the transformation properties
 
-    \sa transform(), setRotation(), setScale(), setShear(), setTransformOrigin(), {The Graphics View Coordinate System}, {Transformations}
+    \sa transform(), setRotation(), setScale(), setTransformOriginPoint(), {The Graphics View Coordinate System}, {Transformations}
 */
 void QGraphicsItem::setTransform(const QTransform &matrix, bool combine)
 {
@@ -3636,7 +3551,7 @@ void QGraphicsItem::shear(qreal sh, qreal sv)
 
 /*!
     \obsolete
-    Use setPos() or setTransformOrigin() instead.
+    Use setPos() or setTransformOriginPoint() instead.
 
     Translates the current item transformation by (\a dx, \a dy).
 
@@ -4625,6 +4540,34 @@ void QGraphicsItemPrivate::ensureSceneTransform()
 
 /*!
     \internal
+*/
+void QGraphicsItemPrivate::setSubFocus()
+{
+    // Update focus child chain.
+    QGraphicsItem *item = q_ptr;
+    QGraphicsItem *parent = item;
+    bool hidden = !visible;
+    do {
+        parent->d_func()->subFocusItem = item;
+    } while (!parent->isWindow() && (parent = parent->d_ptr->parent) && (!hidden || !parent->d_func()->visible));
+}
+
+/*!
+    \internal
+*/
+void QGraphicsItemPrivate::clearSubFocus()
+{
+    // Reset focus child chain.
+    QGraphicsItem *parent = q_ptr;
+    do {
+        if (parent->d_ptr->subFocusItem != q_ptr)
+            break;
+        parent->d_ptr->subFocusItem = 0;
+    } while (!parent->isWindow() && (parent = parent->d_ptr->parent));
+}
+
+/*!
+    \internal
 
     Tells us if it is a proxy widget
 */
@@ -5990,7 +5933,7 @@ void QGraphicsItem::dropEvent(QGraphicsSceneDragDropEvent *event)
     focus in events for this item. The default implementation calls
     ensureVisible().
 
-    \sa focusOutEvent(), sceneEvent()
+    \sa focusOutEvent(), sceneEvent(), setFocus()
 */
 void QGraphicsItem::focusInEvent(QFocusEvent *event)
 {
@@ -6001,7 +5944,7 @@ void QGraphicsItem::focusInEvent(QFocusEvent *event)
     This event handler, for event \a event, can be reimplemented to receive
     focus out events for this item. The default implementation does nothing.
 
-    \sa focusInEvent(), sceneEvent()
+    \sa focusInEvent(), sceneEvent(), setFocus()
 */
 void QGraphicsItem::focusOutEvent(QFocusEvent *event)
 {
@@ -6739,6 +6682,41 @@ QGraphicsObject::QGraphicsObject(QGraphicsItemPrivate &dd, QGraphicsItem *parent
   \sa pos()
 */
 
+/*!
+  \property QGraphicsObject::rotation
+  This property holds the rotation of the item in degrees.
+
+  This specifies how many degrees to rotate the item around its transformOrigin.
+  The default rotation is 0 degrees (i.e. not rotated at all).
+*/
+
+/*!
+  \fn QGraphicsObject::rotationChanged()
+
+  This signal gets emitted whenever the roation of the item changes.
+*/
+
+/*!
+  \property QGraphicsObject::scale
+  This property holds the scale of the item.
+
+  A scale of less than 1 means the item will be displayed smaller than
+  normal, and a scale of greater than 1 means the item will be
+  displayed larger than normal.  A negative scale means the item will
+  be mirrored.
+
+  By default, items are displayed at a scale of 1 (i.e. at their
+  normal size).
+
+  Scaling is from the item's transformOrigin.
+*/
+
+/*!
+  \fn void QGraphicsObject::scaleChanged()
+
+  This signal is emitted when the scale of the item changes.
+*/
+
 
 /*!
   \property QGraphicsObject::enabled
@@ -6778,6 +6756,15 @@ QGraphicsObject::QGraphicsObject(QGraphicsItemPrivate &dd, QGraphicsItem *parent
   \sa visible
 */
 
+/*!
+  \property QGraphicsObject::transformOriginPoint
+  \brief the transformation origin
+
+  This property sets a specific point in the items coordiante system as the
+  origin for scale and rotation.
+
+  \sa scale, rotation, QGraphicsItem::transformOriginPoint()
+*/
 
 
 /*!
@@ -9661,13 +9648,10 @@ QVariant QGraphicsSimpleTextItem::extension(const QVariant &variant) const
     setParentItem().
 
     The boundingRect() function of QGraphicsItemGroup returns the
-    bounding rectangle of all items in the item group. In addition,
-    item groups have handlesChildEvents() enabled by default, so all
-    events sent to a member of the group go to the item group (i.e.,
-    selecting one item in a group will select them all).
-    QGraphicsItemGroup ignores the ItemIgnoresTransformations flag on its
-    children (i.e., with respect to the geometry of the group item, the
-    children are treated as if they were transformable).
+    bounding rectangle of all items in the item group.
+    QGraphicsItemGroup ignores the ItemIgnoresTransformations flag on
+    its children (i.e., with respect to the geometry of the group
+    item, the children are treated as if they were transformable).
 
     There are two ways to construct an item group. The easiest and
     most common approach is to pass a list of items (e.g., all
@@ -9998,6 +9982,9 @@ QDebug operator<<(QDebug debug, QGraphicsItem::GraphicsItemFlag flag)
     case QGraphicsItem::ItemAcceptsInputMethod:
         str = "ItemAcceptsInputMethod";
         break;
+    case QGraphicsItem::ItemAutoDetectsFocusProxy:
+        str = "ItemAutoDetectsFocusProxy";
+        break;
     }
     debug << str;
     return debug;
diff --git a/src/gui/graphicsview/qgraphicsitem.h b/src/gui/graphicsview/qgraphicsitem.h
index ba7b5ef..c6bd0cd 100644
--- a/src/gui/graphicsview/qgraphicsitem.h
+++ b/src/gui/graphicsview/qgraphicsitem.h
@@ -72,6 +72,7 @@ class QGraphicsSceneHoverEvent;
 class QGraphicsSceneMouseEvent;
 class QGraphicsSceneWheelEvent;
 class QGraphicsScene;
+class QGraphicsTransform;
 class QGraphicsWidget;
 class QInputMethodEvent;
 class QKeyEvent;
@@ -101,7 +102,8 @@ public:
         ItemHasNoContents = 0x400,
         ItemSendsGeometryChanges = 0x800,
         ItemAcceptsInputMethod = 0x1000,
-        ItemNegativeZStacksBehindParent = 0x2000
+        ItemNegativeZStacksBehindParent = 0x2000,
+        ItemAutoDetectsFocusProxy = 0x4000
         // NB! Don't forget to increase the d_ptr->flags bit field by 1 when adding a new flag.
     };
     Q_DECLARE_FLAGS(GraphicsItemFlags, GraphicsItemFlag)
@@ -228,6 +230,11 @@ public:
     void setFocus(Qt::FocusReason focusReason = Qt::OtherFocusReason);
     void clearFocus();
 
+    QGraphicsItem *focusProxy() const;
+    void setFocusProxy(QGraphicsItem *item);
+
+    QGraphicsItem *focusItem() const;
+
     void grabMouse();
     void ungrabMouse();
     void grabKeyboard();
@@ -264,34 +271,19 @@ public:
     void shear(qreal sh, qreal sv);     // ### obsolete
     void translate(qreal dx, qreal dy); // ### obsolete
 
-    qreal xRotation() const;
-    void setXRotation(qreal angle);
-
-    qreal yRotation() const;
-    void setYRotation(qreal angle);
-
-    qreal zRotation() const;
-    void setZRotation(qreal angle);
-    void setRotation(qreal x, qreal y, qreal z);
-
-    qreal xScale() const;
-    void setXScale(qreal factor);
-
-    qreal yScale() const;
-    void setYScale(qreal factor);
-    void setScale(qreal sx, qreal sy);
+    void setRotation(qreal angle);
+    qreal rotation() const;
 
-    qreal horizontalShear() const;
-    void setHorizontalShear(qreal shear);
+    void setScale(qreal scale);
+    qreal scale() const;
 
-    qreal verticalShear() const;
-    void setVerticalShear(qreal shear);
-    void setShear(qreal sh, qreal sv);
+    QList<QGraphicsTransform *> transformations() const;
+    void setTransformations(const QList<QGraphicsTransform *> &transformations);
 
-    QPointF transformOrigin() const;
-    void setTransformOrigin(const QPointF &origin);
-    inline void setTransformOrigin(qreal x, qreal y)
-    { setTransformOrigin(QPointF(x,y)); }
+    QPointF transformOriginPoint() const;
+    void setTransformOriginPoint(const QPointF &origin);
+    inline void setTransformOriginPoint(qreal x, qreal y)
+    { setTransformOriginPoint(QPointF(x,y)); }
 
     virtual void advance(int phase);
 
@@ -452,6 +444,7 @@ private:
     friend class QGraphicsSceneIndexPrivate;
     friend class QGraphicsSceneBspTreeIndex;
     friend class QGraphicsSceneBspTreeIndexPrivate;
+    friend class QGraphicsTransformPrivate;
     friend class ::tst_QGraphicsItem;
     friend bool qt_closestLeaf(const QGraphicsItem *, const QGraphicsItem *);
     friend bool qt_closestItemFirst(const QGraphicsItem *, const QGraphicsItem *);
@@ -518,6 +511,9 @@ class Q_GUI_EXPORT QGraphicsObject : public QObject, public QGraphicsItem
     Q_PROPERTY(qreal x READ x WRITE setX NOTIFY xChanged)
     Q_PROPERTY(qreal y READ y WRITE setY NOTIFY yChanged)
     Q_PROPERTY(qreal z READ zValue WRITE setZValue NOTIFY zChanged)
+    Q_PROPERTY(qreal rotation READ rotation WRITE setRotation NOTIFY rotationChanged)
+    Q_PROPERTY(qreal scale READ scale WRITE setScale NOTIFY scaleChanged)
+    Q_PROPERTY(QPointF transformOriginPoint READ transformOriginPoint WRITE setTransformOriginPoint)
 public:
     QGraphicsObject(QGraphicsItem *parent = 0);
 
@@ -529,6 +525,8 @@ Q_SIGNALS:
     void xChanged();
     void yChanged();
     void zChanged();
+    void rotationChanged();
+    void scaleChanged();
 
 protected:
     QGraphicsObject(QGraphicsItemPrivate &dd, QGraphicsItem *parent, QGraphicsScene *scene);
diff --git a/src/gui/graphicsview/qgraphicsitem_p.h b/src/gui/graphicsview/qgraphicsitem_p.h
index ba24806..b07213b 100644
--- a/src/gui/graphicsview/qgraphicsitem_p.h
+++ b/src/gui/graphicsview/qgraphicsitem_p.h
@@ -56,6 +56,9 @@
 #include "qgraphicsitem.h"
 #include "qset.h"
 #include "qpixmapcache.h"
+#include "qgraphicsview_p.h"
+#include "qgraphicstransform.h"
+#include "qgraphicstransform_p.h"
 
 #include <QtCore/qpoint.h>
 
@@ -121,6 +124,8 @@ public:
         index(-1),
         siblingIndex(-1),
         depth(0),
+        focusProxy(0),
+        subFocusItem(0),
         acceptedMouseButtons(0x1f),
         visible(1),
         explicitlyHidden(0),
@@ -159,9 +164,6 @@ public:
         acceptedTouchBeginEvent(0),
         filtersDescendantEvents(0),
         sceneTransformTranslateOnly(0),
-        isFocusRealm(0),
-        isFocusItemForArea(0),
-        hasActiveFocus(0),
         mouseSetsFocus(1),
         globalStackingOrder(-1),
         q_ptr(0)
@@ -193,7 +195,7 @@ public:
 
     void combineTransformToParent(QTransform *x, const QTransform *viewTransform = 0) const;
     void combineTransformFromParent(QTransform *x, const QTransform *viewTransform = 0) const;
-    void updateSceneTransformFromParent();
+    virtual void updateSceneTransformFromParent();
 
     // ### Qt 5: Remove. Workaround for reimplementation added after Qt 4.4.
     virtual QVariant inputMethodQueryHelper(Qt::InputMethodQuery query) const;
@@ -201,6 +203,7 @@ public:
 
     virtual void setPosHelper(const QPointF &pos);
     void setTransformHelper(const QTransform &transform);
+    void appendGraphicsTransform(QGraphicsTransform *t);
     void setVisibleHelper(bool newVisible, bool explicitly, bool update = true);
     void setEnabledHelper(bool newEnabled, bool explicitly, bool update = true);
     bool discardUpdateRequest(bool ignoreClipping = false, bool ignoreVisibleBit = false,
@@ -393,17 +396,12 @@ public:
                || (childrenCombineOpacity() && isFullyTransparent());
     }
 
+    void setSubFocus();
+    void clearSubFocus();
+
     inline QTransform transformToParent() const;
     inline void ensureSortedChildren();
 
-    virtual void setActiveFocus(bool b) {
-        hasActiveFocus = b;
-    }
-
-    virtual void setFocusItemForArea(bool b) {
-        isFocusItemForArea = b;
-    }
-
     QPainterPath cachedClipPath;
     QRectF childrenBoundingRect;
     QRectF needsRepaint;
@@ -420,6 +418,8 @@ public:
     int index;
     int siblingIndex;
     int depth;
+    QGraphicsItem *focusProxy;
+    QGraphicsItem *subFocusItem;
 
     // Packed 32 bytes
     quint32 acceptedMouseButtons : 5;
@@ -449,7 +449,7 @@ public:
 
     // New 32 bits
     quint32 fullUpdatePending : 1;
-    quint32 flags : 14;
+    quint32 flags : 15;
     quint32 dirtyChildrenBoundingRect : 1;
     quint32 paintedViewBoundingRectsNeedRepaint : 1;
     quint32 dirtySceneTransform : 1;
@@ -462,11 +462,8 @@ public:
     quint32 acceptedTouchBeginEvent : 1;
     quint32 filtersDescendantEvents : 1;
     quint32 sceneTransformTranslateOnly : 1;
-    quint32 isFocusRealm : 1;
-    quint32 isFocusItemForArea : 1;
-    quint32 hasActiveFocus : 1;
     quint32 mouseSetsFocus : 1;
-    quint32 unused : 1; // feel free to use
+    quint32 unused : 4; // feel free to use
 
     // Optional stacking order
     int globalStackingOrder;
@@ -475,45 +472,35 @@ public:
 
 struct QGraphicsItemPrivate::TransformData {
     QTransform transform;
-    qreal xScale;
-    qreal yScale;
-    qreal xRotation;
-    qreal yRotation;
-    qreal zRotation;
-    qreal horizontalShear;
-    qreal verticalShear;
+    qreal scale;
+    qreal rotation;
     qreal xOrigin;
     qreal yOrigin;
+    QList<QGraphicsTransform *> graphicsTransforms;
     bool onlyTransform;
 
     TransformData() :
-        xScale(1.0), yScale(1.0), xRotation(0.0), yRotation(0.0), zRotation(0.0),
-        horizontalShear(0.0), verticalShear(0.0), xOrigin(0.0), yOrigin(0.0),
+        scale(1.0), rotation(0.0),
+        xOrigin(0.0), yOrigin(0.0),
         onlyTransform(true)
     {}
 
     QTransform computedFullTransform(QTransform *postmultiplyTransform = 0) const
     {
         if (onlyTransform) {
-            if (!postmultiplyTransform)
-                return transform;
-            if (postmultiplyTransform->isIdentity())
+            if (!postmultiplyTransform || postmultiplyTransform->isIdentity())
                 return transform;
             if (transform.isIdentity())
                 return *postmultiplyTransform;
-            QTransform x(transform);
-            x *= *postmultiplyTransform;
-            return x;
+            return transform * *postmultiplyTransform;
         }
 
         QTransform x(transform);
-        if (xOrigin != 0 || yOrigin != 0)
-            x *= QTransform::fromTranslate(xOrigin, yOrigin);
-        x.rotate(xRotation, Qt::XAxis);
-        x.rotate(yRotation, Qt::YAxis);
-        x.rotate(zRotation, Qt::ZAxis);
-        x.shear(horizontalShear, verticalShear);
-        x.scale(xScale, yScale);
+        for (int i = 0; i < graphicsTransforms.size(); ++i)
+            graphicsTransforms.at(i)->applyTo(&x);
+        x.translate(xOrigin, yOrigin);
+        x.rotate(rotation, Qt::ZAxis);
+        x.scale(scale, scale);
         x.translate(-xOrigin, -yOrigin);
         if (postmultiplyTransform)
             x *= *postmultiplyTransform;
diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp
index 8eb21a3..9d8781b 100644
--- a/src/gui/graphicsview/qgraphicsscene.cpp
+++ b/src/gui/graphicsview/qgraphicsscene.cpp
@@ -484,6 +484,8 @@ void QGraphicsScenePrivate::removeItemHelper(QGraphicsItem *item)
         index->removeItem(item);
     }
 
+    item->d_ptr->clearSubFocus();
+
     if (!item->d_ptr->inDestructor && item == tabFocusFirst) {
         QGraphicsWidget *widget = static_cast<QGraphicsWidget *>(item);
         widget->d_func()->fixFocusChainBeforeReparenting(0, 0);
@@ -491,6 +493,13 @@ void QGraphicsScenePrivate::removeItemHelper(QGraphicsItem *item)
 
     item->d_func()->scene = 0;
 
+    // Unregister focus proxy.
+    QMultiHash<QGraphicsItem *, QGraphicsItem *>::iterator it = focusProxyReverseMap.find(item);
+    while (it != focusProxyReverseMap.end() && it.key() == item) {
+        it.value()->d_ptr->focusProxy = 0;
+        it = focusProxyReverseMap.erase(it);
+    }
+
     // Remove from parent, or unregister from toplevels.
     if (QGraphicsItem *parentItem = item->parentItem()) {
         if (parentItem->scene()) {
@@ -559,6 +568,70 @@ void QGraphicsScenePrivate::removeItemHelper(QGraphicsItem *item)
 /*!
     \internal
 */
+void QGraphicsScenePrivate::setFocusItemHelper(QGraphicsItem *item,
+                                               Qt::FocusReason focusReason)
+{
+    Q_Q(QGraphicsScene);
+    if (item == focusItem)
+        return;
+
+    // Clear focus if asked to set focus on something that can't
+    // accept input focus.
+    if (item && (!(item->flags() & QGraphicsItem::ItemIsFocusable)
+                 || !item->isVisible() || !item->isEnabled())) {
+        item = 0;
+    }
+
+    // Set focus on the scene if an item requests focus.
+    if (item) {
+        q->setFocus(focusReason);
+        if (item == focusItem)
+            return;
+    }
+
+    // Auto-update focus proxy. The closest parent that detects
+    // focus proxies is updated as the proxy gains or loses focus.
+    if (item) {
+        QGraphicsItem *p = item->d_ptr->parent;
+        while (p) {
+            if (p->d_ptr->flags & QGraphicsItem::ItemAutoDetectsFocusProxy) {
+                p->setFocusProxy(item);
+                break;
+            }
+            p = p->d_ptr->parent;
+        }
+    }
+
+    if (focusItem) {
+        QFocusEvent event(QEvent::FocusOut, focusReason);
+        lastFocusItem = focusItem;
+        focusItem = 0;
+        sendEvent(lastFocusItem, &event);
+
+        if (lastFocusItem
+            && (lastFocusItem->flags() & QGraphicsItem::ItemAcceptsInputMethod)) {
+            // Reset any visible preedit text
+            QInputMethodEvent imEvent;
+            sendEvent(lastFocusItem, &imEvent);
+
+            // Close any external input method panel
+            for (int i = 0; i < views.size(); ++i)
+                views.at(i)->inputContext()->reset();
+        }
+    }
+
+    if (item) {
+        focusItem = item;
+        QFocusEvent event(QEvent::FocusIn, focusReason);
+        sendEvent(item, &event);
+    }
+
+    updateInputMethodSensitivityInViews();
+}
+
+/*!
+    \internal
+*/
 void QGraphicsScenePrivate::addPopup(QGraphicsWidget *widget)
 {
     Q_ASSERT(widget);
@@ -2283,6 +2356,11 @@ void QGraphicsScene::addItem(QGraphicsItem *item)
     // Deliver post-change notification
     item->itemChange(QGraphicsItem::ItemSceneHasChanged, newSceneVariant);
 
+    // Ensure that newly added items that have subfocus set, gain
+    // focus automatically if there isn't a focus item already.
+    if (!d->focusItem && item->focusItem())
+        item->focusItem()->setFocus();
+
     d->updateInputMethodSensitivityInViews();
 }
 
@@ -2612,116 +2690,10 @@ QGraphicsItem *QGraphicsScene::focusItem(QGraphicsItem *item) const
 void QGraphicsScene::setFocusItem(QGraphicsItem *item, Qt::FocusReason focusReason)
 {
     Q_D(QGraphicsScene);
-    if (item == d->focusItem)
-        return;
-    if (item && (!(item->flags() & QGraphicsItem::ItemIsFocusable)
-                 || !item->isVisible() || !item->isEnabled())) {
-        item = 0;
-    }
-
-    QGraphicsItem *oldFocus = d->focusItem;
-    bool isActive = true;
-    if (item) {
-        setFocus(focusReason);
-        if (item == d->focusItem)
-            return;
-
-        //focus area handling
-        {
-            //determine the focus area the item belongs to
-            QGraphicsItem *scope = 0;
-            QGraphicsItem *citem = item;
-            while(citem && !scope) {
-                if (citem != item && citem->d_ptr->isFocusRealm)
-                    scope = citem;
-                citem = citem->parentItem();
-            }
-
-            //if it has a focus area, set the item as the focusitem for that area
-            if (scope) {
-                QGraphicsItem *oldFFA = d->focusItemForFocusArea.value(scope);
-                if (!scope->d_ptr->hasActiveFocus && oldFFA) {    //active case is handled by d->focusItem below???
-                    oldFFA->d_ptr->setFocusItemForArea(false);
-                }
-                if (oldFFA)
-                    oldFocus = oldFFA;
-                isActive = scope->d_ptr->hasActiveFocus ? true : false;
-                d->focusItemForFocusArea.insert(scope, item);
-            }
-        }
-    }
-
-    if (oldFocus) {
-        QFocusEvent event(QEvent::FocusOut, focusReason);
-        if (isActive) {
-            d->lastFocusItem = oldFocus;
-            d->focusItem = 0;
-        }
-
-        //focus area handling
-        if (!oldFocus->d_ptr->inDestructor)
-            oldFocus->d_ptr->setFocusItemForArea(false);
-
-        if (isActive) {
-            //focus area handling
-            while(true) {
-                if (!oldFocus->d_ptr->inDestructor)
-                    oldFocus->d_ptr->setActiveFocus(false);
-                if (oldFocus->d_ptr->isFocusRealm) {
-                    QGraphicsItem *citem = d->focusItemForFocusArea.value(oldFocus);
-                    if (citem)
-                        oldFocus = citem;
-                    else
-                        break;
-                } else
-                    break;
-            }
-
-            d->sendEvent(oldFocus, &event);
-
-            if (oldFocus
-                && (oldFocus->flags() & QGraphicsItem::ItemAcceptsInputMethod)) {
-                // Reset any visible preedit text
-                QInputMethodEvent imEvent;
-                d->sendEvent(oldFocus, &imEvent);
-
-                // Close any external input method panel
-                for (int i = 0; i < d->views.size(); ++i)
-                    d->views.at(i)->inputContext()->reset();
-            }
-        }
-    }
-
-    if (item) {
-        if (item->isWidget()) {
-            // Update focus child chain.
-            static_cast<QGraphicsWidget *>(item)->d_func()->setFocusWidget();
-        }
-
-        //focus area handling
-        item->d_ptr->setFocusItemForArea(true);
-
-        if (isActive) {
-            //focus area handling
-            while(true) {
-                item->d_ptr->setActiveFocus(true);
-                if (item->d_ptr->isFocusRealm) {
-                    QGraphicsItem *citem = d->focusItemForFocusArea.value(item);
-                    if (citem)
-                        item = citem;
-                    else
-                        break;
-                } else
-                    break;
-            }
-
-            d->focusItem = item;
-            QFocusEvent event(QEvent::FocusIn, focusReason);
-            d->sendEvent(item, &event);
-        }
-    }
-
-    d->updateInputMethodSensitivityInViews();
+    if (item)
+        item->setFocus(focusReason);
+    else
+        d->setFocusItemHelper(item, focusReason);
 }
 
 /*!
@@ -3519,7 +3491,7 @@ void QGraphicsScene::helpEvent(QGraphicsSceneHelpEvent *helpEvent)
         text = toolTipItem->toolTip();
         point = helpEvent->screenPos();
     }
-    QToolTip::showText(point, text);
+    QToolTip::showText(point, text, helpEvent->widget());
     helpEvent->setAccepted(!text.isEmpty());
 #endif
 }
@@ -3618,8 +3590,7 @@ void QGraphicsScenePrivate::leaveScene()
 {
     Q_Q(QGraphicsScene);
 #ifndef QT_NO_TOOLTIP
-    // Remove any tooltips
-    QToolTip::showText(QPoint(), QString());
+    QToolTip::hideText();
 #endif
     // Send HoverLeave events to all existing hover items, topmost first.
     QGraphicsView *senderWidget = qobject_cast<QGraphicsView *>(q->sender());
@@ -4761,7 +4732,7 @@ void QGraphicsScenePrivate::processDirtyItemsRecursive(QGraphicsItem *item, bool
     background has been drawn, and before the foreground has been
     drawn.  All painting is done in \e scene coordinates. Before
     drawing each item, the painter must be transformed using
-    QGraphicsItem::sceneMatrix().
+    QGraphicsItem::sceneTransform().
 
     The \a options parameter is the list of style option objects for
     each item in \a items. The \a numItems parameter is the number of
diff --git a/src/gui/graphicsview/qgraphicsscene_p.h b/src/gui/graphicsview/qgraphicsscene_p.h
index fc8fa2b..a93f342 100644
--- a/src/gui/graphicsview/qgraphicsscene_p.h
+++ b/src/gui/graphicsview/qgraphicsscene_p.h
@@ -131,6 +131,8 @@ public:
     QGraphicsWidget *tabFocusFirst;
     QGraphicsWidget *activeWindow;
     int activationRefCount;
+    void setFocusItemHelper(QGraphicsItem *item, Qt::FocusReason focusReason);
+    QMultiHash<QGraphicsItem *, QGraphicsItem *> focusProxyReverseMap;
 
     QList<QGraphicsWidget *> popupWidgets;
     void addPopup(QGraphicsWidget *widget);
diff --git a/src/gui/graphicsview/qgraphicssceneevent.cpp b/src/gui/graphicsview/qgraphicssceneevent.cpp
index 53019f2..92af0cc 100644
--- a/src/gui/graphicsview/qgraphicssceneevent.cpp
+++ b/src/gui/graphicsview/qgraphicssceneevent.cpp
@@ -1476,7 +1476,7 @@ void QGraphicsSceneDragDropEvent::acceptProposedAction()
 /*!
     Returns the action that was performed in this drag and drop.
     This should be set by the receiver of the drop and is
-    returned by QDrag::start().
+    returned by QDrag::exec().
 
     \sa setDropAction(), acceptProposedAction()
 */
diff --git a/src/gui/graphicsview/qgraphicstransform.cpp b/src/gui/graphicsview/qgraphicstransform.cpp
new file mode 100644
index 0000000..b55d78e
--- /dev/null
+++ b/src/gui/graphicsview/qgraphicstransform.cpp
@@ -0,0 +1,479 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qgraphicstransform.h"
+#include "qgraphicsitem_p.h"
+#include "qgraphicstransform_p.h"
+#include <QDebug>
+
+#include <math.h>
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
+
+QT_BEGIN_NAMESPACE
+
+
+void QGraphicsTransformPrivate::setItem(QGraphicsItem *i)
+{
+    if (item == i)
+        return;
+
+    if (item) {
+        Q_Q(QGraphicsTransform);
+        QGraphicsItemPrivate *d_ptr = item->d_ptr;
+
+        item->prepareGeometryChange();
+        Q_ASSERT(d_ptr->transformData);
+        d_ptr->transformData->graphicsTransforms.removeAll(q);
+        d_ptr->dirtySceneTransform = 1;
+        item = 0;
+    }
+
+    item = i;
+}
+
+void QGraphicsTransformPrivate::updateItem(QGraphicsItem *item)
+{
+    item->prepareGeometryChange();
+    item->d_ptr->dirtySceneTransform = 1;
+}
+
+void QGraphicsTransform::update()
+{
+    Q_D(QGraphicsTransform);
+    if (d->item)
+        d->updateItem(d->item);
+}
+
+/*!
+  returns this object as a QTransform.
+*/
+QTransform QGraphicsTransform::transform() const
+{
+    QTransform t;
+    applyTo(&t);
+    return t;
+}
+
+/*!
+  \class QGraphicsTransform
+  \brief The QGraphicsTransform class is an abstract base class for tranformations on QGraphicsItems.
+  \since 4.6
+
+  The classes that inherit QGraphicsTransform express different types of transformations
+  that can be applied to graphics items.
+
+  A list of these transformations can be applied to any graphics item. These
+  transformations are then easily modifyable and usable from e.g. within animations.
+
+  QGraphicsTransform is an abstract base class that is implemented by QGraphicsScale,
+  QGraphicsRotation and QGraphicsRotation3D. Subclasses have to implement the applyTo method.
+
+  \sa QGraphicsItem::transform(), QGraphicsScale, QGraphicsRotation, QGraphicsRotation3D
+*/
+
+/*!
+  Constructs a new QGraphicsTransform with \a parent.
+*/
+QGraphicsTransform::QGraphicsTransform(QObject *parent) :
+    QObject(*new QGraphicsTransformPrivate, parent)
+{
+}
+
+/*!
+  Destructs the graphics transform.
+*/
+QGraphicsTransform::~QGraphicsTransform()
+{
+    Q_D(QGraphicsTransform);
+    d->setItem(0);
+}
+
+/*!
+  \internal
+*/
+QGraphicsTransform::QGraphicsTransform(QGraphicsTransformPrivate &p, QObject *parent)
+    : QObject(p, parent)
+{
+}
+
+/*! \fn void QGraphicsTransform::applyTo(QTransform *transform) const
+
+  This pure virtual method has to be reimplemented in derived classes.
+
+  It applies this transformation to \a transform.
+*/
+
+
+/*!
+  \class QGraphicsScale
+  \brief The QGraphicsScale class provides a way to scale a graphics item in 2 dimensions.
+  \since 4.6
+
+  QGraphicsScale contains an \a origin around which the scaling happens, and two
+  scale factors, xScale and yScale, the x and one for the y axis.
+*/
+
+class QGraphicsScalePrivate : public QGraphicsTransformPrivate
+{
+public:
+    QGraphicsScalePrivate()
+            : xScale(1), yScale(1) {}
+    QPointF origin;
+    qreal xScale;
+    qreal yScale;
+};
+
+/*!
+  Constructs a new graphics scale object with \a parent.
+*/
+QGraphicsScale::QGraphicsScale(QObject *parent)
+    : QGraphicsTransform(*new QGraphicsScalePrivate, parent)
+{
+}
+
+/*!
+  Destroys the object
+*/
+QGraphicsScale::~QGraphicsScale()
+{
+}
+
+/*!
+  \property QGraphicsScale::origin
+  The origin of the scale. All scaling will be done relative to this point.
+
+  The \a origin is in other words the fixed point for the transformation.
+*/
+QPointF QGraphicsScale::origin() const
+{
+    Q_D(const QGraphicsScale);
+    return d->origin;
+}
+
+void QGraphicsScale::setOrigin(const QPointF &point)
+{
+    Q_D(QGraphicsScale);
+    d->origin = point;
+    update();
+    emit originChanged();
+}
+
+/*!
+  \fn QGraphicsScale::originChanged()
+
+  This signal is emitted whenever the origin of the object
+  changes.
+*/
+
+/*!
+  \property QGraphicsScale::xScale
+
+  The scale factor in x direction. The x direction is
+  in the graphics items logical coordinates.
+
+  \sa yScale
+*/
+qreal QGraphicsScale::xScale() const
+{
+    Q_D(const QGraphicsScale);
+    return d->xScale;
+}
+
+void QGraphicsScale::setXScale(qreal scale)
+{
+    Q_D(QGraphicsScale);
+    if (d->xScale == scale)
+        return;
+    d->xScale = scale;
+    update();
+    emit scaleChanged();
+}
+
+/*!
+  \property QGraphicsScale::yScale
+
+  The scale factor in y direction. The y direction is
+  in the graphics items logical coordinates.
+
+  \sa xScale
+*/
+qreal QGraphicsScale::yScale() const
+{
+    Q_D(const QGraphicsScale);
+    return d->yScale;
+}
+
+void QGraphicsScale::setYScale(qreal scale)
+{
+    Q_D(QGraphicsScale);
+    if (d->yScale == scale)
+        return;
+    d->yScale = scale;
+    update();
+    emit scaleChanged();
+}
+
+/*!
+  \fn QGraphicsScale::scaleChanged()
+
+  This signal is emitted whenever the xScale or yScale of the object
+  changes.
+*/
+
+/*!
+  \reimp
+*/
+void QGraphicsScale::applyTo(QTransform *transform) const
+{
+    Q_D(const QGraphicsScale);
+    transform->translate(d->origin.x(), d->origin.y());
+    transform->scale(d->xScale, d->yScale);
+    transform->translate(-d->origin.x(), -d->origin.y());
+}
+
+/*!
+  \class QGraphicsRotation
+  \brief The QGraphicsRotation class provides a way to rotate a graphics item in 2 dimensions.
+  \since 4.6
+
+  QGraphicsRotation contains an \a origin around which the rotation happens, and one
+  angle in degrees describing the amount of the rotation.
+*/
+
+class QGraphicsRotationPrivate : public QGraphicsTransformPrivate
+{
+public:
+    QGraphicsRotationPrivate()
+            : angle(0) {}
+    QPointF origin;
+    qreal originY;
+    qreal angle;
+};
+
+/*!
+  Constructs a new graphics rotation with \a parent.
+*/
+QGraphicsRotation::QGraphicsRotation(QObject *parent)
+    : QGraphicsTransform(*new QGraphicsRotationPrivate, parent)
+{
+}
+
+/*!
+  \internal
+*/
+QGraphicsRotation::QGraphicsRotation(QGraphicsRotationPrivate &p, QObject *parent)
+    : QGraphicsTransform(p, parent)
+{
+}
+
+/*!
+  Destructs the object
+*/
+QGraphicsRotation::~QGraphicsRotation()
+{
+}
+
+/*!
+  \property QGraphicsRotation::origin
+  The origin around which this object will rotate the graphics item.
+
+  The \a origin is in other words the fixed point for the transformation.
+*/
+QPointF QGraphicsRotation::origin() const
+{
+    Q_D(const QGraphicsRotation);
+    return d->origin;
+}
+
+void QGraphicsRotation::setOrigin(const QPointF &point)
+{
+    Q_D(QGraphicsRotation);
+    d->origin = point;
+    update();
+    emit originChanged();
+}
+
+/*!
+  \fn QGraphicsRotation::originChanged()
+
+  This signal is emitted whenever the origin of the object
+  changes.
+*/
+
+/*!
+  \property QGraphicsRotation::angle
+  The angle, in degrees, of the rotation.
+*/
+qreal QGraphicsRotation::angle() const
+{
+    Q_D(const QGraphicsRotation);
+    return d->angle;
+}
+
+void QGraphicsRotation::setAngle(qreal angle)
+{
+    Q_D(QGraphicsRotation);
+    if (d->angle == angle)
+        return;
+    d->angle = angle;
+    update();
+    emit angleChanged();
+}
+
+/*!
+  \fn void QGraphicsRotation::angleChanged()
+
+  This signal is emitted whenever the angle of the object
+  changes.
+*/
+
+/*!
+  \reimp
+*/
+void QGraphicsRotation::applyTo(QTransform *t) const
+{
+    Q_D(const QGraphicsRotation);
+    if(d->angle) {
+        t->translate(d->origin.x(), d->origin.y());
+        t->rotate(d->angle);
+        t->translate(-d->origin.x(), -d->origin.y());
+    }
+}
+
+
+/*!
+  \class QGraphicsRotation3D
+  \brief The QGraphicsRotation3D class provides a way to rotate a graphics item in 3 dimensions.
+  \since 4.6
+
+  In addition to the origin and angle of a simple QGraphicsRotation, QGraphicsRotation3D contains
+  also an axis that describes around which axis in space the rotation is supposed to happen.
+*/
+
+class QGraphicsRotation3DPrivate : public QGraphicsRotationPrivate
+{
+public:
+    QGraphicsRotation3DPrivate() {}
+
+    QVector3D axis;
+};
+
+/*!
+  Constructs a new 3D rotation with \a parent.
+*/
+QGraphicsRotation3D::QGraphicsRotation3D(QObject *parent)
+    : QGraphicsRotation(*new QGraphicsRotation3DPrivate, parent)
+{
+}
+
+/*!
+  Destroys the object
+*/
+QGraphicsRotation3D::~QGraphicsRotation3D()
+{
+}
+
+/*!
+    \property QGraphicsRotation3D::axis
+
+    A rotation axis is specified by a vector in 3D space.
+*/
+QVector3D QGraphicsRotation3D::axis()
+{
+    Q_D(QGraphicsRotation3D);
+    return d->axis;
+}
+
+void QGraphicsRotation3D::setAxis(const QVector3D &axis)
+{
+    Q_D(QGraphicsRotation3D);
+    d->axis = axis;
+    update();
+}
+
+/*!
+  \fn void QGraphicsRotation3D::axisChanged()
+
+  This signal is emitted whenever the axis of the object
+  changes.
+*/
+
+const qreal inv_dist_to_plane = 1. / 1024.;
+
+/*!
+  \reimp
+*/
+void QGraphicsRotation3D::applyTo(QTransform *t) const
+{
+    Q_D(const QGraphicsRotation3D);
+
+    if (d->angle == 0. ||
+        (d->axis.z() == 0. && d->axis.y() == 0 && d->axis.x() == 0))
+        return;
+
+    qreal rad = d->angle * 2. * M_PI / 360.;
+    qreal c = ::cos(rad);
+    qreal s = ::sin(rad);
+
+    qreal x = d->axis.x();
+    qreal y = d->axis.y();
+    qreal z = d->axis.z();
+
+    qreal len = x * x + y * y + z * z;
+    if (len != 1.) {
+        len = 1./::sqrt(len);
+        x *= len;
+        y *= len;
+        z *= len;
+    }
+
+    t->translate(d->origin.x(), d->origin.y());
+    *t = QTransform(x*x*(1-c)+c, x*y*(1-c)-z*s, x*z*(1-c)+y*s*inv_dist_to_plane,
+                             y*x*(1-c)+z*s, y*y*(1-c)+c, y*z*(1-c)-x*s*inv_dist_to_plane,
+                             0, 0, 1) * *t;
+    t->translate(-d->origin.x(), -d->origin.y());
+}
+
+#include "moc_qgraphicstransform.cpp"
+
+QT_END_NAMESPACE
diff --git a/src/gui/graphicsview/qgraphicstransform.h b/src/gui/graphicsview/qgraphicstransform.h
new file mode 100644
index 0000000..adf9438
--- /dev/null
+++ b/src/gui/graphicsview/qgraphicstransform.h
@@ -0,0 +1,168 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QGRAPHICSTRANSFORM_H
+#define QGRAPHICSTRANSFORM_H
+
+#include <QtCore/QObject>
+#include <QtGui/QTransform>
+#include <QtGui/QVector3D>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Gui)
+
+class QGraphicsItem;
+class QGraphicsTransformPrivate;
+
+class Q_GUI_EXPORT QGraphicsTransform : public QObject
+{
+    Q_OBJECT
+public:
+    QGraphicsTransform(QObject *parent = 0);
+    ~QGraphicsTransform();
+
+    QTransform transform() const;
+    virtual void applyTo(QTransform *transform) const = 0;
+
+protected slots:
+    void update();
+
+protected:
+    QGraphicsTransform(QGraphicsTransformPrivate &p, QObject *parent);
+private:
+    friend class QGraphicsItem;
+    friend class QGraphicsItemPrivate;
+    Q_DECLARE_PRIVATE(QGraphicsTransform)
+};
+
+class QGraphicsScalePrivate;
+
+class Q_GUI_EXPORT QGraphicsScale : public QGraphicsTransform
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QPointF origin READ origin WRITE setOrigin NOTIFY originChanged)
+    Q_PROPERTY(qreal xScale READ xScale WRITE setXScale NOTIFY scaleChanged)
+    Q_PROPERTY(qreal yScale READ yScale WRITE setYScale NOTIFY scaleChanged)
+public:
+    QGraphicsScale(QObject *parent = 0);
+    ~QGraphicsScale();
+
+    QPointF origin() const;
+    void setOrigin(const QPointF &point);
+
+    qreal xScale() const;
+    void setXScale(qreal);
+
+    qreal yScale() const;
+    void setYScale(qreal);
+
+    void applyTo(QTransform *transform) const;
+
+Q_SIGNALS:
+    void originChanged();
+    void scaleChanged();
+
+private:
+    Q_DECLARE_PRIVATE(QGraphicsScale)
+};
+
+class QGraphicsRotationPrivate;
+
+class Q_GUI_EXPORT QGraphicsRotation : public QGraphicsTransform
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QPointF origin READ origin WRITE setOrigin NOTIFY originChanged)
+    Q_PROPERTY(qreal angle READ angle WRITE setAngle NOTIFY angleChanged)
+public:
+    QGraphicsRotation(QObject *parent = 0);
+    ~QGraphicsRotation();
+
+    QPointF origin() const;
+    void setOrigin(const QPointF &point);
+
+    qreal angle() const;
+    void setAngle(qreal);
+
+    void applyTo(QTransform *transform) const;
+
+Q_SIGNALS:
+    void originChanged();
+    void angleChanged();
+
+protected:
+    QGraphicsRotation(QGraphicsRotationPrivate &p, QObject *parent);
+private:
+    Q_DECLARE_PRIVATE(QGraphicsRotation)
+};
+
+class QGraphicsRotation3DPrivate;
+
+class Q_GUI_EXPORT QGraphicsRotation3D : public QGraphicsRotation
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QVector3D axis READ axis WRITE setAxis NOTIFY axisChanged)
+public:
+    QGraphicsRotation3D(QObject *parent = 0);
+    ~QGraphicsRotation3D();
+
+    QVector3D axis();
+    void setAxis(const QVector3D &axis);
+
+    void applyTo(QTransform *transform) const;
+
+Q_SIGNALS:
+    void axisChanged();
+
+private:
+    Q_DECLARE_PRIVATE(QGraphicsRotation3D)
+};
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif // QFXTRANSFORM_H
diff --git a/src/gui/embedded/qkbdvr41xx_qws.h b/src/gui/graphicsview/qgraphicstransform_p.h
index 1a657b9..2d36eda 100644
--- a/src/gui/embedded/qkbdvr41xx_qws.h
+++ b/src/gui/graphicsview/qgraphicstransform_p.h
@@ -39,35 +39,35 @@
 **
 ****************************************************************************/
 
-#ifndef QKBDVR41XX_QWS_H
-#define QKBDVR41XX_QWS_H
+#ifndef QGRAPHICSTRANSFORM_P_H
+#define QGRAPHICSTRANSFORM_P_H
 
-#include <QtGui/qkbd_qws.h>
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of qapplication_*.cpp, qwidget*.cpp and qfiledialog.cpp.  This header
+// file may change from version to version without notice, or even be removed.
+//
+// We mean it.
+//
 
-QT_BEGIN_HEADER
+#include "private/qobject_p.h"
 
-QT_BEGIN_NAMESPACE
+class QGraphicsItem;
 
-QT_MODULE(Gui)
-
-#if !defined(QT_NO_QWS_KEYBOARD) && !defined(QT_NO_QWS_KBD_VR41XX)
-
-class QWSVr41xxKbPrivate;
-
-class QWSVr41xxKeyboardHandler : public QWSKeyboardHandler
-{
+class QGraphicsTransformPrivate : public QObjectPrivate {
 public:
-    explicit QWSVr41xxKeyboardHandler(const QString&);
-    virtual ~QWSVr41xxKeyboardHandler();
+    Q_DECLARE_PUBLIC(QGraphicsTransform)
 
-private:
-    QWSVr41xxKbPrivate *d;
-};
-
-#endif // QT_NO_QWS_KBD_VR41XX
+    QGraphicsTransformPrivate()
+        : QObjectPrivate(), item(0) {}
 
-QT_END_NAMESPACE
+    QGraphicsItem *item;
 
-QT_END_HEADER
+    void setItem(QGraphicsItem *item);
+    static void updateItem(QGraphicsItem *item);
+};
 
-#endif // QKBDVR41XX_QWS_H
+#endif // QGRAPHICSTRANSFORM_P_H
diff --git a/src/gui/graphicsview/qgraphicsview.cpp b/src/gui/graphicsview/qgraphicsview.cpp
index 53b044c..ca55f2e 100644
--- a/src/gui/graphicsview/qgraphicsview.cpp
+++ b/src/gui/graphicsview/qgraphicsview.cpp
@@ -97,8 +97,8 @@ static const int QGRAPHICSVIEW_PREALLOC_STYLE_OPTIONS = 503; // largest prime <
     setViewport(new QGLWidget). QGraphicsView takes ownership of the viewport
     widget.
 
-    QGraphicsView supports affine transformations, using QMatrix. You can
-    either pass a matrix to setMatrix(), or you can call one of the
+    QGraphicsView supports affine transformations, using QTransform. You can
+    either pass a matrix to setTransform(), or you can call one of the
     convenience functions rotate(), scale(), translate() or shear(). The most
     two common transformations are scaling, which is used to implement
     zooming, and rotation. QGraphicsView keeps the center of the view fixed
@@ -1583,7 +1583,7 @@ void QGraphicsView::setSceneRect(const QRectF &rect)
     Returns the current transformation matrix for the view. If no current
     transformation is set, the identity matrix is returned.
 
-    \sa setMatrix(), rotate(), scale(), shear(), translate()
+    \sa setMatrix(), transform(), rotate(), scale(), shear(), translate()
 */
 QMatrix QGraphicsView::matrix() const
 {
@@ -1615,7 +1615,7 @@ QMatrix QGraphicsView::matrix() const
     a view coordinate to a floating point scene coordinate, or mapFromScene()
     to map from floating point scene coordinates to view coordinates.
 
-    \sa matrix(), rotate(), scale(), shear(), translate()
+    \sa matrix(), setTransform(), rotate(), scale(), shear(), translate()
 */
 void QGraphicsView::setMatrix(const QMatrix &matrix, bool combine)
 {
@@ -1624,6 +1624,8 @@ void QGraphicsView::setMatrix(const QMatrix &matrix, bool combine)
 
 /*!
     Resets the view transformation matrix to the identity matrix.
+
+    \sa resetTransform()
 */
 void QGraphicsView::resetMatrix()
 {
@@ -1633,7 +1635,7 @@ void QGraphicsView::resetMatrix()
 /*!
     Rotates the current view transformation \a angle degrees clockwise.
 
-    \sa setMatrix(), matrix(), scale(), shear(), translate()
+    \sa setTransform(), transform(), scale(), shear(), translate()
 */
 void QGraphicsView::rotate(qreal angle)
 {
@@ -1646,7 +1648,7 @@ void QGraphicsView::rotate(qreal angle)
 /*!
     Scales the current view transformation by (\a sx, \a sy).
 
-    \sa setMatrix(), matrix(), rotate(), shear(), translate()
+    \sa setTransform(), transform(), rotate(), shear(), translate()
 */
 void QGraphicsView::scale(qreal sx, qreal sy)
 {
@@ -1659,7 +1661,7 @@ void QGraphicsView::scale(qreal sx, qreal sy)
 /*!
     Shears the current view transformation by (\a sh, \a sv).
 
-    \sa setMatrix(), matrix(), rotate(), scale(), translate()
+    \sa setTransform(), transform(), rotate(), scale(), translate()
 */
 void QGraphicsView::shear(qreal sh, qreal sv)
 {
@@ -1672,7 +1674,7 @@ void QGraphicsView::shear(qreal sh, qreal sv)
 /*!
     Translates the current view transformation by (\a dx, \a dy).
 
-    \sa setMatrix(), matrix(), rotate(), shear()
+    \sa setTransform(), transform(), rotate(), shear()
 */
 void QGraphicsView::translate(qreal dx, qreal dy)
 {
@@ -1830,7 +1832,7 @@ void QGraphicsView::ensureVisible(const QGraphicsItem *item, int xmargin, int ym
     If \a rect is empty, or if the viewport is too small, this
     function will do nothing.
 
-    \sa setMatrix(), ensureVisible(), centerOn()
+    \sa setTransform(), ensureVisible(), centerOn()
 */
 void QGraphicsView::fitInView(const QRectF &rect, Qt::AspectRatioMode aspectRatioMode)
 {
diff --git a/src/gui/graphicsview/qgraphicswidget.cpp b/src/gui/graphicsview/qgraphicswidget.cpp
index 42d3ed5..605215e 100644
--- a/src/gui/graphicsview/qgraphicswidget.cpp
+++ b/src/gui/graphicsview/qgraphicswidget.cpp
@@ -1718,49 +1718,18 @@ void QGraphicsWidget::setFocusPolicy(Qt::FocusPolicy policy)
 /*!
     If this widget, a child or descendant of this widget currently has input
     focus, this function will return a pointer to that widget. If
-    no descendant has input focus, 0 is returned.
+    no descendant widget has input focus, 0 is returned.
 
-    \sa QWidget::focusWidget()
+    \sa QGraphicsItem::focusItem(), QWidget::focusWidget()
 */
 QGraphicsWidget *QGraphicsWidget::focusWidget() const
 {
     Q_D(const QGraphicsWidget);
-    return d->focusChild;
+    if (d->subFocusItem && d->subFocusItem->d_ptr->isWidget)
+        return static_cast<QGraphicsWidget *>(d->subFocusItem);
+    return 0;
 }
 
-/*! \property QGraphicsWidget::horizontalShear
-  \brief This property holds the horizontal shear value for the item.
- */
-
-/*! \property QGraphicsWidget::transformOrigin
-    \brief This property holds the origin point used for transformations
-    in item coordinates.
- */
-
-/*! \property QGraphicsWidget::verticalShear
-  \brief This property holds the vertical shear value for the item.
- */
-
-/*! \property QGraphicsWidget::xRotation
-  \brief This property holds the value for rotation around the x axis.
- */
-
-/*! \property QGraphicsWidget::xScale
-  \brief This property holds the scale factor for the x axis.
- */
-
-/*! \property QGraphicsWidget::yRotation
-  \brief This property holds the value for rotation around the y axis.
- */
-
-/*! \property QGraphicsWidget::yScale
-  \brief This property holds the scale factor for the y axis.
- */
-
-/*! \property QGraphicsWidget::zRotation
-  \brief This property holds the value for rotation around the z axis.
- */
-
 #ifndef QT_NO_SHORTCUT
 /*!
     \since 4.5
@@ -2286,6 +2255,7 @@ bool QGraphicsWidget::close()
 #ifdef Q_NO_USING_KEYWORD
 /*!
     \fn const QObjectList &QGraphicsWidget::children() const
+    \internal
 
     This function returns the same value as QObject::children(). It's
     provided to differentiate between the obsolete member
diff --git a/src/gui/graphicsview/qgraphicswidget.h b/src/gui/graphicsview/qgraphicswidget.h
index 65ccfd7..68ae606 100644
--- a/src/gui/graphicsview/qgraphicswidget.h
+++ b/src/gui/graphicsview/qgraphicswidget.h
@@ -78,14 +78,6 @@ class Q_GUI_EXPORT QGraphicsWidget : public QGraphicsObject, public QGraphicsLay
     Q_PROPERTY(Qt::WindowFlags windowFlags READ windowFlags WRITE setWindowFlags)
     Q_PROPERTY(QString windowTitle READ windowTitle WRITE setWindowTitle)
     Q_PROPERTY(QRectF geometry READ geometry WRITE setGeometry)
-    Q_PROPERTY(QPointF transformOrigin READ transformOrigin WRITE setTransformOrigin)
-    Q_PROPERTY(qreal xRotation READ xRotation WRITE setXRotation)
-    Q_PROPERTY(qreal yRotation READ yRotation WRITE setYRotation)
-    Q_PROPERTY(qreal zRotation READ zRotation WRITE setZRotation)
-    Q_PROPERTY(qreal xScale READ xScale WRITE setXScale)
-    Q_PROPERTY(qreal yScale READ yScale WRITE setYScale)
-    Q_PROPERTY(qreal horizontalShear READ horizontalShear WRITE setHorizontalShear)
-    Q_PROPERTY(qreal verticalShear READ verticalShear WRITE setVerticalShear)
 public:
     QGraphicsWidget(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = 0);
     ~QGraphicsWidget();
diff --git a/src/gui/graphicsview/qgraphicswidget_p.cpp b/src/gui/graphicsview/qgraphicswidget_p.cpp
index c9212f7..8eac063 100644
--- a/src/gui/graphicsview/qgraphicswidget_p.cpp
+++ b/src/gui/graphicsview/qgraphicswidget_p.cpp
@@ -626,34 +626,6 @@ bool QGraphicsWidgetPrivate::hasDecoration() const
     return (windowFlags & Qt::Window) && (windowFlags & Qt::WindowTitleHint);
 }
 
-/*!
-    \internal
-*/
-void QGraphicsWidgetPrivate::setFocusWidget()
-{
-    // Update focus child chain.
-    QGraphicsWidget *widget = static_cast<QGraphicsWidget *>(q_ptr);
-    QGraphicsWidget *parent = widget;
-    bool hidden = !visible;
-    do {
-        parent->d_func()->focusChild = widget;
-    } while (!parent->isWindow() && (parent = parent->parentWidget()) && (!hidden || !parent->d_func()->visible));
-}
-
-/*!
-    \internal
-*/
-void QGraphicsWidgetPrivate::clearFocusWidget()
-{
-    // Reset focus child chain.
-    QGraphicsWidget *parent = static_cast<QGraphicsWidget *>(q_ptr);
-    do {
-        if (parent->d_func()->focusChild != q_ptr)
-            break;
-        parent->d_func()->focusChild = 0;
-    } while (!parent->isWindow() && (parent = parent->parentWidget()));
-}
-
 /**
  * is called after a reparent has taken place to fix up the focus chain(s)
  */
@@ -670,12 +642,6 @@ void QGraphicsWidgetPrivate::fixFocusChainBeforeReparenting(QGraphicsWidget *new
 
     QGraphicsWidget *firstOld = 0;
     bool wasPreviousNew = true;
-
-    if (focusChild) {
-        // Ensure that the current focus child doesn't leave pointers around
-        // before reparenting.
-        focusChild->clearFocus();
-    }
     
     while (w != q) {
         bool isCurrentNew = q->isAncestorOf(w);
diff --git a/src/gui/graphicsview/qgraphicswidget_p.h b/src/gui/graphicsview/qgraphicswidget_p.h
index 0c34baa..92e520a 100644
--- a/src/gui/graphicsview/qgraphicswidget_p.h
+++ b/src/gui/graphicsview/qgraphicswidget_p.h
@@ -83,7 +83,6 @@ public:
           focusPolicy(Qt::NoFocus),
           focusNext(0),
           focusPrev(0),
-          focusChild(0),
           windowFlags(0),
           windowData(0),
           setWindowFrameMargins(false),
@@ -178,9 +177,6 @@ public:
     Qt::FocusPolicy focusPolicy;
     QGraphicsWidget *focusNext;
     QGraphicsWidget *focusPrev;
-    QGraphicsWidget *focusChild;
-    void setFocusWidget();
-    void clearFocusWidget();
 
     // Windows
     Qt::WindowFlags windowFlags;
diff --git a/src/gui/image/qbitmap.cpp b/src/gui/image/qbitmap.cpp
index 6bca504..78c3396 100644
--- a/src/gui/image/qbitmap.cpp
+++ b/src/gui/image/qbitmap.cpp
@@ -78,7 +78,7 @@ QT_BEGIN_NAMESPACE
     0 for black and 1 for white.
 
     The QBitmap class provides the transformed() function returning a
-    transformed copy of the bitmap; use the QMatrix argument to
+    transformed copy of the bitmap; use the QTransform argument to
     translate, scale, shear, and rotate the bitmap. In addition,
     QBitmap provides the static fromData() function which returns a
     bitmap constructed from the given \c uchar data, and the static
@@ -318,6 +318,7 @@ QBitmap QBitmap::transformed(const QTransform &matrix) const
 
 /*!
   \overload
+  \obsolete
 
   This convenience function converts the \a matrix to a QTransform
   and calls the overloaded function.
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp
index 7d7dde1..e8ca7a9 100644
--- a/src/gui/image/qimage.cpp
+++ b/src/gui/image/qimage.cpp
@@ -590,9 +590,8 @@ bool QImageData::checkForAlphaPixels() const
 
     The mirrored() function returns a mirror of the image in the
     desired direction, the scaled() returns a copy of the image scaled
-    to a rectangle of the desired measures, the rgbSwapped() function
-    constructs a BGR image from a RGB image, and the alphaChannel()
-    function constructs an image from this image's alpha channel.
+    to a rectangle of the desired measures, and the rgbSwapped() function
+    constructs a BGR image from a RGB image.
 
     The scaledToWidth() and scaledToHeight() functions return scaled
     copies of the image.
@@ -4629,12 +4628,19 @@ bool QImage::loadFromData(const uchar *data, int len, const char *format)
     binary \a data. The loader attempts to read the image using the
     specified \a format. If \a format is not specified (which is the default),
     the loader probes the file for a header to guess the file format.
+    binary \a data. The loader attempts to read the image, either using the
+    optional image \a format specified or by determining the image format from
+    the data.
 
-    If the loading of the image failed, this object is a null image.
+    If \a format is not specified (which is the default), the loader probes the
+    file for a header to determine the file format. If \a format is specified,
+    it must be one of the values returned by QImageReader::supportedImageFormats().
+
+    If the loading of the image fails, the image returned will be a null image.
+
+    \sa load(), save(), {QImage#Reading and Writing Image Files}{Reading and Writing Image Files}
+ */
 
-    \sa load(), save(), {QImage#Reading and Writing Image
-    Files}{Reading and Writing Image Files}
-*/
 QImage QImage::fromData(const uchar *data, int size, const char *format)
 {
     QByteArray a = QByteArray::fromRawData(reinterpret_cast<const char *>(data), size);
diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp
index 3e5c9b7..18829f4 100644
--- a/src/gui/image/qpixmap.cpp
+++ b/src/gui/image/qpixmap.cpp
@@ -671,12 +671,7 @@ void QPixmap::resize_helper(const QSize &s)
         p.drawPixmap(0, 0, *this, 0, 0, qMin(width(), w), qMin(height(), h));
     }
 
-#if defined(Q_WS_MAC)
-#ifndef QT_MAC_NO_QUICKDRAW
-    if(macData && macData->qd_alpha)
-        macData->macQDUpdateAlpha();
-#endif
-#elif defined(Q_WS_X11)
+#if defined(Q_WS_X11)
     if (x11Data && x11Data->x11_mask) {
         QX11PixmapData *pmData = static_cast<QX11PixmapData*>(pm.data);
         pmData->x11_mask = (Qt::HANDLE)XCreatePixmap(X11->display,
@@ -1945,11 +1940,6 @@ void QPixmap::detach()
 
     if (data->ref != 1) {
         *this = copy();
-#if defined(Q_WS_MAC) && !defined(QT_MAC_NO_QUICKDRAW)
-        if (id == QPixmapData::MacClass) {
-            macData->qd_alpha = 0;
-        }
-#endif
     }
     ++data->detach_no;
 
diff --git a/src/gui/image/qpixmap_mac.cpp b/src/gui/image/qpixmap_mac.cpp
index 25ef8ba..45392f1 100644
--- a/src/gui/image/qpixmap_mac.cpp
+++ b/src/gui/image/qpixmap_mac.cpp
@@ -166,9 +166,6 @@ QMacPixmapData::QMacPixmapData(PixelType type)
     : QPixmapData(type, MacClass), has_alpha(0), has_mask(0),
       uninit(true), pixels(0), pixelsToFree(0), bytesPerRow(0),
       cg_data(0), cg_dataBeingReleased(0), cg_mask(0),
-#ifndef QT_MAC_NO_QUICKDRAW
-      qd_data(0), qd_alpha(0),
-#endif
       pengine(0)
 {
 }
@@ -494,13 +491,6 @@ int QMacPixmapData::metric(QPaintDevice::PaintDeviceMetric theMetric) const
 QMacPixmapData::~QMacPixmapData()
 {
     validDataPointers.remove(this);
-#ifndef QT_MAC_NO_QUICKDRAW
-    macQDDisposeAlpha();
-    if (qd_data) {
-        DisposeGWorld(qd_data);
-        qd_data = 0;
-    }
-#endif
     if (cg_mask) {
         CGImageRelease(cg_mask);
         cg_mask = 0;
@@ -589,48 +579,9 @@ void QMacPixmapData::macGetAlphaChannel(QMacPixmapData *pix, bool asMask) const
 void QMacPixmapData::macSetHasAlpha(bool b)
 {
     has_alpha = b;
-#ifndef QT_MAC_NO_QUICKDRAW
-    macQDDisposeAlpha(); //let it get created lazily
-#endif
     macReleaseCGImageRef();
 }
 
-#ifndef QT_MAC_NO_QUICKDRAW
-void QMacPixmapData::macQDDisposeAlpha()
-{
-    if (qd_alpha) {
-        DisposeGWorld(qd_alpha);
-        qd_alpha = 0;
-    }
-}
-
-void QMacPixmapData::macQDUpdateAlpha()
-{
-    macQDDisposeAlpha(); // get rid of alpha pixmap
-    if (!has_alpha && !has_mask)
-        return;
-
-    //setup
-    Rect rect;
-    SetRect(&rect, 0, 0, w, h);
-    const int params = alignPix | stretchPix | newDepth;
-    NewGWorld(&qd_alpha, 32, &rect, 0, 0, params);
-    int *dptr = (int *)GetPixBaseAddr(GetGWorldPixMap(qd_alpha)), *drow;
-    unsigned short dbpr = GetPixRowBytes(GetGWorldPixMap(qd_alpha));
-    const int *sptr = (int*)pixels, *srow;
-    const uint sbpr = bytesPerRow;
-    uchar clr;
-    for (int y = 0; y < h; ++y) {
-        drow = (int*)((char *)dptr + (y * dbpr));
-        srow = (int*)((char *)sptr + (y * sbpr));
-        for (int x=0; x < w; x++) {
-            clr = qAlpha(*(srow + x));
-            *(drow + x) = qRgba(~clr, ~clr, ~clr, 0);
-        }
-    }
-}
-#endif
-
 void QMacPixmapData::macCreateCGImageRef()
 {
     Q_ASSERT(cg_data == 0);
@@ -979,31 +930,12 @@ QPixmap QPixmap::grabWindow(WId window, int x, int y, int w, int h)
     relocated.
 
     \warning This function is only available on Mac OS X.
+    \warning As of Qt 4.6, this function \e{always} returns zero.
 */
 
 Qt::HANDLE QPixmap::macQDHandle() const
 {
-#ifndef QT_MAC_NO_QUICKDRAW
-    QMacPixmapData *d = static_cast<QMacPixmapData*>(data);
-    if (!d->qd_data) { //create the qd data
-        Rect rect;
-        SetRect(&rect, 0, 0, d->w, d->h);
-        unsigned long qdformat = k32ARGBPixelFormat;
-        GWorldFlags qdflags = 0;
-        //we play such games so we can use the same buffer in CG as QD this
-        //makes our merge much simpler, at some point the hacks will go away
-        //because QD will be removed, but until that day this keeps them coexisting
-        if (QSysInfo::ByteOrder == QSysInfo::LittleEndian)
-            qdformat = k32BGRAPixelFormat;
-
-        if(NewGWorldFromPtr(&d->qd_data, qdformat, &rect, 0, 0, qdflags,
-                            (char*)d->pixels, d->bytesPerRow) != noErr)
-            qWarning("Qt: internal: QPixmap::init error (%d %d %d %d)", rect.left, rect.top, rect.right, rect.bottom);
-    }
-    return d->qd_data;
-#else
     return 0;
-#endif
 }
 
 /*! \internal
@@ -1013,18 +945,11 @@ Qt::HANDLE QPixmap::macQDHandle() const
     long as it can be relocated.
 
     \warning This function is only available on Mac OS X.
+    \warning As of Qt 4.6, this function \e{always} returns zero.
 */
 
 Qt::HANDLE QPixmap::macQDAlphaHandle() const
 {
-#ifndef QT_MAC_NO_QUICKDRAW
-    QMacPixmapData *d = static_cast<QMacPixmapData*>(data);
-    if (d->has_alpha || d->has_mask) {
-        if (!d->qd_alpha) //lazily created
-            d->macQDUpdateAlpha();
-        return d->qd_alpha;
-    }
-#endif
     return 0;
 }
 
@@ -1094,7 +1019,6 @@ IconRef qt_mac_create_iconref(const QPixmap &px)
     if (px.isNull())
         return 0;
 
-    QMacSavedPortInfo pi; //save the current state
     //create icon
     IconFamilyHandle iconFamily = reinterpret_cast<IconFamilyHandle>(NewHandle(0));
     //create data
diff --git a/src/gui/image/qpixmap_mac_p.h b/src/gui/image/qpixmap_mac_p.h
index a3ff0d3..ea6fe60 100644
--- a/src/gui/image/qpixmap_mac_p.h
+++ b/src/gui/image/qpixmap_mac_p.h
@@ -109,11 +109,6 @@ private:
     uint bytesPerRow;
     QRectF cg_mask_rect;
     CGImageRef cg_data, cg_dataBeingReleased, cg_mask;
-#ifndef QT_MAC_NO_QUICKDRAW
-    GWorldPtr qd_data, qd_alpha;
-    void macQDDisposeAlpha();
-    void macQDUpdateAlpha();
-#endif
     static QSet<QMacPixmapData*> validDataPointers;
 
     QPaintEngine *pengine;
diff --git a/src/gui/image/qpixmapcache.h b/src/gui/image/qpixmapcache.h
index c86f3fa..de589fc 100644
--- a/src/gui/image/qpixmapcache.h
+++ b/src/gui/image/qpixmapcache.h
@@ -54,7 +54,7 @@ class Q_GUI_EXPORT QPixmapCache
 {
 public:
     class KeyData;
-    class Key
+    class Q_GUI_EXPORT Key
     {
     public:
         Key();
diff --git a/src/gui/itemviews/qabstractitemview.cpp b/src/gui/itemviews/qabstractitemview.cpp
index 8887977..8b6b5cb 100644
--- a/src/gui/itemviews/qabstractitemview.cpp
+++ b/src/gui/itemviews/qabstractitemview.cpp
@@ -851,8 +851,8 @@ QAbstractItemDelegate *QAbstractItemView::itemDelegateForColumn(int column) cons
 }
 
 /*!
-   Returns the item delegate used by this view and model for
-   the given \a index.
+    Returns the item delegate used by this view and model for
+    the given \a index.
 */
 QAbstractItemDelegate *QAbstractItemView::itemDelegate(const QModelIndex &index) const
 {
@@ -861,14 +861,14 @@ QAbstractItemDelegate *QAbstractItemView::itemDelegate(const QModelIndex &index)
 }
 
 /*!
-  \property QAbstractItemView::selectionMode
-  \brief which selection mode the view operates in
+    \property QAbstractItemView::selectionMode
+    \brief which selection mode the view operates in
 
-  This property controls whether the user can select one or many items
-  and, in many-item selections, whether the selection must be a
-  continuous range of items.
+    This property controls whether the user can select one or many items
+    and, in many-item selections, whether the selection must be a
+    continuous range of items.
 
-  \sa SelectionMode SelectionBehavior
+    \sa SelectionMode SelectionBehavior
 */
 void QAbstractItemView::setSelectionMode(SelectionMode mode)
 {
@@ -883,13 +883,13 @@ QAbstractItemView::SelectionMode QAbstractItemView::selectionMode() const
 }
 
 /*!
-  \property QAbstractItemView::selectionBehavior
-  \brief which selection behavior the view uses
+    \property QAbstractItemView::selectionBehavior
+    \brief which selection behavior the view uses
 
-  This property holds whether selections are done
-  in terms of single items, rows or columns.
+    This property holds whether selections are done
+    in terms of single items, rows or columns.
 
-  \sa SelectionMode SelectionBehavior
+    \sa SelectionMode SelectionBehavior
 */
 
 void QAbstractItemView::setSelectionBehavior(QAbstractItemView::SelectionBehavior behavior)
@@ -990,11 +990,11 @@ QModelIndex QAbstractItemView::rootIndex() const
 }
 
 /*!
-  Selects all item in the view.
-  This function wil use the selection selection behavior
-  set on the view when selecting.
+    Selects all items in the view.
+    This function will use the selection behavior
+    set on the view when selecting.
 
-  \sa setSelection(), selectedIndexes(), clearSelection()
+    \sa setSelection(), selectedIndexes(), clearSelection()
 */
 void QAbstractItemView::selectAll()
 {
@@ -1223,10 +1223,10 @@ bool QAbstractItemView::tabKeyNavigation() const
 
 #ifndef QT_NO_DRAGANDDROP
 /*!
-  \property QAbstractItemView::showDropIndicator
-  \brief whether the drop indicator is shown when dragging items and dropping.
+    \property QAbstractItemView::showDropIndicator
+    \brief whether the drop indicator is shown when dragging items and dropping.
 
-  \sa dragEnabled DragDropMode dragDropOverwriteMode acceptDrops
+    \sa dragEnabled DragDropMode dragDropOverwriteMode acceptDrops
 */
 
 void QAbstractItemView::setDropIndicatorShown(bool enable)
@@ -1242,10 +1242,10 @@ bool QAbstractItemView::showDropIndicator() const
 }
 
 /*!
-  \property QAbstractItemView::dragEnabled
-  \brief whether the view supports dragging of its own items
+    \property QAbstractItemView::dragEnabled
+    \brief whether the view supports dragging of its own items
 
-  \sa showDropIndicator DragDropMode dragDropOverwriteMode acceptDrops
+    \sa showDropIndicator DragDropMode dragDropOverwriteMode acceptDrops
 */
 
 void QAbstractItemView::setDragEnabled(bool enable)
@@ -1281,11 +1281,11 @@ bool QAbstractItemView::dragEnabled() const
 */
 
 /*!
-  \property QAbstractItemView::dragDropMode
-  \brief the drag and drop event the view will act upon
+    \property QAbstractItemView::dragDropMode
+    \brief the drag and drop event the view will act upon
 
-  \since 4.2
-  \sa showDropIndicator dragDropOverwriteMode
+    \since 4.2
+    \sa showDropIndicator dragDropOverwriteMode
 */
 void QAbstractItemView::setDragDropMode(DragDropMode behavior)
 {
@@ -1321,14 +1321,14 @@ QAbstractItemView::DragDropMode QAbstractItemView::dragDropMode() const
 #endif // QT_NO_DRAGANDDROP
 
 /*!
-  \property QAbstractItemView::alternatingRowColors
-  \brief whether to draw the background using alternating colors
+    \property QAbstractItemView::alternatingRowColors
+    \brief whether to draw the background using alternating colors
 
-  If this property is true, the item background will be drawn using
-  QPalette::Base and QPalette::AlternateBase; otherwise the background
-  will be drawn using the QPalette::Base color.
+    If this property is true, the item background will be drawn using
+    QPalette::Base and QPalette::AlternateBase; otherwise the background
+    will be drawn using the QPalette::Base color.
 
-  By default, this property is false.
+    By default, this property is false.
 */
 void QAbstractItemView::setAlternatingRowColors(bool enable)
 {
@@ -2257,8 +2257,8 @@ void QAbstractItemView::inputMethodEvent(QInputMethodEvent *event)
     \value BelowItem  The item will be dropped below the index.
 
     \value OnViewport  The item will be dropped onto a region of the viewport with
-no items. The way each view handles items dropped onto the viewport depends on
-the behavior of the underlying model in use.
+    no items. The way each view handles items dropped onto the viewport depends on
+    the behavior of the underlying model in use.
 */
 
 
@@ -2275,11 +2275,11 @@ QAbstractItemView::DropIndicatorPosition QAbstractItemView::dropIndicatorPositio
 #endif
 
 /*!
-  This convenience function returns a list of all selected and
-  non-hidden item indexes in the view. The list contains no
-  duplicates, and is not sorted.
+    This convenience function returns a list of all selected and
+    non-hidden item indexes in the view. The list contains no
+    duplicates, and is not sorted.
 
-  \sa QItemSelectionModel::selectedIndexes()
+    \sa QItemSelectionModel::selectedIndexes()
 */
 QModelIndexList QAbstractItemView::selectedIndexes() const
 {
@@ -2361,8 +2361,8 @@ bool QAbstractItemView::edit(const QModelIndex &index, EditTrigger trigger, QEve
 }
 
 /*!
-  \internal
-  Updates the data shown in the open editor widgets in the view.
+    \internal
+    Updates the data shown in the open editor widgets in the view.
 */
 void QAbstractItemView::updateEditorData()
 {
@@ -2371,8 +2371,8 @@ void QAbstractItemView::updateEditorData()
 }
 
 /*!
-  \internal
-   Updates the geometry of the open editor widgets in the view.
+    \internal
+    Updates the geometry of the open editor widgets in the view.
 */
 void QAbstractItemView::updateEditorGeometries()
 {
@@ -2421,7 +2421,7 @@ void QAbstractItemView::updateGeometries()
 }
 
 /*!
-  \internal
+    \internal
 */
 void QAbstractItemView::verticalScrollbarValueChanged(int value)
 {
@@ -2432,7 +2432,7 @@ void QAbstractItemView::verticalScrollbarValueChanged(int value)
 }
 
 /*!
-  \internal
+    \internal
 */
 void QAbstractItemView::horizontalScrollbarValueChanged(int value)
 {
@@ -2534,9 +2534,9 @@ void QAbstractItemView::closeEditor(QWidget *editor, QAbstractItemDelegate::EndE
 }
 
 /*!
-  Commit the data in the \a editor to the model.
+    Commit the data in the \a editor to the model.
 
-  \sa closeEditor()
+    \sa closeEditor()
 */
 void QAbstractItemView::commitData(QWidget *editor)
 {
@@ -2555,9 +2555,9 @@ void QAbstractItemView::commitData(QWidget *editor)
 }
 
 /*!
-  This function is called when the given \a editor has been destroyed.
+    This function is called when the given \a editor has been destroyed.
 
-  \sa closeEditor()
+    \sa closeEditor()
 */
 void QAbstractItemView::editorDestroyed(QObject *editor)
 {
@@ -2628,12 +2628,12 @@ int QAbstractItemView::verticalStepsPerItem() const
 }
 
 /*!
-  Moves to and selects the item best matching the string \a search.
-  If no item is found nothing happens.
+    Moves to and selects the item best matching the string \a search.
+    If no item is found nothing happens.
 
-  In the default implementation, the search is reset if \a search is empty, or
-  the time interval since the last search has exceeded
-  QApplication::keyboardInputInterval().
+    In the default implementation, the search is reset if \a search is empty, or
+    the time interval since the last search has exceeded
+    QApplication::keyboardInputInterval().
 */
 void QAbstractItemView::keyboardSearch(const QString &search)
 {
@@ -2687,9 +2687,9 @@ void QAbstractItemView::keyboardSearch(const QString &search)
                 setCurrentIndex(firstMatch);
                 break;
             }
-	    int row = firstMatch.row() + 1;
-	    if (row >= d->model->rowCount(firstMatch.parent()))
-	        row = 0;
+            int row = firstMatch.row() + 1;
+            if (row >= d->model->rowCount(firstMatch.parent()))
+                row = 0;
             current = firstMatch.sibling(row, firstMatch.column());
         }
     } while (current != start && firstMatch.isValid());
@@ -2796,9 +2796,9 @@ void QAbstractItemView::openPersistentEditor(const QModelIndex &index)
 }
 
 /*!
-  Closes the persistent editor for the item at the given \a index.
+    Closes the persistent editor for the item at the given \a index.
 
-  \sa openPersistentEditor()
+    \sa openPersistentEditor()
 */
 void QAbstractItemView::closePersistentEditor(const QModelIndex &index)
 {
@@ -3333,14 +3333,14 @@ void QAbstractItemView::setDirtyRegion(const QRegion &region)
 }
 
 /*!
-  Prepares the view for scrolling by (\a{dx},\a{dy}) pixels by moving the dirty regions in the
-  opposite direction. You only need to call this function if you are implementing a scrolling
-  viewport in your view subclass.
+    Prepares the view for scrolling by (\a{dx},\a{dy}) pixels by moving the dirty regions in the
+    opposite direction. You only need to call this function if you are implementing a scrolling
+    viewport in your view subclass.
 
-  If you implement scrollContentsBy() in a subclass of QAbstractItemView, call this function
-  before you call QWidget::scroll() on the viewport. Alternatively, just call update().
+    If you implement scrollContentsBy() in a subclass of QAbstractItemView, call this function
+    before you call QWidget::scroll() on the viewport. Alternatively, just call update().
 
-  \sa scrollContentsBy(), dirtyRegionOffset(), setDirtyRegion()
+    \sa scrollContentsBy(), dirtyRegionOffset(), setDirtyRegion()
 */
 void QAbstractItemView::scrollDirtyRegion(int dx, int dy)
 {
@@ -3349,13 +3349,13 @@ void QAbstractItemView::scrollDirtyRegion(int dx, int dy)
 }
 
 /*!
-  Returns the offset of the dirty regions in the view.
+    Returns the offset of the dirty regions in the view.
 
-  If you use scrollDirtyRegion() and implement a paintEvent() in a subclass of
-  QAbstractItemView, you should translate the area given by the paint event with
-  the offset returned from this function.
+    If you use scrollDirtyRegion() and implement a paintEvent() in a subclass of
+    QAbstractItemView, you should translate the area given by the paint event with
+    the offset returned from this function.
 
-  \sa scrollDirtyRegion(), setDirtyRegion()
+    \sa scrollDirtyRegion(), setDirtyRegion()
 */
 QPoint QAbstractItemView::dirtyRegionOffset() const
 {
@@ -3527,7 +3527,7 @@ QItemSelectionModel::SelectionFlags QAbstractItemViewPrivate::extendedSelectionC
             const bool shiftKeyPressed = modifiers & Qt::ShiftModifier;
             const bool controlKeyPressed = modifiers & Qt::ControlModifier;
             if (((index == pressedIndex && selectionModel->isSelected(index))
-		 || !index.isValid()) && state != QAbstractItemView::DragSelectingState
+                || !index.isValid()) && state != QAbstractItemView::DragSelectingState
                 && !shiftKeyPressed && !controlKeyPressed && !rightButtonPressed)
                 return QItemSelectionModel::ClearAndSelect|selectionBehaviorFlags();
             return QItemSelectionModel::NoUpdate;
@@ -3759,7 +3759,7 @@ void QAbstractItemViewPrivate::updateEditorData(const QModelIndex &tl, const QMo
     but the behavior is view dependant (table just clears the selected indexes for example).
 
     Either remove the selected rows or clear them
-  */
+*/
 void QAbstractItemViewPrivate::clearOrRemove()
 {
 #ifndef QT_NO_DRAGANDDROP
@@ -3795,7 +3795,7 @@ void QAbstractItemViewPrivate::clearOrRemove()
 
     When persistent aeditor gets/loses focus, we need to check
     and setcorrectly the current index.
-  */
+*/
 void QAbstractItemViewPrivate::checkPersistentEditorFocus()
 {
     Q_Q(QAbstractItemView);
@@ -3882,10 +3882,10 @@ bool QAbstractItemViewPrivate::openEditor(const QModelIndex &index, QEvent *even
 }
 
 /*
-  \internal
+    \internal
 
-  returns the pair QRect/QModelIndex that should be painted on the viewports's rect
-  */
+    returns the pair QRect/QModelIndex that should be painted on the viewports's rect
+*/
 
 QItemViewPaintPairs QAbstractItemViewPrivate::draggablePaintPairs(const QModelIndexList &indexes, QRect *r) const
 {
diff --git a/src/gui/itemviews/qitemselectionmodel.cpp b/src/gui/itemviews/qitemselectionmodel.cpp
index 87825d9..9dad95f 100644
--- a/src/gui/itemviews/qitemselectionmodel.cpp
+++ b/src/gui/itemviews/qitemselectionmodel.cpp
@@ -303,45 +303,44 @@ QModelIndexList QItemSelectionRange::indexes() const
 }
 
 /*!
-  \class QItemSelection
+    \class QItemSelection
 
-  \brief The QItemSelection class manages information about selected items in a model.
+    \brief The QItemSelection class manages information about selected items in a model.
 
-  \ingroup model-view
-
-  A QItemSelection describes the items in a model that have been
-  selected by the user. A QItemSelection is basically a list of
-  selection ranges, see QItemSelectionRange. It provides functions for
-  creating and manipulating selections, and selecting a range of items
-  from a model.
+    \ingroup model-view
 
-  The QItemSelection class is one of the \l{Model/View Classes}
-  and is part of Qt's \l{Model/View Programming}{model/view framework}.
+    A QItemSelection describes the items in a model that have been
+    selected by the user. A QItemSelection is basically a list of
+    selection ranges, see QItemSelectionRange. It provides functions for
+    creating and manipulating selections, and selecting a range of items
+    from a model.
 
-  An item selection can be constructed and initialized to contain a
-  range of items from an existing model. The following example constructs
-  a selection that contains a range of items from the given \c model,
-  beginning at the \c topLeft, and ending at the \c bottomRight.
+    The QItemSelection class is one of the \l{Model/View Classes}
+    and is part of Qt's \l{Model/View Programming}{model/view framework}.
 
-  \snippet doc/src/snippets/code/src_gui_itemviews_qitemselectionmodel.cpp 0
+    An item selection can be constructed and initialized to contain a
+    range of items from an existing model. The following example constructs
+    a selection that contains a range of items from the given \c model,
+    beginning at the \c topLeft, and ending at the \c bottomRight.
 
-  An empty item selection can be constructed, and later populated as
-  required. So, if the model is going to be unavailable when we construct
-  the item selection, we can rewrite the above code in the following way:
+    \snippet doc/src/snippets/code/src_gui_itemviews_qitemselectionmodel.cpp 0
 
-  \snippet doc/src/snippets/code/src_gui_itemviews_qitemselectionmodel.cpp 1
+    An empty item selection can be constructed, and later populated as
+    required. So, if the model is going to be unavailable when we construct
+    the item selection, we can rewrite the above code in the following way:
 
-  QItemSelection saves memory, and avoids unnecessary work, by working with
-  selection ranges rather than recording the model item index for each
-  item in the selection. Generally, an instance of this class will contain
-  a list of non-overlapping selection ranges.
+    \snippet doc/src/snippets/code/src_gui_itemviews_qitemselectionmodel.cpp 1
 
-  Use merge() to merge one item selection into another without making
-  overlapping ranges. Use split() to split one selection range into
-  smaller ranges based on a another selection range.
+    QItemSelection saves memory, and avoids unnecessary work, by working with
+    selection ranges rather than recording the model item index for each
+    item in the selection. Generally, an instance of this class will contain
+    a list of non-overlapping selection ranges.
 
-  \sa {Model/View Programming}, QItemSelectionModel
+    Use merge() to merge one item selection into another without making
+    overlapping ranges. Use split() to split one selection range into
+    smaller ranges based on a another selection range.
 
+    \sa {Model/View Programming}, QItemSelectionModel
 */
 
 /*!
@@ -420,14 +419,14 @@ QModelIndexList QItemSelection::indexes() const
 }
 
 /*!
-  Merges the \a other selection with this QItemSelection using the
-  \a command given. This method guarantees that no ranges are overlapping.
+    Merges the \a other selection with this QItemSelection using the
+    \a command given. This method guarantees that no ranges are overlapping.
 
-  Note that only QItemSelectionModel::Select,
-  QItemSelectionModel::Deselect, and QItemSelectionModel::Toggle are
-  supported.
+    Note that only QItemSelectionModel::Select,
+    QItemSelectionModel::Deselect, and QItemSelectionModel::Toggle are
+    supported.
 
-  \sa split()
+    \sa split()
 */
 void QItemSelection::merge(const QItemSelection &other, QItemSelectionModel::SelectionFlags command)
 {
@@ -479,10 +478,10 @@ void QItemSelection::merge(const QItemSelection &other, QItemSelectionModel::Sel
 }
 
 /*!
-  Splits the selection \a range using the selection \a other range.
-  Removes all items in \a other from \a range and puts the result in \a result.
-  This can be compared with the semantics of the \e subtract operation of a set.
-  \sa merge()
+    Splits the selection \a range using the selection \a other range.
+    Removes all items in \a other from \a range and puts the result in \a result.
+    This can be compared with the semantics of the \e subtract operation of a set.
+    \sa merge()
 */
 
 void QItemSelection::split(const QItemSelectionRange &range,
@@ -529,11 +528,11 @@ void QItemSelection::split(const QItemSelectionRange &range,
 }
 
 /*!
-  \internal
+    \internal
 
-  returns a QItemSelection where all ranges have been expanded to:
-  Rows: left: 0 and right: columnCount()-1
-  Columns: top: 0 and bottom: rowCount()-1
+    returns a QItemSelection where all ranges have been expanded to:
+    Rows: left: 0 and right: columnCount()-1
+    Columns: top: 0 and bottom: rowCount()-1
 */
 
 QItemSelection QItemSelectionModelPrivate::expandSelection(const QItemSelection &selection,
@@ -568,7 +567,7 @@ QItemSelection QItemSelectionModelPrivate::expandSelection(const QItemSelection
 }
 
 /*!
-  \internal
+    \internal
 */
 void QItemSelectionModelPrivate::_q_rowsAboutToBeRemoved(const QModelIndex &parent,
                                                          int start, int end)
@@ -599,7 +598,7 @@ void QItemSelectionModelPrivate::_q_rowsAboutToBeRemoved(const QModelIndex &pare
 }
 
 /*!
-  \internal
+    \internal
 */
 void QItemSelectionModelPrivate::_q_columnsAboutToBeRemoved(const QModelIndex &parent,
                                                             int start, int end)
@@ -630,9 +629,9 @@ void QItemSelectionModelPrivate::_q_columnsAboutToBeRemoved(const QModelIndex &p
 }
 
 /*!
-  \internal
+    \internal
 
-  Split selection ranges if columns are about to be inserted in the middle.
+    Split selection ranges if columns are about to be inserted in the middle.
 */
 void QItemSelectionModelPrivate::_q_columnsAboutToBeInserted(const QModelIndex &parent,
                                                              int start, int end)
@@ -659,9 +658,9 @@ void QItemSelectionModelPrivate::_q_columnsAboutToBeInserted(const QModelIndex &
 }
 
 /*!
-  \internal
+    \internal
 
-  Split selection ranges if rows are about to be inserted in the middle.
+    Split selection ranges if rows are about to be inserted in the middle.
 */
 void QItemSelectionModelPrivate::_q_rowsAboutToBeInserted(const QModelIndex &parent,
                                                           int start, int end)
@@ -688,11 +687,11 @@ void QItemSelectionModelPrivate::_q_rowsAboutToBeInserted(const QModelIndex &par
 }
 
 /*!
-  \internal
+    \internal
 
-  Split selection into individual (persistent) indexes. This is done in
-  preparation for the layoutChanged() signal, where the indexes can be
-  merged again.
+    Split selection into individual (persistent) indexes. This is done in
+    preparation for the layoutChanged() signal, where the indexes can be
+    merged again.
 */
 void QItemSelectionModelPrivate::_q_layoutAboutToBeChanged()
 {
@@ -726,10 +725,10 @@ void QItemSelectionModelPrivate::_q_layoutAboutToBeChanged()
 }
 
 /*!
-  \internal
+    \internal
 
-  Merges \a indexes into an item selection made up of ranges.
-  Assumes that the indexes are sorted.
+    Merges \a indexes into an item selection made up of ranges.
+    Assumes that the indexes are sorted.
 */
 static QItemSelection mergeIndexes(const QList<QPersistentModelIndex> &indexes)
 {
@@ -774,9 +773,9 @@ static QItemSelection mergeIndexes(const QList<QPersistentModelIndex> &indexes)
 }
 
 /*!
-  \internal
+    \internal
 
-  Merge the selected indexes into selection ranges again.
+    Merge the selected indexes into selection ranges again.
 */
 void QItemSelectionModelPrivate::_q_layoutChanged()
 {
@@ -818,41 +817,41 @@ void QItemSelectionModelPrivate::_q_layoutChanged()
 }
 
 /*!
-  \class QItemSelectionModel
+    \class QItemSelectionModel
 
-  \brief The QItemSelectionModel class keeps track of a view's selected items.
+    \brief The QItemSelectionModel class keeps track of a view's selected items.
 
-  \ingroup model-view
+    \ingroup model-view
 
-  A QItemSelectionModel keeps track of the selected items in a view, or
-  in several views onto the same model. It also keeps track of the
-  currently selected item in a view.
+    A QItemSelectionModel keeps track of the selected items in a view, or
+    in several views onto the same model. It also keeps track of the
+    currently selected item in a view.
 
-  The QItemSelectionModel class is one of the \l{Model/View Classes}
-  and is part of Qt's \l{Model/View Programming}{model/view framework}.
+    The QItemSelectionModel class is one of the \l{Model/View Classes}
+    and is part of Qt's \l{Model/View Programming}{model/view framework}.
 
-  The selected items are stored using ranges. Whenever you want to
-  modify the selected items use select() and provide either a
-  QItemSelection, or a QModelIndex and a QItemSelectionModel::SelectionFlag.
+    The selected items are stored using ranges. Whenever you want to
+    modify the selected items use select() and provide either a
+    QItemSelection, or a QModelIndex and a QItemSelectionModel::SelectionFlag.
 
-  The QItemSelectionModel takes a two layer approach to selection
-  management, dealing with both selected items that have been committed
-  and items that are part of the current selection. The current
-  selected items are part of the current interactive selection (for
-  example with rubber-band selection or keyboard-shift selections).
+    The QItemSelectionModel takes a two layer approach to selection
+    management, dealing with both selected items that have been committed
+    and items that are part of the current selection. The current
+    selected items are part of the current interactive selection (for
+    example with rubber-band selection or keyboard-shift selections).
 
-  To update the currently selected items, use the bitwise OR of
-  QItemSelectionModel::Current and any of the other SelectionFlags.
-  If you omit the QItemSelectionModel::Current command, a new current
-  selection will be created, and the previous one added to the whole
-  selection. All functions operate on both layers; for example,
-  selectedItems() will return items from both layers.
+    To update the currently selected items, use the bitwise OR of
+    QItemSelectionModel::Current and any of the other SelectionFlags.
+    If you omit the QItemSelectionModel::Current command, a new current
+    selection will be created, and the previous one added to the whole
+    selection. All functions operate on both layers; for example,
+    selectedItems() will return items from both layers.
 
-  \sa {Model/View Programming}, QAbstractItemModel, {Chart Example}
+    \sa {Model/View Programming}, QAbstractItemModel, {Chart Example}
 */
 
 /*!
-  Constructs a selection model that operates on the specified item \a model.
+    Constructs a selection model that operates on the specified item \a model.
 */
 QItemSelectionModel::QItemSelectionModel(QAbstractItemModel *model)
     : QObject(*new QItemSelectionModelPrivate, model)
@@ -875,7 +874,7 @@ QItemSelectionModel::QItemSelectionModel(QAbstractItemModel *model)
 }
 
 /*!
-  Constructs a selection model that operates on the specified item \a model with \a parent.
+    Constructs a selection model that operates on the specified item \a model with \a parent.
 */
 QItemSelectionModel::QItemSelectionModel(QAbstractItemModel *model, QObject *parent)
     : QObject(*new QItemSelectionModelPrivate, parent)
@@ -898,7 +897,7 @@ QItemSelectionModel::QItemSelectionModel(QAbstractItemModel *model, QObject *par
 }
 
 /*!
-  \internal
+    \internal
 */
 QItemSelectionModel::QItemSelectionModel(QItemSelectionModelPrivate &dd, QAbstractItemModel *model)
     : QObject(dd, model)
@@ -921,7 +920,7 @@ QItemSelectionModel::QItemSelectionModel(QItemSelectionModelPrivate &dd, QAbstra
 }
 
 /*!
-  Destroys the selection model.
+    Destroys the selection model.
 */
 QItemSelectionModel::~QItemSelectionModel()
 {
@@ -943,10 +942,10 @@ QItemSelectionModel::~QItemSelectionModel()
 }
 
 /*!
-  Selects the model item \a index using the specified \a command, and emits
-  selectionChanged().
+    Selects the model item \a index using the specified \a command, and emits
+    selectionChanged().
 
-  \sa QItemSelectionModel::SelectionFlags
+    \sa QItemSelectionModel::SelectionFlags
 */
 void QItemSelectionModel::select(const QModelIndex &index, QItemSelectionModel::SelectionFlags command)
 {
@@ -955,37 +954,37 @@ void QItemSelectionModel::select(const QModelIndex &index, QItemSelectionModel::
 }
 
 /*!
-   \fn void QItemSelectionModel::currentChanged(const QModelIndex &current, const QModelIndex &previous)
+    \fn void QItemSelectionModel::currentChanged(const QModelIndex &current, const QModelIndex &previous)
 
-   This signal is emitted whenever the current item changes. The \a previous
-   model item index is replaced by the \a current index as the selection's
-   current item.
+    This signal is emitted whenever the current item changes. The \a previous
+    model item index is replaced by the \a current index as the selection's
+    current item.
 
-   Note that this signal will not be emitted when the item model is reset.
+    Note that this signal will not be emitted when the item model is reset.
 
-   \sa currentIndex() setCurrentIndex() selectionChanged()
+    \sa currentIndex() setCurrentIndex() selectionChanged()
 */
 
 /*!
-   \fn void QItemSelectionModel::currentColumnChanged(const QModelIndex &current, const QModelIndex &previous)
+    \fn void QItemSelectionModel::currentColumnChanged(const QModelIndex &current, const QModelIndex &previous)
 
-   This signal is emitted if the \a current item changes and its column is
-   different to the column of the \a previous current item.
+    This signal is emitted if the \a current item changes and its column is
+    different to the column of the \a previous current item.
 
-   Note that this signal will not be emitted when the item model is reset.
+    Note that this signal will not be emitted when the item model is reset.
 
-   \sa currentChanged() currentRowChanged() currentIndex() setCurrentIndex()
+    \sa currentChanged() currentRowChanged() currentIndex() setCurrentIndex()
 */
 
 /*!
-   \fn void QItemSelectionModel::currentRowChanged(const QModelIndex &current, const QModelIndex &previous)
+    \fn void QItemSelectionModel::currentRowChanged(const QModelIndex &current, const QModelIndex &previous)
 
-   This signal is emitted if the \a current item changes and its row is
-   different to the row of the \a previous current item.
+    This signal is emitted if the \a current item changes and its row is
+    different to the row of the \a previous current item.
 
-   Note that this signal will not be emitted when the item model is reset.
+    Note that this signal will not be emitted when the item model is reset.
 
-   \sa currentChanged() currentColumnChanged() currentIndex() setCurrentIndex()
+    \sa currentChanged() currentColumnChanged() currentIndex() setCurrentIndex()
 */
 
 /*!
@@ -1002,32 +1001,32 @@ void QItemSelectionModel::select(const QModelIndex &index, QItemSelectionModel::
 */
 
 /*!
-  \enum QItemSelectionModel::SelectionFlag
+    \enum QItemSelectionModel::SelectionFlag
 
-  This enum describes the way the selection model will be updated.
+    This enum describes the way the selection model will be updated.
 
-  \value NoUpdate       No selection will be made.
-  \value Clear          The complete selection will be cleared.
-  \value Select         All specified indexes will be selected.
-  \value Deselect       All specified indexes will be deselected.
-  \value Toggle         All specified indexes will be selected or
-                        deselected depending on their current state.
-  \value Current        The current selection will be updated.
-  \value Rows           All indexes will be expanded to span rows.
-  \value Columns        All indexes will be expanded to span columns.
-  \value SelectCurrent  A combination of Select and Current, provided for
-                        convenience.
-  \value ToggleCurrent  A combination of Toggle and Current, provided for
-                        convenience.
-  \value ClearAndSelect A combination of Clear and Select, provided for
-                        convenience.
+    \value NoUpdate       No selection will be made.
+    \value Clear          The complete selection will be cleared.
+    \value Select         All specified indexes will be selected.
+    \value Deselect       All specified indexes will be deselected.
+    \value Toggle         All specified indexes will be selected or
+                          deselected depending on their current state.
+    \value Current        The current selection will be updated.
+    \value Rows           All indexes will be expanded to span rows.
+    \value Columns        All indexes will be expanded to span columns.
+    \value SelectCurrent  A combination of Select and Current, provided for
+                          convenience.
+    \value ToggleCurrent  A combination of Toggle and Current, provided for
+                          convenience.
+    \value ClearAndSelect A combination of Clear and Select, provided for
+                          convenience.
 */
 
 /*!
-  Selects the item \a selection using the specified \a command, and emits
-  selectionChanged().
+    Selects the item \a selection using the specified \a command, and emits
+    selectionChanged().
 
-  \sa QItemSelectionModel::SelectionFlag
+    \sa QItemSelectionModel::SelectionFlag
 */
 void QItemSelectionModel::select(const QItemSelection &selection, QItemSelectionModel::SelectionFlags command)
 {
@@ -1067,7 +1066,7 @@ void QItemSelectionModel::select(const QItemSelection &selection, QItemSelection
 }
 
 /*!
-  Clears the selection model. Emits selectionChanged() and currentChanged().
+    Clears the selection model. Emits selectionChanged() and currentChanged().
 */
 void QItemSelectionModel::clear()
 {
@@ -1083,7 +1082,7 @@ void QItemSelectionModel::clear()
 }
 
 /*!
-  Clears the selection model. Does not emit any signals.
+    Clears the selection model. Does not emit any signals.
 */
 void QItemSelectionModel::reset()
 {
@@ -1093,8 +1092,8 @@ void QItemSelectionModel::reset()
 }
 
 /*!
-  \since 4.2
-  Clears the selection in the selection model. Emits selectionChanged().
+    \since 4.2
+    Clears the selection in the selection model. Emits selectionChanged().
 */
 void QItemSelectionModel::clearSelection()
 {
@@ -1110,14 +1109,14 @@ void QItemSelectionModel::clearSelection()
 
 
 /*!
-  Sets the model item \a index to be the current item, and emits
-  currentChanged(). The current item is used for keyboard navigation and
-  focus indication; it is independent of any selected items, although a
-  selected item can also be the current item.
+    Sets the model item \a index to be the current item, and emits
+    currentChanged(). The current item is used for keyboard navigation and
+    focus indication; it is independent of any selected items, although a
+    selected item can also be the current item.
 
-  Depending on the specified \a command, the \a index can also become part
-  of the current selection.
-  \sa select()
+    Depending on the specified \a command, the \a index can also become part
+    of the current selection.
+    \sa select()
 */
 void QItemSelectionModel::setCurrentIndex(const QModelIndex &index, QItemSelectionModel::SelectionFlags command)
 {
@@ -1141,8 +1140,8 @@ void QItemSelectionModel::setCurrentIndex(const QModelIndex &index, QItemSelecti
 }
 
 /*!
-  Returns the model item index for the current item, or an invalid index
-  if there is no current item.
+    Returns the model item index for the current item, or an invalid index
+    if there is no current item.
 */
 QModelIndex QItemSelectionModel::currentIndex() const
 {
@@ -1150,7 +1149,7 @@ QModelIndex QItemSelectionModel::currentIndex() const
 }
 
 /*!
-  Returns true if the given model item \a index is selected.
+    Returns true if the given model item \a index is selected.
 */
 bool QItemSelectionModel::isSelected(const QModelIndex &index) const
 {
@@ -1187,12 +1186,12 @@ bool QItemSelectionModel::isSelected(const QModelIndex &index) const
 }
 
 /*!
-  Returns true if all items are selected in the \a row with the given
-  \a parent.
+    Returns true if all items are selected in the \a row with the given
+    \a parent.
 
-  Note that this function is usually faster than calling isSelected()
-  on all items in the same row and that unselectable items are
-  ignored.
+    Note that this function is usually faster than calling isSelected()
+    on all items in the same row and that unselectable items are
+    ignored.
 */
 bool QItemSelectionModel::isRowSelected(int row, const QModelIndex &parent) const
 {
@@ -1247,12 +1246,12 @@ bool QItemSelectionModel::isRowSelected(int row, const QModelIndex &parent) cons
 }
 
 /*!
-  Returns true if all items are selected in the \a column with the given
-  \a parent.
+    Returns true if all items are selected in the \a column with the given
+    \a parent.
 
-  Note that this function is usually faster than calling isSelected()
-  on all items in the same column and that unselectable items are
-  ignored.
+    Note that this function is usually faster than calling isSelected()
+    on all items in the same column and that unselectable items are
+    ignored.
 */
 bool QItemSelectionModel::isColumnSelected(int column, const QModelIndex &parent) const
 {
@@ -1307,8 +1306,8 @@ bool QItemSelectionModel::isColumnSelected(int column, const QModelIndex &parent
 }
 
 /*!
-  Returns true if there are any  items selected in the \a row with the given
-  \a parent.
+    Returns true if there are any items selected in the \a row with the given
+    \a parent.
 */
 bool QItemSelectionModel::rowIntersectsSelection(int row, const QModelIndex &parent) const
 {
@@ -1336,8 +1335,8 @@ bool QItemSelectionModel::rowIntersectsSelection(int row, const QModelIndex &par
 }
 
 /*!
-  Returns true if there are any  items selected in the \a column with the given
-  \a parent.
+    Returns true if there are any items selected in the \a column with the given
+    \a parent.
 */
 bool QItemSelectionModel::columnIntersectsSelection(int column, const QModelIndex &parent) const
 {
@@ -1377,15 +1376,14 @@ bool QItemSelectionModel::hasSelection() const
         QItemSelection sel = d->ranges;
         sel.merge(d->currentSelection, d->currentCommand);
         return !sel.isEmpty();
-    }
-    else {
+    } else {
         return !(d->ranges.isEmpty() && d->currentSelection.isEmpty());
     }
 }
 
 /*!
-  Returns a list of all selected model item indexes. The list contains no
-  duplicates, and is not sorted.
+    Returns a list of all selected model item indexes. The list contains no
+    duplicates, and is not sorted.
 */
 QModelIndexList QItemSelectionModel::selectedIndexes() const
 {
@@ -1396,10 +1394,10 @@ QModelIndexList QItemSelectionModel::selectedIndexes() const
 }
 
 /*!
-  \since 4.2
-  Returns the indexes in the given \a column for the rows where all columns are selected.
+    \since 4.2
+    Returns the indexes in the given \a column for the rows where all columns are selected.
 
-  \sa selectedIndexes(), selectedColumns()
+    \sa selectedIndexes(), selectedColumns()
 */
 
 QModelIndexList QItemSelectionModel::selectedRows(int column) const
@@ -1460,7 +1458,7 @@ QModelIndexList QItemSelectionModel::selectedColumns(int row) const
 }
 
 /*!
-  Returns the selection ranges stored in the selection model.
+    Returns the selection ranges stored in the selection model.
 */
 const QItemSelection QItemSelectionModel::selection() const
 {
@@ -1480,7 +1478,7 @@ const QItemSelection QItemSelectionModel::selection() const
 }
 
 /*!
-  Returns the item model operated on by the selection model.
+    Returns the item model operated on by the selection model.
 */
 const QAbstractItemModel *QItemSelectionModel::model() const
 {
@@ -1488,8 +1486,8 @@ const QAbstractItemModel *QItemSelectionModel::model() const
 }
 
 /*!
-  Compares the two selections \a newSelection and \a oldSelection
-  and emits selectionChanged() with the deselected and selected items.
+    Compares the two selections \a newSelection and \a oldSelection
+    and emits selectionChanged() with the deselected and selected items.
 */
 void QItemSelectionModel::emitSelectionChanged(const QItemSelection &newSelection,
                                                const QItemSelection &oldSelection)
diff --git a/src/gui/itemviews/qlistwidget.cpp b/src/gui/itemviews/qlistwidget.cpp
index 7113217..2565657 100644
--- a/src/gui/itemviews/qlistwidget.cpp
+++ b/src/gui/itemviews/qlistwidget.cpp
@@ -561,6 +561,13 @@ Qt::DropActions QListModel::supportedDropActions() const
     given \a parent.
     If the parent is not specified, the item will need to be inserted into a
     list widget with QListWidget::insertItem().
+    
+    \note that this constructor inserts this same object into the model of 
+    the parent that is passed to the constructor. If the model is sorted then 
+    the behavior of the insert is undetermined since the model will call 
+    the '<' operator method on this object which has still not yet been 
+    constructed. In this case it would be better not to specify the parent
+    and use the QListWidget::insertItem method to insert the item instead.
 
     \sa type()
 */
@@ -582,6 +589,13 @@ QListWidgetItem::QListWidgetItem(QListWidget *view, int type)
     given \a text and \a parent.
     If the parent is not specified, the item will need to be inserted into a
     list widget with QListWidget::insertItem().
+    
+    \note that this constructor inserts this same object into the model of 
+    the parent that is passed to the constructor. If the model is sorted then 
+    the behavior of the insert is undetermined since the model will call 
+    the '<' operator method on this object which has still not yet been 
+    constructed. In this case it would be better not to specify the parent
+    and use the QListWidget::insertItem method to insert the item instead.
 
     \sa type()
 */
@@ -605,7 +619,14 @@ QListWidgetItem::QListWidgetItem(const QString &text, QListWidget *view, int typ
     given \a icon, \a text and \a parent.
     If the parent is not specified, the item will need to be inserted into a
     list widget with QListWidget::insertItem().
-
+    
+    \note that this constructor inserts this same object into the model of 
+    the parent that is passed to the constructor. If the model is sorted then 
+    the behavior of the insert is undetermined since the model will call 
+    the '<' operator method on this object which has still not yet been 
+    constructed. In this case it would be better not to specify the parent
+    and use the QListWidget::insertItem method to insert the item instead.
+    
     \sa type()
 */
 QListWidgetItem::QListWidgetItem(const QIcon &icon,const QString &text,
@@ -1268,7 +1289,7 @@ void QListWidgetPrivate::_q_dataChanged(const QModelIndex &topLeft,
 
     This signal is emitted whenever the selection changes.
 
-    \sa selectedItems() isItemSelected() currentItemChanged()
+    \sa selectedItems() QListWidgetItem::isSelected() currentItemChanged()
 */
 
 /*!
diff --git a/src/gui/itemviews/qtablewidget.cpp b/src/gui/itemviews/qtablewidget.cpp
index d975d58..5756f35 100644
--- a/src/gui/itemviews/qtablewidget.cpp
+++ b/src/gui/itemviews/qtablewidget.cpp
@@ -1719,7 +1719,7 @@ void QTableWidgetPrivate::_q_dataChanged(const QModelIndex &topLeft,
 
     This signal is emitted whenever the selection changes.
 
-    \sa selectedItems() isItemSelected()
+    \sa selectedItems() QTableWidgetItem::isSelected()
 */
 
 
diff --git a/src/gui/itemviews/qtreewidget.cpp b/src/gui/itemviews/qtreewidget.cpp
index ccfa568..e724a7d 100644
--- a/src/gui/itemviews/qtreewidget.cpp
+++ b/src/gui/itemviews/qtreewidget.cpp
@@ -2437,7 +2437,7 @@ void QTreeWidgetPrivate::_q_dataChanged(const QModelIndex &topLeft,
     \note This signal will not be emitted if an item changes its state when
     expandAll() is invoked.
 
-    \sa isItemExpanded(), itemCollapsed(), expandItem()
+    \sa QTreeWidgetItem::isExpanded(), itemCollapsed(), expandItem()
 */
 
 /*!
@@ -2449,7 +2449,7 @@ void QTreeWidgetPrivate::_q_dataChanged(const QModelIndex &topLeft,
     \note This signal will not be emitted if an item changes its state when
     collapseAll() is invoked.
 
-    \sa isItemExpanded(), itemExpanded(), collapseItem()
+    \sa QTreeWidgetItem::isExpanded(), itemExpanded(), collapseItem()
 */
 
 /*!
@@ -3109,9 +3109,9 @@ bool QTreeWidget::isItemExpanded(const QTreeWidgetItem *item) const
 
     \sa expandItem(), collapseItem(), itemExpanded()
 
-  \obsolete
+    \obsolete
 
-  This function is deprecated. Use \l{QTreeWidgetItem::setExpanded()} instead.
+    This function is deprecated. Use \l{QTreeWidgetItem::setExpanded()} instead.
 */
 void QTreeWidget::setItemExpanded(const QTreeWidgetItem *item, bool expand)
 {
diff --git a/src/gui/kernel/qcocoaview_mac.mm b/src/gui/kernel/qcocoaview_mac.mm
index 3e5bfb6..57c9117 100644
--- a/src/gui/kernel/qcocoaview_mac.mm
+++ b/src/gui/kernel/qcocoaview_mac.mm
@@ -200,6 +200,7 @@ extern "C" {
     composingText = new QString();
     composing = false;
     sendKeyEvents = true;
+    inKeyDown = false;
     currentCustomTypes = 0;
     [self setHidden:YES];
     return self;
@@ -983,6 +984,7 @@ extern "C" {
 
 - (void)keyDown:(NSEvent *)theEvent
 {
+    inKeyDown = true;
     sendKeyEvents = true;
 
     QWidget *widgetToGetKey = qwidget;
@@ -1002,6 +1004,7 @@ extern "C" {
         if (!keyOK && !sendToPopup)
             [super keyDown:theEvent];
     }
+    inKeyDown = false;
 }
 
 
@@ -1039,20 +1042,36 @@ extern "C" {
 
 - (void) insertText:(id)aString
 {
+    QString commitText;
     if ([aString length]) {
-        // Send the commit string to the widget.
-        QString commitText;
         if ([aString isKindOfClass:[NSAttributedString class]]) {
-           commitText = QCFString::toQString(reinterpret_cast<CFStringRef>([aString string]));
+            commitText = QCFString::toQString(reinterpret_cast<CFStringRef>([aString string]));
         } else {
             commitText = QCFString::toQString(reinterpret_cast<CFStringRef>(aString));
         };
+    }
+
+    if ([aString length] && !inKeyDown) {
+        // Handle the case where insertText is called from somewhere else than the keyDown
+        // implementation, for example when inserting text from the character palette.
+        QInputMethodEvent e;
+        e.setCommitString(commitText);
+        qt_sendSpontaneousEvent(qwidget, &e);
+    } else if ([aString length] && composing) {
+        // Send the commit string to the widget.
         composing = false;
         sendKeyEvents = false;
         QInputMethodEvent e;
         e.setCommitString(commitText);
         qt_sendSpontaneousEvent(qwidget, &e);
+    } else {
+        // The key sequence "`q" on a French Keyboard will generate two calls to insertText before
+        // it returns from interpretKeyEvents. The first call will turn off 'composing' and accept
+        // the "`" key. The last keyDown event needs to be processed by the widget to get the
+        // character "q". The string parameter is ignored for the second call.
+        sendKeyEvents = true;
     }
+
     composingText->clear();
 }
 
diff --git a/src/gui/kernel/qcocoaview_mac_p.h b/src/gui/kernel/qcocoaview_mac_p.h
index 4762b17..932c6ca 100644
--- a/src/gui/kernel/qcocoaview_mac_p.h
+++ b/src/gui/kernel/qcocoaview_mac_p.h
@@ -85,6 +85,7 @@ Q_GUI_EXPORT
     bool composing;
     int composingLength;
     bool sendKeyEvents;
+    bool inKeyDown;
     QString *composingText;
     QStringList *currentCustomTypes;
     NSInteger dragEnterSequence;
diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp
index a035acf..8046a63 100644
--- a/src/gui/kernel/qevent.cpp
+++ b/src/gui/kernel/qevent.cpp
@@ -714,8 +714,9 @@ QWheelEvent::QWheelEvent(const QPoint &pos, const QPoint& globalPos, int delta,
     The QWidget::setEnable() function can be used to enable or disable
     mouse and keyboard events for a widget.
 
-    The event handlers QWidget::keyPressEvent() and
-    QWidget::keyReleaseEvent() receive key events.
+    The event handlers QWidget::keyPressEvent(), QWidget::keyReleaseEvent(),
+    QGraphicsItem::keyPressEvent() and QGraphicsItem::keyReleaseEvent()
+    receive key events.
 
     \sa QFocusEvent, QWidget::grabKeyboard()
 */
@@ -1031,8 +1032,9 @@ bool QKeyEvent::matches(QKeySequence::StandardKey matchKey) const
     The reason for a particular focus event is returned by reason()
     in the appropriate event handler.
 
-    The event handlers QWidget::focusInEvent() and
-    QWidget::focusOutEvent() receive focus events.
+    The event handlers QWidget::focusInEvent(),
+    QWidget::focusOutEvent(), QGraphicsItem::focusInEvent and
+    QGraphicsItem::focusOutEvent() receive focus events.
 
     \sa QWidget::setFocus(), QWidget::setFocusPolicy(), {Keyboard Focus}
 */
@@ -1650,12 +1652,14 @@ Qt::ButtonState QContextMenuEvent::state() const
     string is controlled by the widget only). The AttributeType enum
     describes the different attributes that can be set.
 
-    A class implementing QWidget::inputMethodEvent() should at least
-    understand and honor the \l TextFormat and \l Cursor attributes.
+    A class implementing QWidget::inputMethodEvent() or 
+    QGraphicsItem::inputMethodEvent() should at least understand and
+    honor the \l TextFormat and \l Cursor attributes.
 
     Since input methods need to be able to query certain properties
-    from the widget, the widget must also implement
-    QWidget::inputMethodQuery().
+    from the widget or graphics item, subclasses must also implement
+    QWidget::inputMethodQuery() and QGraphicsItem::inputMethodQuery(),
+    respectively.
 
     When receiving an input method event, the text widget has to performs the
     following steps:
diff --git a/src/gui/kernel/qeventdispatcher_mac.mm b/src/gui/kernel/qeventdispatcher_mac.mm
index cde0c47..af36d9f 100644
--- a/src/gui/kernel/qeventdispatcher_mac.mm
+++ b/src/gui/kernel/qeventdispatcher_mac.mm
@@ -506,16 +506,6 @@ bool QEventDispatcherMac::processEvents(QEventLoop::ProcessEventsFlags flags)
     wakeUp();
     emit awake();
 
-#ifndef QT_MAC_NO_QUICKDRAW
-    if(!qt_mac_safe_pdev) { //create an empty widget and this can be used for a port anytime
-        QWidget *tlw = new QWidget;
-        tlw->setAttribute(Qt::WA_DeleteOnClose);
-        tlw->setObjectName(QLatin1String("empty_widget"));
-        tlw->hide();
-        qt_mac_safe_pdev = tlw;
-    }
-#endif
-
     bool retVal = false;
     forever {
         if (d->interrupt)
diff --git a/src/gui/kernel/qgridlayout.cpp b/src/gui/kernel/qgridlayout.cpp
index 8dbc3cb..7ac874e 100644
--- a/src/gui/kernel/qgridlayout.cpp
+++ b/src/gui/kernel/qgridlayout.cpp
@@ -1034,14 +1034,15 @@ QRect QGridLayoutPrivate::cellRect(int row, int col) const
     other layouts into the cells of your grid layout using
     addWidget(), addItem(), and addLayout().
 
-    QGridLayout also includes two margin widths: the margin() and the
-    spacing(). The margin is the width of the reserved space along
-    each of the QGridLayout's four sides. The spacing is the width of
-    the automatically allocated spacing between neighboring boxes.
-
-    The default margin() and spacing() values are provided by the
-    style. The default margin Qt styles specify is 9 for child
-    widgets and 11 for windows. The spacing defaults to the same as
+    QGridLayout also includes two margin widths:
+    the \l{getContentsMargins()}{contents margin} and the spacing().
+    The contents margin is the width of the reserved space along each
+    of the QGridLayout's four sides. The spacing() is the width of the
+    automatically allocated spacing between neighboring boxes.
+
+    The default contents margin values are provided by the
+    \l{QStyle::pixelMetric()}{style}. The default value Qt styles specify
+    is 9 for child widgets and 11 for windows. The spacing defaults to the same as
     the margin width for a top-level layout, or to the same as the
     parent layout.
 
@@ -1078,7 +1079,7 @@ QGridLayout::QGridLayout()
 
 #ifdef QT3_SUPPORT
 /*!
-  \obsolete
+    \obsolete
     Constructs a new QGridLayout with \a nRows rows, \a nCols columns
     and parent widget, \a  parent. \a parent may not be 0. The grid
     layout is called \a name.
diff --git a/src/gui/kernel/qkeymapper_mac.cpp b/src/gui/kernel/qkeymapper_mac.cpp
index 017c13c..8eee665 100644
--- a/src/gui/kernel/qkeymapper_mac.cpp
+++ b/src/gui/kernel/qkeymapper_mac.cpp
@@ -729,8 +729,10 @@ bool QKeyMapperPrivate::translateKeyEvent(QWidget *widget, EventHandlerCallRef e
     QString text(ourChar);
     /* This is actually wrong - but unfortunatly it is the best that can be
        done for now because of the Control/Meta mapping problems */
-    if (modifiers & (Qt::ControlModifier | Qt::MetaModifier))
+    if (modifiers & (Qt::ControlModifier | Qt::MetaModifier)
+        && !qApp->testAttribute(Qt::AA_MacDontSwapCtrlAndMeta)) {
         text = QString();
+    }
 
 
     if (widget) {
diff --git a/src/gui/kernel/qt_cocoa_helpers_mac.mm b/src/gui/kernel/qt_cocoa_helpers_mac.mm
index 223e36b..1c4177e 100644
--- a/src/gui/kernel/qt_cocoa_helpers_mac.mm
+++ b/src/gui/kernel/qt_cocoa_helpers_mac.mm
@@ -74,6 +74,7 @@
 ****************************************************************************/
 
 #include <private/qcore_mac_p.h>
+#include <qaction.h>
 #include <qwidget.h>
 #include <qdesktopwidget.h>
 #include <qevent.h>
@@ -1068,6 +1069,17 @@ void qt_mac_updateContentBorderMetricts(void * /*OSWindowRef */window, const ::H
 #endif
 }
 
+void qt_mac_showBaseLineSeparator(void * /*OSWindowRef */window, bool show)
+{
+#if QT_MAC_USE_COCOA
+    QMacCocoaAutoReleasePool pool;
+    OSWindowRef theWindow = static_cast<OSWindowRef>(window);
+    NSToolbar *macToolbar = [theWindow toolbar];
+    if (macToolbar)
+        [macToolbar setShowsBaselineSeparator: show];
+#endif
+}
+
 QStringList qt_mac_NSArrayToQStringList(void *nsarray)
 {
     QStringList result;
@@ -1193,4 +1205,32 @@ void qt_mac_constructQIconFromIconRef(const IconRef icon, const IconRef overlayI
     }
 }
 
+void qt_mac_menu_collapseSeparators(void */*NSMenu **/ theMenu, bool collapse)
+{
+    OSMenuRef menu = static_cast<OSMenuRef>(theMenu);
+    if (collapse) {
+        bool previousIsSeparator = true; // setting to true kills all the separators placed at the top.
+        NSMenuItem *previousItem = nil;
+        for (NSMenuItem *item in [menu itemArray]) {
+            if ([item isSeparatorItem]) {
+                [item setHidden:previousIsSeparator];
+            }
+
+            if (![item isHidden]) {
+                previousItem = item;
+                previousIsSeparator = ([previousItem isSeparatorItem]);
+            }
+        }
+
+        // We now need to check the final item since we don't want any separators at the end of the list.
+        if (previousItem && previousIsSeparator)
+            [previousItem setHidden:YES];
+    } else {
+        for (NSMenuItem *item in [menu itemArray]) {
+            if (QAction *action = reinterpret_cast<QAction *>([item tag]))
+                [item setHidden:!action->isVisible()];
+        }
+    }
+}
+
 QT_END_NAMESPACE
diff --git a/src/gui/kernel/qt_cocoa_helpers_mac_p.h b/src/gui/kernel/qt_cocoa_helpers_mac_p.h
index af3b4cb..741edd6 100644
--- a/src/gui/kernel/qt_cocoa_helpers_mac_p.h
+++ b/src/gui/kernel/qt_cocoa_helpers_mac_p.h
@@ -125,6 +125,7 @@ void macWindowSetHasShadow( void * /*OSWindowRef*/ window, bool hasShadow );
 void macWindowFlush(void * /*OSWindowRef*/ window);
 void macSendToolbarChangeEvent(QWidget *widget);
 void qt_mac_updateContentBorderMetricts(void * /*OSWindowRef */window, const ::HIContentBorderMetrics &metrics);
+void qt_mac_showBaseLineSeparator(void * /*OSWindowRef */window, bool show);
 void * /*NSImage */qt_mac_create_nsimage(const QPixmap &pm);
 void qt_mac_update_mouseTracking(QWidget *widget);
 OSStatus qt_mac_drawCGImage(CGContextRef cg, const CGRect *inbounds, CGImageRef);
@@ -133,6 +134,7 @@ void qt_dispatchTabletProximityEvent(void * /*NSEvent * */ tabletEvent);
 #ifdef QT_MAC_USE_COCOA
 bool qt_dispatchKeyEventWithCocoa(void * /*NSEvent * */ keyEvent, QWidget *widgetToGetEvent);
 #endif
+void qt_mac_menu_collapseSeparators(void * /*NSMenu */ menu, bool collapse);
 bool qt_dispatchKeyEvent(void * /*NSEvent * */ keyEvent, QWidget *widgetToGetEvent);
 void qt_dispatchModifiersChanged(void * /*NSEvent * */flagsChangedEvent, QWidget *widgetToGetEvent);
 void qt_mac_dispatchNCMouseMessage(void */* NSWindow* */eventWindow, void */* NSEvent* */mouseEvent, 
diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm
index 1717fbd..70eea3a 100644
--- a/src/gui/kernel/qwidget_mac.mm
+++ b/src/gui/kernel/qwidget_mac.mm
@@ -1116,23 +1116,9 @@ OSStatus QWidgetPrivate::qt_widget_event(EventHandlerCallRef er, EventRef event,
                 //update handles
                 GrafPtr qd = 0;
                 CGContextRef cg = 0;
-#ifndef QT_MAC_NO_QUICKDRAW
-                {
-                    if(GetEventParameter(event, kEventParamGrafPort, typeGrafPtr, 0, sizeof(qd), 0, &qd) != noErr) {
-                        GDHandle dev = 0;
-                        GetGWorld(&qd, &dev); //just use the global port..
-                    }
-                }
-                bool end_cg_context = false;
-                if(GetEventParameter(event, kEventParamCGContextRef, typeCGContextRef, 0, sizeof(cg), 0, &cg) != noErr && qd) {
-                    end_cg_context = true;
-                    QDBeginCGContext(qd, &cg);
-                }
-#else
                 if(GetEventParameter(event, kEventParamCGContextRef, typeCGContextRef, 0, sizeof(cg), 0, &cg) != noErr) {
                     Q_ASSERT(false);
                 }
-#endif
                 widget->d_func()->hd = cg;
                 widget->d_func()->qd_hd = qd;
                 CGContextSaveGState(cg);
@@ -1252,10 +1238,6 @@ OSStatus QWidgetPrivate::qt_widget_event(EventHandlerCallRef er, EventRef event,
                 widget->d_func()->hd = 0;
                 widget->d_func()->qd_hd = 0;
                 CGContextRestoreGState(cg);
-#ifndef QT_MAC_NO_QUICKDRAW
-                if(end_cg_context)
-                    QDEndCGContext(qd, &cg);
-#endif
             } else if(!HIObjectIsOfClass((HIObjectRef)hiview, kObjectQWidget)) {
                 CallNextEventHandler(er, event);
             }
diff --git a/src/gui/math3d/qvector3d.cpp b/src/gui/math3d/qvector3d.cpp
index 881f47c..c1f5a3e 100644
--- a/src/gui/math3d/qvector3d.cpp
+++ b/src/gui/math3d/qvector3d.cpp
@@ -513,7 +513,8 @@ QVector4D QVector3D::toVector4D() const
 /*!
     \fn QPoint QVector3D::toPoint() const
 
-    Returns the QPoint form of this 3D vector.
+    Returns the QPoint form of this 3D vector. The z coordinate
+    is dropped.
 
     \sa toPointF(), toVector2D()
 */
@@ -521,7 +522,8 @@ QVector4D QVector3D::toVector4D() const
 /*!
     \fn QPointF QVector3D::toPointF() const
 
-    Returns the QPointF form of this 3D vector.
+    Returns the QPointF form of this 3D vector. The z coordinate
+    is dropped.
 
     \sa toPoint(), toVector2D()
 */
diff --git a/src/gui/math3d/qvector4d.cpp b/src/gui/math3d/qvector4d.cpp
index 1a84db6..ae03bc7 100644
--- a/src/gui/math3d/qvector4d.cpp
+++ b/src/gui/math3d/qvector4d.cpp
@@ -484,7 +484,8 @@ QVector3D QVector4D::toVector3DAffine() const
 /*!
     \fn QPoint QVector4D::toPoint() const
 
-    Returns the QPoint form of this 4D vector.
+    Returns the QPoint form of this 4D vector. The z and w coordinates
+    are dropped.
 
     \sa toPointF(), toVector2D()
 */
@@ -492,7 +493,8 @@ QVector3D QVector4D::toVector3DAffine() const
 /*!
     \fn QPointF QVector4D::toPointF() const
 
-    Returns the QPointF form of this 4D vector.
+    Returns the QPointF form of this 4D vector. The z and w coordinates
+    are dropped.
 
     \sa toPoint(), toVector2D()
 */
diff --git a/src/gui/painting/qmatrix.cpp b/src/gui/painting/qmatrix.cpp
index 221267f..39f4d95 100644
--- a/src/gui/painting/qmatrix.cpp
+++ b/src/gui/painting/qmatrix.cpp
@@ -55,11 +55,15 @@ QT_BEGIN_NAMESPACE
     \class QMatrix
     \brief The QMatrix class specifies 2D transformations of a
     coordinate system.
+    \obsolete
 
     \ingroup multimedia
 
     A matrix specifies how to translate, scale, shear or rotate the
     coordinate system, and is typically used when rendering graphics.
+    QMatrix, in contrast to QTransform, does not allow perspective
+    transformations. QTransform is the recommended transformation
+    class in Qt.
 
     A QMatrix object can be built using the setMatrix(), scale(),
     rotate(), translate() and shear() functions.  Alternatively, it
@@ -172,8 +176,8 @@ QT_BEGIN_NAMESPACE
     \snippet doc/src/snippets/matrix/matrix.cpp 2
     \endtable
 
-    \sa QPainter, {The Coordinate System}, {demos/affine}{Affine
-    Transformations Demo}, {Transformations Example}
+    \sa QPainter, QTransform, {The Coordinate System}, 
+    {demos/affine}{Affine Transformations Demo}, {Transformations Example}
 */
 
 
diff --git a/src/gui/painting/qpaintengine_mac_p.h b/src/gui/painting/qpaintengine_mac_p.h
index 755b7b1..20a4a08 100644
--- a/src/gui/painting/qpaintengine_mac_p.h
+++ b/src/gui/painting/qpaintengine_mac_p.h
@@ -58,9 +58,6 @@
 #include "private/qpaintengine_p.h"
 #include "private/qpolygonclipper_p.h"
 #include "QtCore/qhash.h"
-#ifndef QT_MAC_NO_QUICKDRAW
-#include <private/qwidget_p.h>
-#endif
 
 typedef struct CGColorSpace *CGColorSpaceRef;
 QT_BEGIN_NAMESPACE
@@ -69,108 +66,6 @@ extern int qt_defaultDpi();
 extern int qt_defaultDpiX();
 extern int qt_defaultDpiY();
 
-#ifndef QT_MAC_NO_QUICKDRAW
-class QMacSavedPortInfo
-{
-    RgnHandle clip;
-    GWorldPtr world;
-    GDHandle handle;
-    PenState pen; //go pennstate
-    RGBColor back, fore;
-    bool valid_gworld;
-    void init();
-
-public:
-    inline QMacSavedPortInfo() { init(); }
-    inline QMacSavedPortInfo(QPaintDevice *pd) { init(); setPaintDevice(pd); }
-    inline QMacSavedPortInfo(QPaintDevice *pd, const QRect &r)
-        { init(); setPaintDevice(pd); setClipRegion(r); }
-    inline QMacSavedPortInfo(QPaintDevice *pd, const QRegion &r)
-        { init(); setPaintDevice(pd); setClipRegion(r); }
-    ~QMacSavedPortInfo();
-    static inline bool setClipRegion(const QRect &r);
-    static inline bool setClipRegion(const QRegion &r);
-    static inline bool setPaintDevice(QPaintDevice *);
-};
-
-inline bool
-QMacSavedPortInfo::setClipRegion(const QRect &rect)
-{
-    Rect r;
-    SetRect(&r, rect.x(), rect.y(), rect.right()+1, rect.bottom()+1);
-    ClipRect(&r);
-    return true;
-}
-
-inline bool
-QMacSavedPortInfo::setClipRegion(const QRegion &r)
-{
-    if(r.isEmpty())
-        return setClipRegion(QRect());
-    QMacSmartQuickDrawRegion rgn(r.toQDRgn());
-    SetClip(rgn);
-    return true;
-}
-
-inline bool
-QMacSavedPortInfo::setPaintDevice(QPaintDevice *pd)
-{
-    if(!pd)
-        return false;
-    bool ret = true;
-    extern GrafPtr qt_mac_qd_context(const QPaintDevice *); // qpaintdevice_mac.cpp
-    if(pd->devType() == QInternal::Widget)
-        SetPortWindowPort(qt_mac_window_for(static_cast<QWidget*>(pd)));
-    else if(pd->devType() == QInternal::Pixmap || pd->devType() == QInternal::Printer)
-        SetGWorld((GrafPtr)qt_mac_qd_context(pd), 0); //set the gworld
-    return ret;
-}
-
-inline void
-QMacSavedPortInfo::init()
-{
-    GetBackColor(&back);
-    GetForeColor(&fore);
-    GetGWorld(&world, &handle);
-    valid_gworld = true;
-    clip = NewRgn();
-    GetClip(clip);
-    GetPenState(&pen);
-}
-
-inline QMacSavedPortInfo::~QMacSavedPortInfo()
-{
-    bool set_state = false;
-    if(valid_gworld) {
-        set_state = IsValidPort(world);
-        if(set_state)
-            SetGWorld(world,handle); //always do this one first
-    } else {
-        setPaintDevice(qt_mac_safe_pdev);
-    }
-    if(set_state) {
-        SetClip(clip);
-        SetPenState(&pen);
-        RGBForeColor(&fore);
-        RGBBackColor(&back);
-    }
-    DisposeRgn(clip);
-}
-#else
-class QMacSavedPortInfo
-{
-public:
-    inline QMacSavedPortInfo() { }
-    inline QMacSavedPortInfo(QPaintDevice *) { }
-    inline QMacSavedPortInfo(QPaintDevice *, const QRect &) { }
-    inline QMacSavedPortInfo(QPaintDevice *, const QRegion &) { }
-    ~QMacSavedPortInfo() { }
-    static inline bool setClipRegion(const QRect &) { return false; }
-    static inline bool setClipRegion(const QRegion &) { return false; }
-    static inline bool setPaintDevice(QPaintDevice *) { return false; }
-};
-#endif
-
 class QCoreGraphicsPaintEnginePrivate;
 class QCoreGraphicsPaintEngine : public QPaintEngine
 {
diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp
index e9ff752..dfd3e16 100644
--- a/src/gui/painting/qpaintengine_raster.cpp
+++ b/src/gui/painting/qpaintengine_raster.cpp
@@ -1101,6 +1101,9 @@ void QRasterPaintEnginePrivate::systemStateChanged()
 #ifdef QT_DEBUG_DRAW
     qDebug() << "systemStateChanged" << this << "deviceRect" << deviceRect << clipRect << systemClip;
 #endif
+
+    exDeviceRect = deviceRect;
+
     Q_Q(QRasterPaintEngine);
     q->state()->strokeFlags |= QPaintEngine::DirtyClipRegion;
     q->state()->fillFlags |= QPaintEngine::DirtyClipRegion;
@@ -1708,11 +1711,30 @@ void QRasterPaintEngine::stroke(const QVectorPath &path, const QPen &pen)
     if (!s->penData.blend)
         return;
 
-    if (s->flags.fast_pen && path.shape() <= QVectorPath::NonCurvedShapeHint && s->lastPen.brush().isOpaque()) {
-        strokePolygonCosmetic((QPointF *) path.points(), path.elementCount(),
-                              path.hasImplicitClose()
-                              ? WindingMode
-                              : PolylineMode);
+    if (s->flags.fast_pen && path.shape() <= QVectorPath::NonCurvedShapeHint
+        && s->lastPen.brush().isOpaque()) {
+        int count = path.elementCount();
+        QPointF *points = (QPointF *) path.points();
+        const QPainterPath::ElementType *types = path.elements();
+        if (types) {
+            int first = 0;
+            int last;
+            while (first < count) {
+                while (first < count && types[first] != QPainterPath::MoveToElement) ++first;
+                last = first + 1;
+                while (last < count && types[last] == QPainterPath::LineToElement) ++last;
+                strokePolygonCosmetic(points + first, last - first,
+                                      path.hasImplicitClose() && last == count // only close last one..
+                                      ? WindingMode
+                                      : PolylineMode);
+                first = last;
+            }
+        } else {
+            strokePolygonCosmetic(points, count,
+                                  path.hasImplicitClose()
+                                  ? WindingMode
+                                  : PolylineMode);
+        }
 
     } else if (s->flags.non_complex_pen && path.shape() == QVectorPath::LinesHint) {
         qreal width = s->lastPen.isCosmetic()
diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp
index a4db284..797a5ab 100644
--- a/src/gui/painting/qpaintengineex.cpp
+++ b/src/gui/painting/qpaintengineex.cpp
@@ -364,12 +364,12 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen)
             d->activeStroker = 0;
         } else {
             // ### re-enable...
-//             if (pen.isCosmetic()) {
-//                 d->dashStroker->setClipRect(d->deviceRect);
-//             } else {
-//                 QRectF clipRect = s->matrix.inverted().mapRect(QRectF(d->deviceRect));
-//                 d->dashStroker->setClipRect(clipRect);
-//             }
+            if (pen.isCosmetic()) {
+                d->dasher.setClipRect(d->exDeviceRect);
+            } else {
+                QRectF clipRect = state()->matrix.inverted().mapRect(QRectF(d->exDeviceRect));
+                d->dasher.setClipRect(clipRect);
+            }
             d->dasher.setDashPattern(pen.dashPattern());
             d->dasher.setDashOffset(pen.dashOffset());
             d->activeStroker = &d->dasher;
diff --git a/src/gui/painting/qpaintengineex_p.h b/src/gui/painting/qpaintengineex_p.h
index d4e4862..7705cc1 100644
--- a/src/gui/painting/qpaintengineex_p.h
+++ b/src/gui/painting/qpaintengineex_p.h
@@ -225,6 +225,8 @@ public:
     StrokeHandler *strokeHandler;
     QStrokerOps *activeStroker;
     QPen strokerPen;
+
+    QRect exDeviceRect;
 };
 
 inline uint QVectorPath::polygonFlags(QPaintEngine::PolygonDrawMode mode) {
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp
index 34305c2..9c7a7fa 100644
--- a/src/gui/painting/qpainter.cpp
+++ b/src/gui/painting/qpainter.cpp
@@ -184,7 +184,7 @@ void QPainterPrivate::checkEmulation()
             extended = emulationEngine;
             extended->setState(state);
         }
-    } else if (emulationEngine && emulationEngine != extended) {
+    } else if (emulationEngine == extended) {
         extended = emulationEngine->real_engine;
     }
 }
@@ -1005,7 +1005,7 @@ void QPainterPrivate::updateState(QPainterState *newState)
     \o brushOrigin() defines the origin of the tiled brushes, normally
        the origin of widget's background.
 
-    \o viewport(), window(), worldMatrix() make up the painter's coordinate
+    \o viewport(), window(), worldTransform() make up the painter's coordinate
         transformation system. For more information, see the \l
         {Coordinate Transformations} section and the \l {The Coordinate
         System} documentation.
@@ -1016,7 +1016,7 @@ void QPainterPrivate::updateState(QPainterState *newState)
     \o layoutDirection() defines the layout direction used by the
        painter when drawing text.
 
-    \o matrixEnabled() tells whether world transformation is enabled.
+    \o worldMatrixEnabled() tells whether world transformation is enabled.
 
     \o viewTransformEnabled() tells whether view transformation is
         enabled.
@@ -1212,15 +1212,15 @@ void QPainterPrivate::updateState(QPainterState *newState)
     \endtable
 
     All the tranformation operations operate on the transformation
-    worldMatrix(). A matrix transforms a point in the plane to another
+    worldTransform(). A matrix transforms a point in the plane to another
     point. For more information about the transformation matrix, see
-    the \l {The Coordinate System} and QMatrix documentation.
+    the \l {The Coordinate System} and QTransform documentation.
 
-    The setWorldMatrix() function can replace or add to the currently
-    set worldMatrix(). The resetMatrix() function resets any
+    The setWorldTransform() function can replace or add to the currently
+    set worldTransform(). The resetTransform() function resets any
     transformations that were made using translate(), scale(),
-    shear(), rotate(), setWorldMatrix(), setViewport() and setWindow()
-    functions. The deviceMatrix() returns the matrix that transforms
+    shear(), rotate(), setWorldTransform(), setViewport() and setWindow()
+    functions. The deviceTransform() returns the matrix that transforms
     from logical coordinates to device coordinates of the platform
     dependent paint device. The latter function is only needed when
     using platform painting commands on the platform dependent handle,
@@ -1229,11 +1229,11 @@ void QPainterPrivate::updateState(QPainterState *newState)
     When drawing with QPainter, we specify points using logical
     coordinates which then are converted into the physical coordinates
     of the paint device. The mapping of the logical coordinates to the
-    physical coordinates are handled by QPainter's combinedMatrix(), a
-    combination of viewport() and window() and worldMatrix().  The
+    physical coordinates are handled by QPainter's combinedTransform(), a
+    combination of viewport() and window() and worldTransform(). The
     viewport() represents the physical coordinates specifying an
     arbitrary rectangle, the window() describes the same rectangle in
-    logical coordinates, and the worldMatrix() is identical with the
+    logical coordinates, and the worldTransform() is identical with the
     transformation matrix.
 
     See also \l {The Coordinate System} documentation.
@@ -2677,6 +2677,7 @@ void QPainter::setClipRegion(const QRegion &r, Qt::ClipOperation op)
 
 /*!
     \since 4.2
+    \obsolete
 
     Sets the transformation matrix to \a matrix and enables transformations.
 
@@ -2715,7 +2716,7 @@ void QPainter::setClipRegion(const QRegion &r, Qt::ClipOperation op)
     and window-viewport conversion, see \l {The Coordinate System}
     documentation.
 
-    \sa worldMatrixEnabled(), QMatrix
+    \sa setWorldTransform(), QTransform
 */
 
 void QPainter::setWorldMatrix(const QMatrix &matrix, bool combine)
@@ -2725,6 +2726,7 @@ void QPainter::setWorldMatrix(const QMatrix &matrix, bool combine)
 
 /*!
     \since 4.2
+    \obsolete
 
     Returns the world transformation matrix.
 
@@ -2774,6 +2776,7 @@ const QMatrix &QPainter::matrix() const
 
 /*!
     \since 4.2
+    \obsolete
 
     Returns the transformation matrix combining the current
     window/viewport and world transformation.
@@ -2781,7 +2784,7 @@ const QMatrix &QPainter::matrix() const
     It is advisable to use combinedTransform() instead of this
     function to preserve the properties of perspective transformations.
 
-    \sa setWorldMatrix(), setWindow(), setViewport()
+    \sa setWorldTransform(), setWindow(), setViewport()
 */
 QMatrix QPainter::combinedMatrix() const
 {
@@ -2790,6 +2793,8 @@ QMatrix QPainter::combinedMatrix() const
 
 
 /*!
+    \obsolete
+
     Returns the matrix that transforms from logical coordinates to
     device coordinates of the platform dependent paint device.
 
@@ -2817,6 +2822,8 @@ const QMatrix &QPainter::deviceMatrix() const
 }
 
 /*!
+    \obsolete
+
     Resets any transformations that were made using translate(), scale(),
     shear(), rotate(), setWorldMatrix(), setViewport() and
     setWindow().
@@ -2841,7 +2848,7 @@ void QPainter::resetMatrix()
     transformations if \a enable is false. The world transformation
     matrix is not changed.
 
-    \sa worldMatrixEnabled(), worldMatrix(), {QPainter#Coordinate
+    \sa worldMatrixEnabled(), worldTransform(), {QPainter#Coordinate
     Transformations}{Coordinate Transformations}
 */
 
@@ -2870,7 +2877,7 @@ void QPainter::setWorldMatrixEnabled(bool enable)
     Returns true if world transformation is enabled; otherwise returns
     false.
 
-    \sa setWorldMatrixEnabled(), worldMatrix(), {The Coordinate System}
+    \sa setWorldMatrixEnabled(), worldTransform(), {The Coordinate System}
 */
 
 bool QPainter::worldMatrixEnabled() const
@@ -2912,7 +2919,7 @@ bool QPainter::matrixEnabled() const
 /*!
     Scales the coordinate system by (\a{sx}, \a{sy}).
 
-    \sa setWorldMatrix() {QPainter#Coordinate Transformations}{Coordinate
+    \sa setWorldTransform() {QPainter#Coordinate Transformations}{Coordinate
     Transformations}
 */
 
@@ -2936,7 +2943,7 @@ void QPainter::scale(qreal sx, qreal sy)
 /*!
     Shears the coordinate system by (\a{sh}, \a{sv}).
 
-    \sa setWorldMatrix(), {QPainter#Coordinate Transformations}{Coordinate
+    \sa setWorldTransform(), {QPainter#Coordinate Transformations}{Coordinate
     Transformations}
 */
 
@@ -2962,7 +2969,7 @@ void QPainter::shear(qreal sh, qreal sv)
 
     Rotates the coordinate system the given \a angle clockwise.
 
-    \sa setWorldMatrix(), {QPainter#Coordinate Transformations}{Coordinate
+    \sa setWorldTransform(), {QPainter#Coordinate Transformations}{Coordinate
     Transformations}
 */
 
@@ -2987,7 +2994,7 @@ void QPainter::rotate(qreal a)
     Translates the coordinate system by the given \a offset; i.e. the
     given \a offset is added to points.
 
-    \sa setWorldMatrix(), {QPainter#Coordinate Transformations}{Coordinate
+    \sa setWorldTransform(), {QPainter#Coordinate Transformations}{Coordinate
     Transformations}
 */
 void QPainter::translate(const QPointF &offset)
@@ -6769,7 +6776,7 @@ QPainter::RenderHints QPainter::renderHints() const
     Returns true if view transformation is enabled; otherwise returns
     false.
 
-    \sa setViewTransformEnabled(), worldMatrix()
+    \sa setViewTransformEnabled(), worldTransform()
 */
 
 bool QPainter::viewTransformEnabled() const
@@ -6925,7 +6932,7 @@ QRect QPainter::viewport() const
 /*! \fn void QPainter::resetXForm()
     \compat
 
-    Use resetMatrix() instead.
+    Use resetTransform() instead.
 */
 
 /*! \fn void QPainter::setViewXForm(bool enabled)
@@ -6971,14 +6978,16 @@ void QPainter::setViewTransformEnabled(bool enable)
 #ifdef QT3_SUPPORT
 
 /*!
-    Use the worldMatrix() combined with QMatrix::dx() instead.
+    \obsolete
+
+    Use the worldTransform() combined with QTransform::dx() instead.
 
     \oldcode
         QPainter painter(this);
         qreal x = painter.translationX();
     \newcode
         QPainter painter(this);
-        qreal x = painter.worldMatrix().dx();
+        qreal x = painter.worldTransform().dx();
     \endcode
 */
 qreal QPainter::translationX() const
@@ -6992,14 +7001,16 @@ qreal QPainter::translationX() const
 }
 
 /*!
-    Use the worldMatrix() combined with QMatrix::dy() instead.
+    \obsolete
+
+    Use the worldTransform() combined with QTransform::dy() instead.
 
     \oldcode
         QPainter painter(this);
         qreal y = painter.translationY();
     \newcode
         QPainter painter(this);
-        qreal y = painter.worldMatrix().dy();
+        qreal y = painter.worldTransform().dy();
     \endcode
 */
 qreal QPainter::translationY() const
@@ -7097,7 +7108,7 @@ QPolygon QPainter::xForm(const QPolygon &a) const
         QPolygon transformed = painter.xForm(polygon, index, count)
     \newcode
         QPainter painter(this);
-        QPolygon transformed = polygon.mid(index, count) * painter.combinedMatrix();
+        QPolygon transformed = polygon.mid(index, count) * painter.combinedTransform();
     \endcode
 */
 
@@ -7112,15 +7123,16 @@ QPolygon QPainter::xForm(const QPolygon &av, int index, int npoints) const
 /*!
     \fn QPoint QPainter::xFormDev(const QPoint &point) const
     \overload
+    \obsolete
 
-    Use combinedTransform() combined with QMatrix::inverted() instead.
+    Use combinedTransform() combined with QTransform::inverted() instead.
 
     \oldcode
         QPainter painter(this);
         QPoint transformed = painter.xFormDev(point);
     \newcode
         QPainter painter(this);
-        QPoint transformed = point * painter.combinedMatrix().inverted();
+        QPoint transformed = point * painter.combinedTransform().inverted();
     \endcode
 */
 
@@ -7139,15 +7151,16 @@ QPoint QPainter::xFormDev(const QPoint &p) const
 /*!
     \fn QRect QPainter::xFormDev(const QRect &rectangle) const
     \overload
+    \obsolete
 
-    Use mapRect() combined with QMatrix::inverted() instead.
+    Use combinedTransform() combined with QTransform::inverted() instead.
 
     \oldcode
         QPainter painter(this);
         QRect transformed = painter.xFormDev(rectangle);
     \newcode
         QPainter painter(this);
-        QRect transformed = painter.combinedMatrix().inverted(rectangle);
+        QRect transformed = painter.combinedTransform().inverted(rectangle);
     \endcode
 */
 
@@ -7167,16 +7180,16 @@ QRect QPainter::xFormDev(const QRect &r)  const
     \overload
 
     \fn QPoint QPainter::xFormDev(const QPolygon &polygon) const
-    \overload
+    \obsolete
 
-    Use  combinedMatrix() combined with QMatrix::inverted() instead.
+    Use  combinedTransform() combined with QTransform::inverted() instead.
 
     \oldcode
         QPainter painter(this);
         QPolygon transformed = painter.xFormDev(rectangle);
     \newcode
         QPainter painter(this);
-        QPolygon transformed = polygon * painter.combinedMatrix().inverted();
+        QPolygon transformed = polygon * painter.combinedTransform().inverted();
     \endcode
 */
 
@@ -7195,15 +7208,16 @@ QPolygon QPainter::xFormDev(const QPolygon &a) const
 /*!
     \fn QPolygon QPainter::xFormDev(const QPolygon &polygon, int index, int count) const
     \overload
+    \obsolete
 
-    Use combinedMatrix() combined with QPolygon::mid() and QMatrix::inverted() instead.
+    Use combinedTransform() combined with QPolygon::mid() and QTransform::inverted() instead.
 
     \oldcode
         QPainter painter(this);
         QPolygon transformed = painter.xFormDev(polygon, index, count);
     \newcode
         QPainter painter(this);
-        QPolygon transformed = polygon.mid(index, count) * painter.combinedMatrix().inverted();
+        QPolygon transformed = polygon.mid(index, count) * painter.combinedTransform().inverted();
     \endcode
 */
 
@@ -8107,7 +8121,7 @@ void bitBlt(QPaintDevice *dst, int dx, int dy,
     \row \o QPaintEngine::DirtyClipRegion \o clipRegion()
     \row \o QPaintEngine::DirtyCompositionMode \o compositionMode()
     \row \o QPaintEngine::DirtyFont \o font()
-    \row \o QPaintEngine::DirtyTransform \o matrix()
+    \row \o QPaintEngine::DirtyTransform \o transform()
     \row \o QPaintEngine::DirtyClipEnabled \o isClipEnabled()
     \row \o QPaintEngine::DirtyPen \o pen()
     \row \o QPaintEngine::DirtyHints \o renderHints()
@@ -8226,10 +8240,14 @@ QFont QPaintEngineState::font() const
 
 /*!
     \since 4.2
+    \obsolete
 
     Returns the matrix in the current paint engine
     state.
 
+    \note It is advisable to use transform() instead of this function to
+    preserve the properties of perspective transformations.
+
     This variable should only be used when the state() returns a
     combination which includes the QPaintEngine::DirtyTransform flag.
 
@@ -8410,11 +8428,7 @@ qreal QPaintEngineState::opacity() const
     If \a combine is true, the specified \a transform is combined with
     the current matrix; otherwise it replaces the current matrix.
 
-    This function has been added for compatibility with setMatrix(),
-    but as with setMatrix() the preferred method of setting a
-    transformation on the painter is through setWorldTransform().
-
-    \sa transform()
+    \sa transform() setWorldTransform()
 */
 
 void QPainter::setTransform(const QTransform &transform, bool combine )
@@ -8424,6 +8438,8 @@ void QPainter::setTransform(const QTransform &transform, bool combine )
 
 /*!
     Returns the world transformation matrix.
+
+    \sa worldTransform()
 */
 
 const QTransform & QPainter::transform() const
@@ -8534,7 +8550,7 @@ const QTransform & QPainter::worldTransform() const
     Returns the transformation matrix combining the current
     window/viewport and world transformation.
 
-    \sa setWorldMatrix(), setWindow(), setViewport()
+    \sa setWorldTransform(), setWindow(), setViewport()
 */
 
 QTransform QPainter::combinedTransform() const
diff --git a/src/gui/painting/qpainterpath.cpp b/src/gui/painting/qpainterpath.cpp
index 027d5c8..ea86cf5 100644
--- a/src/gui/painting/qpainterpath.cpp
+++ b/src/gui/painting/qpainterpath.cpp
@@ -3156,7 +3156,7 @@ void QPainterPath::addRoundRect(const QRectF &r, int xRnd, int yRnd)
     Set operations on paths will treat the paths as areas. Non-closed
     paths will be treated as implicitly closed.
 
-    \sa intersected(), subtracted(), subtractedInverted()
+    \sa intersected(), subtracted()
 */
 QPainterPath QPainterPath::united(const QPainterPath &p) const
 {
diff --git a/src/gui/painting/qprinter.cpp b/src/gui/painting/qprinter.cpp
index 411b74d..02a5a02 100644
--- a/src/gui/painting/qprinter.cpp
+++ b/src/gui/painting/qprinter.cpp
@@ -2162,8 +2162,8 @@ bool QPrinter::collateCopiesEnabled() const
 }
 
 /*!
-    Use QPrintDialog::addEnabledOption(QPrintDialog::PrintCollateCopies)
-    or QPrintDialog::setEnabledOptions(QPrintDialog::enabledOptions()
+    Use QPrintDialog::setOption(QPrintDialog::PrintCollateCopies)
+    or QPrintDialog::setOptions(QPrintDialog::options()
     & ~QPrintDialog::PrintCollateCopies) instead, depending on \a
     enable.
 */
diff --git a/src/gui/painting/qstroker.cpp b/src/gui/painting/qstroker.cpp
index 0649589..b24bf86 100644
--- a/src/gui/painting/qstroker.cpp
+++ b/src/gui/painting/qstroker.cpp
@@ -1012,10 +1012,13 @@ void QDashStroker::processCurrentSubpath()
     int dashCount = qMin(m_dashPattern.size(), 32);
     qfixed dashes[32];
 
+    qreal longestLength = 0;
     qreal sumLength = 0;
     for (int i=0; i<dashCount; ++i) {
         dashes[i] = qMax(m_dashPattern.at(i), qreal(0)) * m_stroker->strokeWidth();
         sumLength += dashes[i];
+        if (dashes[i] > longestLength)
+            longestLength = dashes[i];
     }
 
     if (qFuzzyIsNull(sumLength))
@@ -1053,7 +1056,7 @@ void QDashStroker::processCurrentSubpath()
     qfixed2d line_to_pos;
 
     // Pad to avoid clipping the borders of thick pens.
-    qfixed padding = qMax(m_stroker->strokeWidth(), m_stroker->miterLimit());
+    qfixed padding = qt_real_to_fixed(qMax(m_stroker->strokeWidth(), m_stroker->miterLimit()) * longestLength);
     qfixed2d clip_tl = { qt_real_to_fixed(m_clip_rect.left()) - padding,
                          qt_real_to_fixed(m_clip_rect.top()) - padding };
     qfixed2d clip_br = { qt_real_to_fixed(m_clip_rect.right()) + padding ,
diff --git a/src/gui/painting/qtransform.cpp b/src/gui/painting/qtransform.cpp
index f0b2351..a322fe4 100644
--- a/src/gui/painting/qtransform.cpp
+++ b/src/gui/painting/qtransform.cpp
@@ -52,7 +52,9 @@ QT_BEGIN_NAMESPACE
 
 #define Q_NEAR_CLIP 0.000001
 
-
+#ifdef MAP
+#  undef MAP
+#endif
 #define MAP(x, y, nx, ny) \
     do { \
         qreal FX_ = x; \
@@ -99,7 +101,7 @@ QT_BEGIN_NAMESPACE
     allowing perspective transformations. QTransform's toAffine()
     method allows casting QTransform to QMatrix. If a perspective
     transformation has been specified on the matrix, then the
-    conversion to an affine QMatrix will cause loss of data.
+    conversion will cause loss of data.
 
     QTransform is the recommended transformation class in Qt.
 
@@ -123,11 +125,13 @@ QT_BEGIN_NAMESPACE
     which returns true if the matrix is non-singular (i.e. AB = BA =
     I). The inverted() function returns an inverted copy of \e this
     matrix if it is invertible (otherwise it returns the identity
-    matrix). In addition, QTransform provides the det() function
-    returning the matrix's determinant.
+    matrix), and adjoint() returns the matrix's classical adjoint.
+    In addition, QTransform provides the determinant() function which
+    returns the matrix's determinant.
 
-    Finally, the QTransform class supports matrix multiplication, and
-    objects of the class can be streamed as well as compared.
+    Finally, the QTransform class supports matrix multiplication, addition
+    and subtraction, and objects of the class can be streamed as well
+    as compared.
 
     \tableofcontents
 
@@ -189,7 +193,7 @@ QT_BEGIN_NAMESPACE
     The various matrix elements can be set when constructing the
     matrix, or by using the setMatrix() function later on. They can also
     be manipulated using the translate(), rotate(), scale() and
-    shear() convenience functions, The currently set values can be
+    shear() convenience functions. The currently set values can be
     retrieved using the m11(), m12(), m13(), m21(), m22(), m23(),
     m31(), m32(), m33(), dx() and dy() functions.
 
@@ -202,9 +206,9 @@ QT_BEGIN_NAMESPACE
     to 0) mapping a point to itself. Shearing is controlled by \c m12
     and \c m21. Setting these elements to values different from zero
     will twist the coordinate system. Rotation is achieved by
-    carefully setting both the shearing factors and the scaling
-    factors. Perspective transformation is achieved by carefully setting
-    both the projection factors and the scaling factors.
+    setting both the shearing factors and the scaling factors. Perspective
+    transformation is achieved by setting both the projection factors and
+    the scaling factors.
 
     Here's the combined transformations example using basic matrix
     operations:
@@ -956,8 +960,8 @@ QTransform & QTransform::operator=(const QTransform &matrix)
 
 /*!
     Resets the matrix to an identity matrix, i.e. all elements are set
-    to zero, except \c m11 and \c m22 (specifying the scale) which are
-    set to 1.
+    to zero, except \c m11 and \c m22 (specifying the scale) and \c m33
+    which are set to 1.
 
     \sa QTransform(), isIdentity(), {QTransform#Basic Matrix
     Operations}{Basic Matrix Operations}
@@ -1771,7 +1775,7 @@ bool QTransform::quadToQuad(const QPolygonF &one,
     Sets the matrix elements to the specified values, \a m11,
     \a m12, \a m13 \a m21, \a m22, \a m23 \a m31, \a m32 and
     \a m33. Note that this function replaces the previous values.
-    QMatrix provides the translate(), rotate(), scale() and shear()
+    QTransform provides the translate(), rotate(), scale() and shear()
     convenience functions to manipulate the various matrix elements
     based on the currently defined coordinate system.
 
@@ -1949,8 +1953,11 @@ void QTransform::map(int x, int y, int *tx, int *ty) const
 }
 
 /*!
-  Returns the QTransform cast to a QMatrix.
- */
+  Returns the QTransform as an affine matrix.
+
+  \warning If a perspective transformation has been specified,
+  then the conversion will cause loss of data.
+*/
 const QMatrix &QTransform::toAffine() const
 {
     return affine;
@@ -2028,8 +2035,9 @@ QTransform::operator QVariant() const
 
 /*!
     \fn qreal QTransform::det() const
+    \obsolete
 
-    Returns the matrix's determinant.
+    Returns the matrix's determinant. Use determinant() instead.
 */
 
 
diff --git a/src/gui/styles/qcommonstyle.cpp b/src/gui/styles/qcommonstyle.cpp
index 308a0b8..ba28e75 100644
--- a/src/gui/styles/qcommonstyle.cpp
+++ b/src/gui/styles/qcommonstyle.cpp
@@ -2960,6 +2960,9 @@ QRect QCommonStyle::subElementRect(SubElement sr, const QStyleOption *opt,
                 horizontalShift *= -1;
                 verticalShift *= -1;
             }
+            if (tab->shape == QTabBar::RoundedWest || tab->shape == QTabBar::TriangularWest)
+                horizontalShift = -horizontalShift;
+
             tr.adjust(0, 0, horizontalShift, verticalShift);
             if (selected)
             {
diff --git a/src/gui/styles/qstyle.cpp b/src/gui/styles/qstyle.cpp
index a5ab80e..598fe6b 100644
--- a/src/gui/styles/qstyle.cpp
+++ b/src/gui/styles/qstyle.cpp
@@ -564,7 +564,7 @@ void QStyle::drawItemPixmap(QPainter *painter, const QRect &rect, int alignment,
 /*!
     \enum QStyle::PrimitiveElement
 
-    This enum describes that various primitive elements. A
+    This enum describes the various primitive elements. A
     primitive element is a common GUI element, such as a checkbox
     indicator or button bevel.
 
@@ -1108,7 +1108,7 @@ void QStyle::drawItemPixmap(QPainter *painter, const QRect &rect, int alignment,
     \value CC_ScrollBar         A scroll bar, like QScrollBar.
     \value CC_Slider            A slider, like QSlider.
     \value CC_ToolButton        A tool button, like QToolButton.
-    \value CC_TitleBar          A Title bar, like those used in QWorkspace.
+    \value CC_TitleBar          A Title bar, like those used in QMdiSubWindow.
     \value CC_Q3ListView        Used for drawing the Q3ListView class.
     \value CC_GroupBox          A group box, like QGroupBox.
     \value CC_Dial              A dial, like QDial.
@@ -1894,7 +1894,7 @@ void QStyle::drawItemPixmap(QPainter *painter, const QRect &rect, int alignment,
     can follow some existing GUI style or guideline.
 
     \value SP_TitleBarMinButton  Minimize button on title bars (e.g.,
-        in QWorkspace).
+        in QMdiSubWindow).
     \value SP_TitleBarMenuButton Menu button on a title bar.
     \value SP_TitleBarMaxButton  Maximize button on title bars.
     \value SP_TitleBarCloseButton  Close button on title bars.
@@ -1966,22 +1966,7 @@ void QStyle::drawItemPixmap(QPainter *painter, const QRect &rect, int alignment,
     \value SP_CustomBase  Base value for custom standard pixmaps;
     custom values must be greater than this value.
 
-    \sa standardPixmap() standardIcon()
-*/
-
-/*###
-  \enum QStyle::IconMode
-
-  This enum represents the effects performed on a pixmap to achieve a
-  GUI style's perferred way of representing the image in different
-  states.
-
-  \value IM_Disabled  A disabled pixmap (drawn on disabled widgets)
-  \value IM_Active  An active pixmap (drawn on active tool buttons and menu items)
-  \value IM_CustomBase  Base value for custom PixmapTypes; custom
-  values must be greater than this value
-
-  \sa generatedIconPixmap()
+    \sa standardIcon()
 */
 
 /*!
@@ -2264,7 +2249,7 @@ QPalette QStyle::standardPalette() const
     slot in your subclass instead. The standardIcon() function will
     dynamically detect the slot and call it.
 
-    \sa standardIconImplementation(), standardPixmap()
+    \sa standardIconImplementation()
 */
 QIcon QStyle::standardIcon(StandardPixmap standardIcon, const QStyleOption *option,
                            const QWidget *widget) const
@@ -2289,8 +2274,7 @@ QIcon QStyle::standardIcon(StandardPixmap standardIcon, const QStyleOption *opti
     subclass; because of binary compatibility constraints, the
     standardIcon() function (introduced in Qt 4.1) is not
     virtual. Instead, standardIcon() will dynamically detect and call
-    \e this slot.  The default implementation simply calls the
-    standardPixmap() function with the given parameters.
+    \e this slot.
 
     The \a standardIcon is a standard pixmap which can follow some
     existing GUI style or guideline. The \a option argument can be
diff --git a/src/gui/styles/qstyleoption.cpp b/src/gui/styles/qstyleoption.cpp
index e174370..0ff7995 100644
--- a/src/gui/styles/qstyleoption.cpp
+++ b/src/gui/styles/qstyleoption.cpp
@@ -657,7 +657,7 @@ QStyleOptionFrameV2 &QStyleOptionFrameV2::operator=(const QStyleOptionFrame &oth
 /*!
     \enum QStyleOptionFrameV2::FrameFeature
 
-    This enum describles the different types of features a frame can have.
+    This enum describes the different types of features a frame can have.
 
     \value None Indicates a normal frame.
     \value Flat Indicates a flat frame.
@@ -899,7 +899,7 @@ QStyleOptionViewItemV2 &QStyleOptionViewItemV2::operator=(const QStyleOptionView
 /*!
     \enum QStyleOptionViewItemV2::ViewItemFeature
 
-    This enum describles the different types of features an item can have.
+    This enum describes the different types of features an item can have.
 
     \value None      Indicates a normal item.
     \value WrapText  Indicates an item with wrapped text.
@@ -4258,8 +4258,7 @@ QStyleOptionRubberBand::QStyleOptionRubberBand(int version)
     parameters for drawing a title bar.
 
     QStyleOptionTitleBar contains all the information that QStyle
-    functions need to draw the title bars of QWorkspace's MDI
-    children.
+    functions need to draw the title bar of a QMdiSubWindow.
 
     For performance reasons, the access to the member variables is
     direct (i.e., using the \c . or \c -> operator). This low-level feel
@@ -4269,7 +4268,7 @@ QStyleOptionRubberBand::QStyleOptionRubberBand(int version)
     For an example demonstrating how style options can be used, see
     the \l {widgets/styles}{Styles} example.
 
-    \sa QStyleOption, QStyleOptionComplex, QWorkspace
+    \sa QStyleOption, QStyleOptionComplex, QMdiSubWindow
 */
 
 /*!
@@ -4983,8 +4982,7 @@ QStyleOptionSizeGrip::QStyleOptionSizeGrip(int version)
 */
 
 /*!
-    Constructs a QStyleOptionGraphicsItem. The levelOfDetail parameter is
-    initialized to 1.
+    Constructs a QStyleOptionGraphicsItem.
 */
 QStyleOptionGraphicsItem::QStyleOptionGraphicsItem()
     : QStyleOption(Version, Type), levelOfDetail(1)
@@ -5009,11 +5007,6 @@ QStyleOptionGraphicsItem::QStyleOptionGraphicsItem(int version)
     of the painter used to draw the item. By default, if no
     transformations are applied, its value is 1. If zoomed out 1:2, the level
     of detail will be 0.5, and if zoomed in 2:1, its value is 2.
-
-    For more advanced level-of-detail metrics, use
-    QStyleOptionGraphicsItem::matrix directly.
-
-    \sa QStyleOptionGraphicsItem::matrix
 */
 qreal QStyleOptionGraphicsItem::levelOfDetailFromTransform(const QTransform &worldTransform)
 {
@@ -5040,28 +5033,40 @@ qreal QStyleOptionGraphicsItem::levelOfDetailFromTransform(const QTransform &wor
     Make use of this rectangle to speed up item drawing when only parts of the
     item are exposed. If the whole item is exposed, this rectangle will be the
     same as QGraphicsItem::boundingRect().
+
+    This member is only initialized for items that have the
+    QGraphicsItem::ItemUsesExtendedStyleOption flag set.
 */
 
 /*!
      \variable QStyleOptionGraphicsItem::matrix
      \brief the complete transformation matrix for the item
+     \obsolete
 
-     This matrix is the sum of the item's scene matrix and the matrix of the
-     painter used for drawing the item. It is provided for convenience,
+     The QMatrix provided through this member does include information about
+     any perspective transformations applied to the view or item. To get the
+     correct transformation matrix, use QPainter::transform() on the painter
+     passed into the QGraphicsItem::paint() implementation.
+
+     This matrix is the combination of the item's scene matrix and the matrix
+     of the painter used for drawing the item. It is provided for convenience,
      allowing anvanced level-of-detail metrics that can be used to speed up
      item drawing.
 
-     To find the dimentions of an item in screen coordinates (i.e., pixels),
+     To find the dimensions of an item in screen coordinates (i.e., pixels),
      you can use the mapping functions of QMatrix, such as QMatrix::map().
 
-     \sa QStyleOptionGraphicsItem::levelOfDetail
+     This member is only initialized for items that have the
+     QGraphicsItem::ItemUsesExtendedStyleOption flag set.
+
+     \sa QStyleOptionGraphicsItem::levelOfDetailFromTransform()
 */
 
 /*!
     \variable QStyleOptionGraphicsItem::levelOfDetail
     \obsolete
 
-    Use QStyleOptionGraphicsItem::levelOfDetailFromTransform
+    Use QStyleOptionGraphicsItem::levelOfDetailFromTransform()
     together with QPainter::worldTransform() instead.
 */
 
diff --git a/src/gui/styles/qwindowsvistastyle.cpp b/src/gui/styles/qwindowsvistastyle.cpp
index f3d0f04..6f3017a 100644
--- a/src/gui/styles/qwindowsvistastyle.cpp
+++ b/src/gui/styles/qwindowsvistastyle.cpp
@@ -364,7 +364,8 @@ void QWindowsVistaStyle::drawPrimitive(PrimitiveElement element, const QStyleOpt
             w->setProperty("_q_stylestate", (int)option->state);
             w->setProperty("_q_stylerect", w->rect());
 
-            bool doTransition = ((state & State_Sunken)     != (oldState & State_Sunken) ||
+            bool doTransition = oldState && 
+                                ((state & State_Sunken)     != (oldState & State_Sunken) ||
                                  (state & State_On)         != (oldState & State_On)     ||
                                  (state & State_MouseOver)  != (oldState & State_MouseOver));
 
@@ -2229,7 +2230,7 @@ QRect QWindowsVistaStyle::subControlRect(ComplexControl control, const QStyleOpt
                 rect = cb->rect;
                 break;
             case SC_ComboBoxArrow:
-                rect.setRect(cb->editable ? xpos : 0, y , wi - xpos, he);
+                rect.setRect(xpos, y , wi - xpos, he);
                 break;
             case SC_ComboBoxEditField:
                 rect.setRect(x + margin, y + margin, wi - 2 * margin - 16, he - 2 * margin);
diff --git a/src/gui/text/qfontmetrics.cpp b/src/gui/text/qfontmetrics.cpp
index abab91c..012c0f6 100644
--- a/src/gui/text/qfontmetrics.cpp
+++ b/src/gui/text/qfontmetrics.cpp
@@ -557,11 +557,10 @@ int QFontMetrics::width(const QString &text, int len) const
     \warning This function will produce incorrect results for Arabic
     characters or non-spacing marks in the middle of a string, as the
     glyph shaping and positioning of marks that happens when
-    processing strings cannot be taken into account. Use charWidth()
-    instead if you aren't looking for the width of isolated
-    characters.
+    processing strings cannot be taken into account. When implementing
+    an interactive text control, use QTextLayout instead.
 
-    \sa boundingRect(), charWidth()
+    \sa boundingRect()
 */
 int QFontMetrics::width(QChar ch) const
 {
@@ -1386,9 +1385,8 @@ qreal QFontMetricsF::width(const QString &text) const
     \warning This function will produce incorrect results for Arabic
     characters or non-spacing marks in the middle of a string, as the
     glyph shaping and positioning of marks that happens when
-    processing strings cannot be taken into account. Use charWidth()
-    instead if you aren't looking for the width of isolated
-    characters.
+    processing strings cannot be taken into account. When implementing
+    an interactive text control, use QTextLayout instead.
 
     \sa boundingRect()
 */
diff --git a/src/gui/text/qtextcontrol.cpp b/src/gui/text/qtextcontrol.cpp
index 2a590fd..b2ad686 100644
--- a/src/gui/text/qtextcontrol.cpp
+++ b/src/gui/text/qtextcontrol.cpp
@@ -1245,8 +1245,7 @@ void QTextControlPrivate::keyPressEvent(QKeyEvent *e)
 process:
     {
         QString text = e->text();
-        if (!text.isEmpty() && (text.at(0).isPrint() || text.at(0) == QLatin1Char('\t')) &&
-            ((e->modifiers() & (Qt::ControlModifier | Qt::AltModifier | Qt::MetaModifier)) == Qt::NoModifier)) {
+        if (!text.isEmpty() && (text.at(0).isPrint() || text.at(0) == QLatin1Char('\t'))) {
             if (overwriteMode
                 // no need to call deleteChar() if we have a selection, insertText
                 // does it already
diff --git a/src/gui/text/qtextformat.cpp b/src/gui/text/qtextformat.cpp
index 4e43418..a3dd83e 100644
--- a/src/gui/text/qtextformat.cpp
+++ b/src/gui/text/qtextformat.cpp
@@ -89,7 +89,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \fn Type QTextLength::type() const
 
-    Returns the type of length.
+    Returns the type of this length object.
 
     \sa QTextLength::Type
 */
@@ -129,9 +129,15 @@ QT_BEGIN_NAMESPACE
 /*!
     \enum QTextLength::Type
 
-    \value VariableLength
-    \value FixedLength
-    \value PercentageLength
+    This enum describes the different types a length object can
+    have.
+
+    \value VariableLength The width of the object is variable
+    \value FixedLength The width of the object is fixed
+    \value PercentageLength The width of the object is in
+                            percentage of the maximum width
+
+    \sa type()
 */
 
 /*!
@@ -417,7 +423,7 @@ Q_GUI_EXPORT QDataStream &operator>>(QDataStream &stream, QTextFormat &fmt)
     more useful, and describe the formatting that is applied to
     specific parts of the document.
 
-    A format has a \c FormatType which specifies the kinds of thing it
+    A format has a \c FormatType which specifies the kinds of text item it
     can format; e.g. a block of text, a list, a table, etc. A format
     also has various properties (some specific to particular format
     types), as described by the Property enum. Every property has a
@@ -447,24 +453,32 @@ Q_GUI_EXPORT QDataStream &operator>>(QDataStream &stream, QTextFormat &fmt)
 /*!
     \enum QTextFormat::FormatType
 
-    \value InvalidFormat
-    \value BlockFormat
-    \value CharFormat
-    \value ListFormat
-    \value TableFormat
-    \value FrameFormat
+    This enum describes the text item a QTextFormat object is formatting.
+
+    \value InvalidFormat An invalid format as created by the default
+                         constructor
+    \value BlockFormat The object formats a text block
+    \value CharFormat The object formats a single character
+    \value ListFormat The object formats a list
+    \value TableFormat The object formats a table
+    \value FrameFormat The object formats a frame
 
     \value UserFormat
+
+    \sa QTextCharFormat, QTextBlockFormat, QTextListFormat,
+    QTextTableFormat, type()
 */
 
 /*!
     \enum QTextFormat::Property
 
-    \value ObjectIndex
+    This enum describes the different properties a format can have.
+
+    \value ObjectIndex The index of the formatted object. See objectIndex().
 
     Paragraph and character properties
 
-    \value CssFloat
+    \value CssFloat How a frame is located relative to the surrounding text
     \value LayoutDirection  The layout direction of the text in the document
                             (Qt::LayoutDirection).
 
@@ -482,25 +496,25 @@ Q_GUI_EXPORT QDataStream &operator>>(QDataStream &stream, QTextFormat &fmt)
     \value BlockRightMargin
     \value TextIndent
     \value TabPositions     Specifies the tab positions.  The tab positions are structs of QTextOption::Tab which are stored in
-                                          a QList (internally, in a QList<QVariant>).
+                            a QList (internally, in a QList<QVariant>).
     \value BlockIndent
     \value BlockNonBreakableLines
-    \value BlockTrailingHorizontalRulerWidth
+    \value BlockTrailingHorizontalRulerWidth The width of a horizontal ruler element.
 
     Character properties
 
     \value FontFamily
     \value FontPointSize
+    \value FontPixelSize
     \value FontSizeAdjustment       Specifies the change in size given to the fontsize already set using
                                     FontPointSize or FontPixelSize.
+    \value FontFixedPitch
     \omitvalue FontSizeIncrement
     \value FontWeight
     \value FontItalic
     \value FontUnderline \e{This property has been deprecated.} Use QTextFormat::TextUnderlineStyle instead.
     \value FontOverline
     \value FontStrikeOut
-    \value FontFixedPitch
-    \value FontPixelSize
     \value FontCapitalization Specifies the capitalization type that is to be applied to the text.
     \value FontLetterSpacing Changes the default spacing between individual letters in the font. The value is
                                                 specified in percentage, with 100 as the default value.
@@ -512,7 +526,7 @@ Q_GUI_EXPORT QDataStream &operator>>(QDataStream &stream, QTextFormat &fmt)
 
     \omitvalue FirstFontProperty
     \omitvalue LastFontProperty
-    
+
     \value TextUnderlineColor
     \value TextVerticalAlignment
     \value TextOutline
@@ -533,7 +547,7 @@ Q_GUI_EXPORT QDataStream &operator>>(QDataStream &stream, QTextFormat &fmt)
 
     \value FrameBorder
     \value FrameBorderBrush
-    \value FrameBorderStyle
+    \value FrameBorderStyle See the \l{QTextFrameFormat::BorderStyle}{BorderStyle} enum.
     \value FrameBottomMargin
     \value FrameHeight
     \value FrameLeftMargin
@@ -565,33 +579,46 @@ Q_GUI_EXPORT QDataStream &operator>>(QDataStream &stream, QTextFormat &fmt)
 
     Selection properties
 
-    \value FullWidthSelection When set on the characterFormat of a selection, the whole width of the text will be shown selected
+    \value FullWidthSelection When set on the characterFormat of a selection,
+                              the whole width of the text will be shown selected.
 
     Page break properties
 
-    \value PageBreakPolicy
+    \value PageBreakPolicy Specifies how pages are broken. See the PageBreakFlag enum.
 
     \value UserProperty
+
+    \sa property(), setProperty()
 */
 
 /*!
     \enum QTextFormat::ObjectTypes
 
+    This enum describes what kind of QTextObject this format is associated with.
+
     \value NoObject
     \value ImageObject
     \value TableObject
     \value TableCellObject
     \value UserObject The first object that can be used for application-specific purposes.
+
+    \sa QTextObject, QTextTable, QTextObject::format()
 */
 
 /*!
     \enum QTextFormat::PageBreakFlag
     \since 4.2
 
+    This enum describes how page breaking is performed when printing. It maps to the
+    corresponding css properties.
+
     \value PageBreak_Auto The page break is determined automatically depending on the
                           available space on the current page
     \value PageBreak_AlwaysBefore The page is always broken before the paragraph/table
     \value PageBreak_AlwaysAfter  A new page is always started after the paragraph/table
+
+    \sa QTextBlockFormat::pageBreakPolicy(), QTextFrameFormat::pageBreakPolicy(),
+    PageBreakPolicy
 */
 
 /*!
@@ -971,6 +998,8 @@ QVector<QTextLength> QTextFormat::lengthVectorProperty(int propertyId) const
 
 /*!
     Returns the property specified by the given \a propertyId.
+
+    \sa Property
 */
 QVariant QTextFormat::property(int propertyId) const
 {
@@ -979,6 +1008,8 @@ QVariant QTextFormat::property(int propertyId) const
 
 /*!
     Sets the property specified by the \a propertyId to the given \a value.
+
+    \sa Property
 */
 void QTextFormat::setProperty(int propertyId, const QVariant &value)
 {
@@ -1006,8 +1037,10 @@ void QTextFormat::setProperty(int propertyId, const QVector<QTextLength> &value)
 }
 
 /*!
-  Clears the value of the property given by \a propertyId
- */
+    Clears the value of the property given by \a propertyId
+
+    \sa Property
+*/
 void QTextFormat::clearProperty(int propertyId)
 {
     if (!d)
@@ -1019,14 +1052,18 @@ void QTextFormat::clearProperty(int propertyId)
 /*!
     \fn void QTextFormat::setObjectType(int type)
 
-    Sets the text format's object \a type. See \c{ObjectTypes}.
+    Sets the text format's object type to \a type.
+
+    \sa ObjectTypes, objectType()
 */
 
 
 /*!
     \fn int QTextFormat::objectType() const
 
-    Returns the text format's object type. See \c{ObjectTypes}.
+    Returns the text format's object type.
+
+    \sa ObjectTypes, setObjectType()
 */
 
 
@@ -2116,17 +2153,17 @@ QTextListFormat::QTextListFormat(const QTextFormat &fmt)
 /*!
     \fn void QTextListFormat::setStyle(Style style)
 
-    Sets the list format's \a style. See \c{Style} for the available styles.
+    Sets the list format's \a style.
 
-    \sa style()
+    \sa style() Style
 */
 
 /*!
     \fn Style QTextListFormat::style() const
 
-    Returns the list format's style. See \c{Style}.
+    Returns the list format's style.
 
-    \sa setStyle()
+    \sa setStyle() Style
 */
 
 
@@ -2188,16 +2225,21 @@ QTextListFormat::QTextListFormat(const QTextFormat &fmt)
 /*!
     \enum QTextFrameFormat::Position
 
+    This enum describes how a frame is located relative to the surrounding text.
+
     \value InFlow
     \value FloatLeft
     \value FloatRight
 
+    \sa position() CssFloat
 */
 
 /*!
     \enum QTextFrameFormat::BorderStyle
     \since 4.3
 
+    This enum describes different border styles for the text frame.
+
     \value BorderStyle_None
     \value BorderStyle_Dotted
     \value BorderStyle_Dashed
@@ -2210,6 +2252,7 @@ QTextListFormat::QTextListFormat(const QTextFormat &fmt)
     \value BorderStyle_Inset
     \value BorderStyle_Outset
 
+    \sa borderStyle() FrameBorderStyle
 */
 
 /*!
diff --git a/src/gui/text/qtextlist.cpp b/src/gui/text/qtextlist.cpp
index 02b1c63..5e9898a 100644
--- a/src/gui/text/qtextlist.cpp
+++ b/src/gui/text/qtextlist.cpp
@@ -129,8 +129,6 @@ QTextList::~QTextList()
 
 /*!
     Returns the number of items in the list.
-
-    \sa isEmpty()
 */
 int QTextList::count() const
 {
diff --git a/src/gui/util/qsystemtrayicon_win.cpp b/src/gui/util/qsystemtrayicon_win.cpp
index 85eae26..a0648a1 100644
--- a/src/gui/util/qsystemtrayicon_win.cpp
+++ b/src/gui/util/qsystemtrayicon_win.cpp
@@ -106,6 +106,7 @@ public:
 private:
     uint notifyIconSize;
     int maxTipLength;
+    bool ignoreNextMouseRelease;
 };
 
 bool QSystemTrayIconSys::allowsMessages()
@@ -128,7 +129,8 @@ bool QSystemTrayIconSys::supportsMessages()
 }
 
 QSystemTrayIconSys::QSystemTrayIconSys(QSystemTrayIcon *object)
-    : hIcon(0), q(object)
+    : hIcon(0), q(object), ignoreNextMouseRelease(false)
+
 {
 #ifndef Q_OS_WINCE
     notifyIconSize = FIELD_OFFSET(NOTIFYICONDATA, guidItem); // NOTIFYICONDATAW_V2_SIZE;
@@ -311,10 +313,15 @@ bool QSystemTrayIconSys::winEvent( MSG *m, long *result )
 
             switch (m->lParam) {
             case WM_LBUTTONUP:
-                emit q->activated(QSystemTrayIcon::Trigger);
+                if (ignoreNextMouseRelease)
+                    ignoreNextMouseRelease = false;
+                else 
+                    emit q->activated(QSystemTrayIcon::Trigger);
                 break;
 
             case WM_LBUTTONDBLCLK:
+                ignoreNextMouseRelease = true; // Since DBLCLICK Generates a second mouse 
+                                               // release we must ignore it
                 emit q->activated(QSystemTrayIcon::DoubleClick);
                 break;
 
diff --git a/src/gui/widgets/qcocoamenu_mac.mm b/src/gui/widgets/qcocoamenu_mac.mm
index 3338fd8..f3bb73e 100644
--- a/src/gui/widgets/qcocoamenu_mac.mm
+++ b/src/gui/widgets/qcocoamenu_mac.mm
@@ -98,7 +98,9 @@ QT_USE_NAMESPACE
     while (QWidget *popup
                 = QApplication::activePopupWidget())
         popup->close();
-    qt_mac_emit_menuSignals(((QT_MANGLE_NAMESPACE(QCocoaMenu) *)menu)->qmenu, true);
+    QMenu *qtmenu = static_cast<QT_MANGLE_NAMESPACE(QCocoaMenu) *>(menu)->qmenu;
+    qt_mac_emit_menuSignals(qtmenu, true);
+    qt_mac_menu_collapseSeparators(menu, qtmenu->separatorsCollapsible());
 }
 
 - (void)menuWillClose:(NSMenu*)menu;
diff --git a/src/gui/widgets/qlinecontrol.cpp b/src/gui/widgets/qlinecontrol.cpp
index eec890b..106d8f2 100644
--- a/src/gui/widgets/qlinecontrol.cpp
+++ b/src/gui/widgets/qlinecontrol.cpp
@@ -1727,8 +1727,7 @@ void QLineControl::processKeyEvent(QKeyEvent* event)
 
     if (unknown && !isReadOnly()) {
         QString t = event->text();
-        if (!t.isEmpty() && t.at(0).isPrint() &&
-                ((event->modifiers() & (Qt::ControlModifier | Qt::AltModifier | Qt::MetaModifier)) == Qt::NoModifier)) {
+        if (!t.isEmpty() && t.at(0).isPrint()) {
             insert(t);
 #ifndef QT_NO_COMPLETER
             complete(event->key());
diff --git a/src/gui/widgets/qmdisubwindow.cpp b/src/gui/widgets/qmdisubwindow.cpp
index 24dea37..e8de957 100644
--- a/src/gui/widgets/qmdisubwindow.cpp
+++ b/src/gui/widgets/qmdisubwindow.cpp
@@ -1066,7 +1066,7 @@ void QMdiSubWindowPrivate::createSystemMenu()
     addToSystemMenu(CloseAction, QMdiSubWindow::tr("&Close"), SLOT(close()));
     actions[CloseAction]->setIcon(style->standardIcon(QStyle::SP_TitleBarCloseButton, 0, q));
 #if !defined(QT_NO_SHORTCUT)
-    actions[CloseAction]->setShortcut(QKeySequence::Close);
+    actions[CloseAction]->setShortcuts(QKeySequence::Close);
 #endif
     updateActions();
 }
diff --git a/src/gui/widgets/qmenu.cpp b/src/gui/widgets/qmenu.cpp
index 99f3880..8eec0fc 100644
--- a/src/gui/widgets/qmenu.cpp
+++ b/src/gui/widgets/qmenu.cpp
@@ -3013,12 +3013,19 @@ bool QMenu::separatorsCollapsible() const
 void QMenu::setSeparatorsCollapsible(bool collapse)
 {
     Q_D(QMenu);
+    if (d->collapsibleSeparators == collapse)
+        return;
+
     d->collapsibleSeparators = collapse;
     d->itemsDirty = 1;
     if (isVisible()) {
         d->updateActionRects();
         update();
     }
+#ifdef Q_WS_MAC
+    if (d->mac_menu)
+        d->syncSeparatorsCollapsible(collapse);
+#endif
 }
 
 #ifdef QT3_SUPPORT
diff --git a/src/gui/widgets/qmenu_mac.mm b/src/gui/widgets/qmenu_mac.mm
index 77e98c4..e6239f4 100644
--- a/src/gui/widgets/qmenu_mac.mm
+++ b/src/gui/widgets/qmenu_mac.mm
@@ -458,7 +458,8 @@ OSStatus qt_mac_menu_event(EventHandlerCallRef er, EventRef event, void *)
 
                         int merged = 0;
                         const QMenuPrivate::QMacMenuPrivate *mac_menu = qmenu->d_func()->mac_menu;
-                        for(int i = 0; i < mac_menu->actionItems.size(); ++i) {
+                        const int ActionItemsCount = mac_menu->actionItems.size();
+                        for(int i = 0; i < ActionItemsCount; ++i) {
                             QMacMenuAction *action = mac_menu->actionItems.at(i);
                             if (action->action->isSeparator()) {
                                 bool hide = false;
@@ -972,7 +973,7 @@ void Q_GUI_EXPORT qt_mac_set_menubar_merge(bool b) { qt_mac_no_menubar_merge = !
 /*****************************************************************************
   QMenu bindings
  *****************************************************************************/
-QMenuPrivate::QMacMenuPrivate::QMacMenuPrivate(QMenuPrivate *menu) : menu(0), qmenu(menu)
+QMenuPrivate::QMacMenuPrivate::QMacMenuPrivate() : menu(0)
 {
 }
 
@@ -1300,61 +1301,22 @@ QMenuPrivate::QMacMenuPrivate::syncAction(QMacMenuAction *action)
 #else
     int itemIndex = [menu indexOfItem:item];
     Q_ASSERT(itemIndex != -1);
-
-    // Separator handling: Menu items and separators can be added to a QMenu in
-    // any order (for example, add all the separators first and then "fill inn" 
-    // the menu items). Create NSMenuItem seperatorItems for the Qt separators, 
-    // and make sure that there are no double separators and no seprators 
-    // at the top or bottom of the menu.
-    bool itemIsSeparator = action->action->isSeparator();
-    bool previousItemIsSeparator = false;
-    if (itemIndex > 0) {
-        if ([[menu itemAtIndex : itemIndex - 1] isSeparatorItem])
-            previousItemIsSeparator = true;
-    }
-    bool nexItemIsSeparator = false;
-    if (itemIndex > 0 && itemIndex < [menu numberOfItems] -1) {
-        if ([[menu itemAtIndex : itemIndex + 1] isSeparatorItem])
-            nexItemIsSeparator = true;
-    }
-    bool itemIsAtBottomOfMenu = (itemIndex == [menu numberOfItems]  - 1);
-    bool itemIsAtTopOfMenu = (itemIndex == 0);
-        
-
-    if (itemIsSeparator) {
-        // Create separators items for actions that are now separators
+    if (action->action->isSeparator()) {
         action->menuItem = [NSMenuItem separatorItem];
         [action->menuItem retain];
-
-        // Hide duplicate/top/bottom separators.
-        if (qmenu->collapsibleSeparators && (previousItemIsSeparator || itemIsAtBottomOfMenu || itemIsAtTopOfMenu)) {
-            [action->menuItem setHidden : true];
-        }
-
         [menu insertItem: action->menuItem atIndex:itemIndex];
         [menu removeItem:item];
         [item release];
         item = action->menuItem;
         return;
-    } else {
-        // Create standard menu items for actions that are no longer separators
-        if ([item isSeparatorItem]) {
-            action->menuItem = createNSMenuItem(action->action->text());
-            [menu insertItem:action->menuItem atIndex:itemIndex];
-            [menu removeItem:item];
-            [item release];
-            item = action->menuItem;
-        }
-
-        // Show separators that should now be visible since a non-separator
-        // item (the current item) was added.
-        if (previousItemIsSeparator) {
-            [[menu itemAtIndex : itemIndex - 1] setHidden : false];
-        } else if (itemIsAtTopOfMenu && nexItemIsSeparator) {
-            [[menu itemAtIndex : itemIndex + 1] setHidden : false];
-        }
+    } else if ([item isSeparatorItem]) {
+        // I'm no longer a separator...
+        action->menuItem = createNSMenuItem(action->action->text());
+        [menu insertItem:action->menuItem atIndex:itemIndex];
+        [menu removeItem:item];
+        [item release];
+        item = action->menuItem;
     }
-
 #endif
 
     //find text (and accel)
@@ -1376,8 +1338,9 @@ QMenuPrivate::QMacMenuPrivate::syncAction(QMacMenuAction *action)
             accel = qt_mac_menu_merge_accel(action);
         }
     }
+    // Show multiple key sequences as part of the menu text.
     if (accel.count() > 1)
-        text += QLatin1String(" (****)"); //just to denote a multi stroke shortcut
+        text += QLatin1String(" (") + accel.toString(QKeySequence::NativeText) + QLatin1String(")");
 
     QString finalString = qt_mac_removeMnemonics(text);
 
@@ -1459,14 +1422,15 @@ QMenuPrivate::QMacMenuPrivate::syncAction(QMacMenuAction *action)
         data.whichData |= kMenuItemDataCmdKey;
         data.whichData |= kMenuItemDataCmdKeyModifiers;
         data.whichData |= kMenuItemDataCmdKeyGlyph;
-        if (!accel.isEmpty()) {
+        if (accel.count() == 1) {
             qt_mac_get_accel(accel[0], (quint32*)&data.cmdKeyModifiers, (quint32*)&data.cmdKeyGlyph);
             if (data.cmdKeyGlyph == 0)
                 data.cmdKey = (UniChar)accel[0];
         }
 #else
         [item setSubmenu:0];
-        if (!accel.isEmpty()) {
+        // No key equivalent set for multiple key QKeySequence.
+        if (accel.count() == 1) {
             [item setKeyEquivalent:keySequenceToKeyEqivalent(accel)];
             [item setKeyEquivalentModifierMask:keySequenceModifierMask(accel)];
         } else {
@@ -1538,7 +1502,7 @@ QMenuPrivate::macMenu(OSMenuRef merge)
     if (mac_menu && mac_menu->menu)
         return mac_menu->menu;
     if (!mac_menu)
-        mac_menu = new QMacMenuPrivate(this);
+        mac_menu = new QMacMenuPrivate;
     mac_menu->menu = qt_mac_create_menu(q);
     if (merge) {
 #ifndef QT_MAC_USE_COCOA
@@ -1550,12 +1514,31 @@ QMenuPrivate::macMenu(OSMenuRef merge)
     QList<QAction*> items = q->actions();
     for(int i = 0; i < items.count(); i++)
         mac_menu->addAction(items[i], 0, this);
+    syncSeparatorsCollapsible(collapsibleSeparators);
     return mac_menu->menu;
 }
 
 /*!
   \internal
 */
+void
+QMenuPrivate::syncSeparatorsCollapsible(bool collapse)
+{
+#ifndef QT_MAC_USE_COCOA
+    if (collapse)
+        ChangeMenuAttributes(mac_menu->menu, kMenuAttrCondenseSeparators, 0);
+    else
+        ChangeMenuAttributes(mac_menu->menu, 0, kMenuAttrCondenseSeparators);
+#else
+    qt_mac_menu_collapseSeparators(mac_menu->menu, collapse);
+#endif
+}
+
+
+
+/*!
+  \internal
+*/
 void QMenuPrivate::setMacMenuEnabled(bool enable)
 {
     if (!macMenu(0))
diff --git a/src/gui/widgets/qmenu_p.h b/src/gui/widgets/qmenu_p.h
index 4e428fe..8697771 100644
--- a/src/gui/widgets/qmenu_p.h
+++ b/src/gui/widgets/qmenu_p.h
@@ -263,9 +263,8 @@ public:
     struct QMacMenuPrivate {
         QList<QMacMenuAction*> actionItems;
         OSMenuRef menu;
-        QMenuPrivate *qmenu;
-        QMacMenuPrivate(QMenuPrivate *menu);
-        ~QMacMenuPrivate();    
+        QMacMenuPrivate();
+        ~QMacMenuPrivate();
 
         bool merged(const QAction *action) const;
         void addAction(QAction *, QMacMenuAction* =0, QMenuPrivate *qmenu = 0);
@@ -285,6 +284,7 @@ public:
     } *mac_menu;
     OSMenuRef macMenu(OSMenuRef merge);
     void setMacMenuEnabled(bool enable = true);
+    void syncSeparatorsCollapsible(bool collapsible);
     static QHash<OSMenuRef, OSMenuRef> mergeMenuHash;
     static QHash<OSMenuRef, QMenuMergeList*> mergeMenuItemsHash;
 #endif
diff --git a/src/gui/widgets/qmenubar.cpp b/src/gui/widgets/qmenubar.cpp
index 6b93879..a3964f7 100644
--- a/src/gui/widgets/qmenubar.cpp
+++ b/src/gui/widgets/qmenubar.cpp
@@ -446,13 +446,12 @@ void QMenuBarPrivate::calcActionRects(int max_width, int start) const
             continue; //we don't really position these!
         } else {
             const QString s = action->text();
-            if(!s.isEmpty()) {
-                sz = fm.size(Qt::TextShowMnemonic, s);
-            }
-
             QIcon is = action->icon();
+            // If an icon is set, only the icon is visible
             if (!is.isNull())
                 sz = sz.expandedTo(QSize(icone, icone));
+            else if (!s.isEmpty())
+                sz = fm.size(Qt::TextShowMnemonic, s);
         }
 
         //let the style modify the above size..
@@ -1758,6 +1757,9 @@ void QMenuBarPrivate::_q_internalShortcutActivated(int id)
         activateAction(act, QAction::Trigger);
         //100 is the same as the default value in QPushButton::animateClick
         autoReleaseTimer.start(100, q);
+    } else if (act && q->style()->styleHint(QStyle::SH_MenuBar_AltKeyNavigation, 0, q)) {
+        // When we open a menu using a shortcut, we should end up in keyboard state
+        setKeyboardMode(true);
     }
 }
 
diff --git a/src/gui/widgets/qprogressbar.cpp b/src/gui/widgets/qprogressbar.cpp
index 6593cd6..7e40c0d 100644
--- a/src/gui/widgets/qprogressbar.cpp
+++ b/src/gui/widgets/qprogressbar.cpp
@@ -190,10 +190,11 @@ bool QProgressBarPrivate::repaintRequired() const
     with setValue(). The progress bar can be rewound to the
     beginning with reset().
 
-    If minimum and maximum both are set to 0, the bar shows a busy indicator
-    instead of a percentage of steps. This is useful, for example, when using
-    QFtp or QHttp to download items when they are unable to determine the
-    size of the item being downloaded.
+    If minimum and maximum both are set to 0, the bar shows a busy
+    indicator instead of a percentage of steps. This is useful, for
+    example, when using QFtp or QNetworkAccessManager to download
+    items when they are unable to determine the size of the item being
+    downloaded.
 
     \table
     \row \o \inlineimage macintosh-progressbar.png Screenshot of a Macintosh style progress bar
diff --git a/src/gui/widgets/qtabbar.cpp b/src/gui/widgets/qtabbar.cpp
index 690e624..6b027b1 100644
--- a/src/gui/widgets/qtabbar.cpp
+++ b/src/gui/widgets/qtabbar.cpp
@@ -87,13 +87,17 @@ void QTabBarPrivate::updateMacBorderMetrics()
         // TODO: get metrics to preserve the bottom value
         // TODO: test tab bar position
 
-        // push the black line at the bottom of the menu bar down to the client are so we can paint over it
+        OSWindowRef window = qt_mac_window_for(q);
+
+        // push base line separator down to the client are so we can paint over it (Carbon)
         metrics.top = (documentMode && q->isVisible()) ? 1 : 0;
         metrics.bottom = 0;
         metrics.left = 0;
         metrics.right = 0;
-
-        qt_mac_updateContentBorderMetricts(qt_mac_window_for(q), metrics);
+        qt_mac_updateContentBorderMetricts(window, metrics);
+        
+        // hide the base line separator if the tabs have docuemnt mode enabled (Cocoa)
+        qt_mac_showBaseLineSeparator(window, !documentMode);
     }
 #endif
 }
diff --git a/src/gui/widgets/qworkspace.cpp b/src/gui/widgets/qworkspace.cpp
index 2833c08..3184140 100644
--- a/src/gui/widgets/qworkspace.cpp
+++ b/src/gui/widgets/qworkspace.cpp
@@ -110,11 +110,11 @@ bool QMDIControl::event(QEvent *event)
         QStyle::SubControl ctrl = style()->hitTestComplexControl(QStyle::CC_MdiControls, &opt,
                                                                  helpEvent->pos(), this);
         if (ctrl == QStyle::SC_MdiCloseButton)
-            QToolTip::showText(helpEvent->globalPos(), QWorkspace::tr("Close"));
+            QToolTip::showText(helpEvent->globalPos(), QWorkspace::tr("Close"), this);
         else if (ctrl == QStyle::SC_MdiMinButton)
-            QToolTip::showText(helpEvent->globalPos(), QWorkspace::tr("Minimize"));
+            QToolTip::showText(helpEvent->globalPos(), QWorkspace::tr("Minimize"), this);
         else if (ctrl == QStyle::SC_MdiNormalButton)
-            QToolTip::showText(helpEvent->globalPos(), QWorkspace::tr("Restore Down"));
+            QToolTip::showText(helpEvent->globalPos(), QWorkspace::tr("Restore Down"), this);
         else
             QToolTip::hideText();
 #endif // QT_NO_TOOLTIP
diff --git a/src/network/access/qftp.cpp b/src/network/access/qftp.cpp
index 35e0a18..b00f4a4 100644
--- a/src/network/access/qftp.cpp
+++ b/src/network/access/qftp.cpp
@@ -869,6 +869,9 @@ void QFtpPI::connected()
 #if defined(QFTPPI_DEBUG)
 //    qDebug("QFtpPI state: %d [connected()]", state);
 #endif
+    // try to improve performance by setting TCP_NODELAY
+    commandSocket.setSocketOption(QAbstractSocket::LowDelayOption, 1);
+
     emit connectState(QFtp::Connected);
 }
 
@@ -1385,7 +1388,7 @@ int QFtpPrivate::addCommand(QFtpCommand *cmd)
     \warning The current version of QFtp doesn't fully support
     non-Unix FTP servers.
 
-    \sa QHttp, QNetworkAccessManager, QNetworkRequest, QNetworkReply,
+    \sa QNetworkAccessManager, QNetworkRequest, QNetworkReply,
         {FTP Example}
 */
 
@@ -1730,8 +1733,8 @@ int QFtp::setTransferMode(TransferMode mode)
     Enables use of the FTP proxy on host \a host and port \a
     port. Calling this function with \a host empty disables proxying.
 
-    QFtp does not support FTP-over-HTTP proxy servers. Use QHttp for
-    this.
+    QFtp does not support FTP-over-HTTP proxy servers. Use
+    QNetworkAccessManager for this.
 */
 int QFtp::setProxy(const QString &host, quint16 port)
 {
diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp
index c824fac..66aeb22 100644
--- a/src/network/access/qhttpnetworkconnection.cpp
+++ b/src/network/access/qhttpnetworkconnection.cpp
@@ -409,6 +409,7 @@ bool QHttpNetworkConnectionPrivate::sendRequest(QAbstractSocket *socket)
 
             channels[i].bytesTotal = channels[i].request.contentLength();
         } else {
+            socket->flush(); // ### Remove this when pipelining is implemented. We want less TCP packets!
             channels[i].state = WaitingState;
             break;
         }
@@ -570,9 +571,6 @@ bool QHttpNetworkConnectionPrivate::expand(QAbstractSocket *socket, QHttpNetwork
                     // make sure that the reply is valid
                     if (channels[i].reply != reply)
                         return true;
-                        // emit dataReadProgress signal (signal is currently not connected
-                        // to the rest of QNAM) since readProgress of the
-                        // QNonContiguousByteDevice is used
                     emit reply->dataReadProgress(reply->d_func()->totalProgress, 0);
                     // make sure that the reply is valid
                     if (channels[i].reply != reply)
@@ -699,9 +697,6 @@ void QHttpNetworkConnectionPrivate::receiveReply(QAbstractSocket *socket, QHttpN
                             // make sure that the reply is valid
                             if (channels[i].reply != reply)
                                 return;
-                            // emit dataReadProgress signal (signal is currently not connected
-                            // to the rest of QNAM) since readProgress of the
-                            // QNonContiguousByteDevice is used
                             emit reply->dataReadProgress(reply->d_func()->totalProgress, reply->d_func()->bodyLength);
                             // make sure that the reply is valid
                             if (channels[i].reply != reply)
@@ -1198,6 +1193,10 @@ void QHttpNetworkConnectionPrivate::_q_connected()
     QAbstractSocket *socket = qobject_cast<QAbstractSocket*>(q->sender());
     if (!socket)
         return; // ### error
+
+    // improve performance since we get the request sent by the kernel ASAP
+    socket->setSocketOption(QAbstractSocket::LowDelayOption, 1);
+
     int i = indexOf(socket);
     // ### FIXME: if the server closes the connection unexpectedly, we shouldn't send the same broken request again!
     //channels[i].reconnectAttempts = 2;
diff --git a/src/network/kernel/qauthenticator.cpp b/src/network/kernel/qauthenticator.cpp
index a26a1fc..8bad6d3 100644
--- a/src/network/kernel/qauthenticator.cpp
+++ b/src/network/kernel/qauthenticator.cpp
@@ -68,8 +68,8 @@ static QByteArray qNtlmPhase3(QAuthenticatorPrivate *ctx, const QByteArray& phas
   \inmodule QtNetwork
 
   The QAuthenticator class is usually used in the
-  \l{QHttp::}{authenticationRequired()} and
-  \l{QHttp::}{proxyAuthenticationRequired()} signals of QHttp and
+  \l{QNetworkAccessManager::}{authenticationRequired()} and
+  \l{QNetworkAccessManager::}{proxyAuthenticationRequired()} signals of QNetworkAccessManager and
   QAbstractSocket. The class provides a way to pass back the required
   authentication information to the socket when accessing services that
   require authentication.
diff --git a/src/network/kernel/qnetworkproxy.cpp b/src/network/kernel/qnetworkproxy.cpp
index 608db65..df478fd 100644
--- a/src/network/kernel/qnetworkproxy.cpp
+++ b/src/network/kernel/qnetworkproxy.cpp
@@ -54,10 +54,10 @@
     QNetworkProxy provides the method for configuring network layer
     proxy support to the Qt network classes. The currently supported
     classes are QAbstractSocket, QTcpSocket, QUdpSocket, QTcpServer,
-    QHttp and QFtp. The proxy support is designed to be as transparent
-    as possible. This means that existing network-enabled applications
-    that you have written should automatically support network proxy
-    using the following code.
+    QNetworkAccessManager and QFtp. The proxy support is designed to
+    be as transparent as possible. This means that existing
+    network-enabled applications that you have written should
+    automatically support network proxy using the following code.
 
     \snippet doc/src/snippets/code/src_network_kernel_qnetworkproxy.cpp 0
 
@@ -160,8 +160,7 @@
     \row
         \o Caching-only HTTP
         \o Implemented using normal HTTP commands, it is useful only
-           in the context of HTTP requests (see QHttp,
-           QNetworkAccessManager)
+           in the context of HTTP requests (see QNetworkAccessManager)
         \o CachingCapability, HostNameLookupCapability
 
     \row
diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp
index d099382..c8ddce0 100644
--- a/src/network/socket/qabstractsocket.cpp
+++ b/src/network/socket/qabstractsocket.cpp
@@ -160,7 +160,7 @@
     issue to be aware of, though: You must make sure that enough data
     is available before attempting to read it using operator>>().
 
-    \sa QFtp, QHttp, QTcpServer
+    \sa QFtp, QNetworkAccessManager, QTcpServer
 */
 
 /*!
@@ -332,6 +332,22 @@
     \sa QAbstractSocket::state()
 */
 
+/*!
+    \enum QAbstractSocket::SocketOption
+    \since 4.6
+
+    This enum represents the options that can be set on a socket.
+    If desired, they can be set after having received the connected() signal from
+    the socket or after having received a new socket from a QTcpServer.
+
+    \value LowDelayOption Try to optimize the socket for low latency. For a QTcpSocket
+    this would set the TCP_NODELAY option and disable Nagle's algorithm. Set this to 1
+    to enable.
+    \value KeepAliveOption Set this to 1 to enable the SO_KEEPALIVE socket option
+
+    \sa QAbstractSocket::setSocketOption(), QAbstractSocket::socketOption()
+*/
+
 #include "qabstractsocket.h"
 #include "qabstractsocket_p.h"
 
@@ -1548,6 +1564,56 @@ bool QAbstractSocket::setSocketDescriptor(int socketDescriptor, SocketState sock
     return true;
 }
 
+/*!
+    Sets the option \a option to the value described by \a value.
+
+    \sa socketOption()
+    \since 4.6
+*/
+void QAbstractSocket::setSocketOption(QAbstractSocket::SocketOption option, QVariant value)
+{
+    if (!d_func()->socketEngine)
+        return;
+
+    switch (option) {
+        case LowDelayOption:
+            d_func()->socketEngine->setOption(QAbstractSocketEngine::LowDelayOption, value.toInt());
+            break;
+
+        case KeepAliveOption:
+            d_func()->socketEngine->setOption(QAbstractSocketEngine::KeepAliveOption, value.toInt());
+            break;
+    }
+}
+
+/*!
+    Returns the value of the \a option option.
+
+    \sa setSocketOption()
+    \since 4.6
+*/
+QVariant QAbstractSocket::socketOption(QAbstractSocket::SocketOption option)
+{
+    if (!d_func()->socketEngine)
+        return QVariant();
+
+    int ret = -1;
+    switch (option) {
+        case LowDelayOption:
+            ret = d_func()->socketEngine->option(QAbstractSocketEngine::LowDelayOption);
+            break;
+
+        case KeepAliveOption:
+            ret = d_func()->socketEngine->option(QAbstractSocketEngine::KeepAliveOption);
+            break;
+    }
+    if (ret == -1)
+        return QVariant();
+    else
+        return QVariant(ret);
+}
+
+
 /*
    Returns the difference between msecs and elapsed. If msecs is -1,
    however, -1 is returned.
diff --git a/src/network/socket/qabstractsocket.h b/src/network/socket/qabstractsocket.h
index ed187e5..50a38bb 100644
--- a/src/network/socket/qabstractsocket.h
+++ b/src/network/socket/qabstractsocket.h
@@ -116,6 +116,10 @@ public:
         Connection = ConnectedState
 #endif
     };
+    enum SocketOption {
+        LowDelayOption, // TCP_NODELAY
+        KeepAliveOption // SO_KEEPALIVE
+    };
 
     QAbstractSocket(SocketType socketType, QObject *parent);
     virtual ~QAbstractSocket();
@@ -149,6 +153,10 @@ public:
     bool setSocketDescriptor(int socketDescriptor, SocketState state = ConnectedState,
                              OpenMode openMode = ReadWrite);
 
+    // ### Qt 5: Make virtual?
+    void setSocketOption(QAbstractSocket::SocketOption o, QVariant v);
+    QVariant socketOption(QAbstractSocket::SocketOption o);
+
     SocketType socketType() const;
     SocketState state() const;
     SocketError error() const;
diff --git a/src/network/socket/qabstractsocketengine_p.h b/src/network/socket/qabstractsocketengine_p.h
index b784f65..39c00cc 100644
--- a/src/network/socket/qabstractsocketengine_p.h
+++ b/src/network/socket/qabstractsocketengine_p.h
@@ -92,7 +92,9 @@ public:
         SendBufferSocketOption,
         AddressReusable,
         BindExclusively,
-        ReceiveOutOfBandData
+        ReceiveOutOfBandData,
+        LowDelayOption,
+        KeepAliveOption
     };
 
     virtual bool initialize(QAbstractSocket::SocketType type, QAbstractSocket::NetworkLayerProtocol protocol = QAbstractSocket::IPv4Protocol) = 0;
diff --git a/src/network/socket/qhttpsocketengine.cpp b/src/network/socket/qhttpsocketengine.cpp
index 156a9f4..84b7c14 100644
--- a/src/network/socket/qhttpsocketengine.cpp
+++ b/src/network/socket/qhttpsocketengine.cpp
@@ -276,13 +276,30 @@ qint64 QHttpSocketEngine::pendingDatagramSize() const
 }
 #endif // QT_NO_UDPSOCKET
 
-int QHttpSocketEngine::option(SocketOption) const
+int QHttpSocketEngine::option(SocketOption option) const
 {
+    Q_D(const QHttpSocketEngine);
+    if (d->socket) {
+        // convert the enum and call the real socket
+        if (option == QAbstractSocketEngine::LowDelayOption)
+            return d->socket->socketOption(QAbstractSocket::LowDelayOption).toInt();
+        if (option == QAbstractSocketEngine::KeepAliveOption)
+            return d->socket->socketOption(QAbstractSocket::KeepAliveOption).toInt();
+    }
     return -1;
 }
 
-bool QHttpSocketEngine::setOption(SocketOption, int)
+bool QHttpSocketEngine::setOption(SocketOption option, int value)
 {
+    Q_D(QHttpSocketEngine);
+    if (d->socket) {
+        // convert the enum and call the real socket
+        if (option == QAbstractSocketEngine::LowDelayOption)
+            d->socket->setSocketOption(QAbstractSocket::LowDelayOption, value);
+        if (option == QAbstractSocketEngine::KeepAliveOption)
+            d->socket->setSocketOption(QAbstractSocket::KeepAliveOption, value);
+        return true;
+    }
     return false;
 }
 
diff --git a/src/network/socket/qnativesocketengine_unix.cpp b/src/network/socket/qnativesocketengine_unix.cpp
index 3991ae6..b4b673a 100644
--- a/src/network/socket/qnativesocketengine_unix.cpp
+++ b/src/network/socket/qnativesocketengine_unix.cpp
@@ -65,6 +65,8 @@
 #include <ctype.h>
 #endif
 
+#include <netinet/tcp.h>
+
 QT_BEGIN_NAMESPACE
 
 #if defined QNATIVESOCKETENGINE_DEBUG
@@ -203,6 +205,8 @@ int QNativeSocketEnginePrivate::option(QNativeSocketEngine::SocketOption opt) co
         return -1;
 
     int n = -1;
+    int level = SOL_SOCKET; // default
+
     switch (opt) {
     case QNativeSocketEngine::ReceiveBufferSocketOption:
         n = SO_RCVBUF;
@@ -222,11 +226,18 @@ int QNativeSocketEnginePrivate::option(QNativeSocketEngine::SocketOption opt) co
     case QNativeSocketEngine::ReceiveOutOfBandData:
         n = SO_OOBINLINE;
         break;
+    case QNativeSocketEngine::LowDelayOption:
+        level = IPPROTO_TCP;
+        n = TCP_NODELAY;
+        break;
+    case QNativeSocketEngine::KeepAliveOption:
+        n = SO_KEEPALIVE;
+        break;
     }
 
     int v = -1;
     QT_SOCKOPTLEN_T len = sizeof(v);
-    if (getsockopt(socketDescriptor, SOL_SOCKET, n, (char *) &v, &len) != -1)
+    if (getsockopt(socketDescriptor, level, n, (char *) &v, &len) != -1)
         return v;
     return -1;
 }
@@ -242,6 +253,8 @@ bool QNativeSocketEnginePrivate::setOption(QNativeSocketEngine::SocketOption opt
         return false;
 
     int n = 0;
+    int level = SOL_SOCKET; // default
+
     switch (opt) {
     case QNativeSocketEngine::ReceiveBufferSocketOption:
         n = SO_RCVBUF;
@@ -282,9 +295,16 @@ bool QNativeSocketEnginePrivate::setOption(QNativeSocketEngine::SocketOption opt
     case QNativeSocketEngine::ReceiveOutOfBandData:
         n = SO_OOBINLINE;
         break;
+    case QNativeSocketEngine::LowDelayOption:
+        level = IPPROTO_TCP;
+        n = TCP_NODELAY;
+        break;
+    case QNativeSocketEngine::KeepAliveOption:
+        n = SO_KEEPALIVE;
+        break;
     }
 
-    return ::setsockopt(socketDescriptor, SOL_SOCKET, n, (char *) &v, sizeof(v)) == 0;
+    return ::setsockopt(socketDescriptor, level, n, (char *) &v, sizeof(v)) == 0;
 }
 
 bool QNativeSocketEnginePrivate::nativeConnect(const QHostAddress &addr, quint16 port)
diff --git a/src/network/socket/qnativesocketengine_win.cpp b/src/network/socket/qnativesocketengine_win.cpp
index 6bc23ce..f0b9f0b 100644
--- a/src/network/socket/qnativesocketengine_win.cpp
+++ b/src/network/socket/qnativesocketengine_win.cpp
@@ -362,6 +362,8 @@ int QNativeSocketEnginePrivate::option(QNativeSocketEngine::SocketOption opt) co
         return -1;
 
     int n = -1;
+    int level = SOL_SOCKET; // default
+
     switch (opt) {
     case QNativeSocketEngine::ReceiveBufferSocketOption:
         n = SO_RCVBUF;
@@ -389,11 +391,18 @@ int QNativeSocketEnginePrivate::option(QNativeSocketEngine::SocketOption opt) co
     case QNativeSocketEngine::ReceiveOutOfBandData:
         n = SO_OOBINLINE;
         break;
+    case QNativeSocketEngine::LowDelayOption:
+        level = IPPROTO_TCP;
+        n = TCP_NODELAY;
+        break;
+    case QNativeSocketEngine::KeepAliveOption:
+        n = SO_KEEPALIVE;
+        break;
     }
 
     int v = -1;
     QT_SOCKOPTLEN_T len = sizeof(v);
-    if (getsockopt(socketDescriptor, SOL_SOCKET, n, (char *) &v, &len) != -1)
+    if (getsockopt(socketDescriptor, level, n, (char *) &v, &len) != -1)
         return v;
     return -1;
 }
@@ -409,6 +418,8 @@ bool QNativeSocketEnginePrivate::setOption(QNativeSocketEngine::SocketOption opt
         return false;
 
     int n = 0;
+    int level = SOL_SOCKET; // default
+
     switch (opt) {
     case QNativeSocketEngine::ReceiveBufferSocketOption:
         n = SO_RCVBUF;
@@ -440,9 +451,16 @@ bool QNativeSocketEnginePrivate::setOption(QNativeSocketEngine::SocketOption opt
     case QNativeSocketEngine::ReceiveOutOfBandData:
         n = SO_OOBINLINE;
         break;
+    case QNativeSocketEngine::LowDelayOption:
+        level = IPPROTO_TCP;
+        n = TCP_NODELAY;
+        break;
+    case QNativeSocketEngine::KeepAliveOption:
+        n = SO_KEEPALIVE;
+        break;
     }
 
-    if (::setsockopt(socketDescriptor, SOL_SOCKET, n, (char*)&v, sizeof(v)) != 0) {
+    if (::setsockopt(socketDescriptor, level, n, (char*)&v, sizeof(v)) != 0) {
         WS_ERROR_DEBUG(WSAGetLastError());
         return false;
     }
diff --git a/src/network/socket/qsocks5socketengine.cpp b/src/network/socket/qsocks5socketengine.cpp
index c9e5150..d226f21 100644
--- a/src/network/socket/qsocks5socketengine.cpp
+++ b/src/network/socket/qsocks5socketengine.cpp
@@ -1621,14 +1621,28 @@ qint64 QSocks5SocketEngine::pendingDatagramSize() const
 
 int QSocks5SocketEngine::option(SocketOption option) const
 {
-    Q_UNUSED(option);
+    Q_D(const QSocks5SocketEngine);
+    if (d->data && d->data->controlSocket) {
+        // convert the enum and call the real socket
+        if (option == QAbstractSocketEngine::LowDelayOption)
+            return d->data->controlSocket->socketOption(QAbstractSocket::LowDelayOption).toInt();
+        if (option == QAbstractSocketEngine::KeepAliveOption)
+            return d->data->controlSocket->socketOption(QAbstractSocket::KeepAliveOption).toInt();
+    }
     return -1;
 }
 
 bool QSocks5SocketEngine::setOption(SocketOption option, int value)
 {
-    Q_UNUSED(option);
-    Q_UNUSED(value);
+    Q_D(QSocks5SocketEngine);
+    if (d->data && d->data->controlSocket) {
+        // convert the enum and call the real socket
+        if (option == QAbstractSocketEngine::LowDelayOption)
+            d->data->controlSocket->setSocketOption(QAbstractSocket::LowDelayOption, value);
+        if (option == QAbstractSocketEngine::KeepAliveOption)
+            d->data->controlSocket->setSocketOption(QAbstractSocket::KeepAliveOption, value);
+        return true;
+    }
     return false;
 }
 
diff --git a/src/network/socket/qtcpsocket.cpp b/src/network/socket/qtcpsocket.cpp
index dc0439d..60722cc 100644
--- a/src/network/socket/qtcpsocket.cpp
+++ b/src/network/socket/qtcpsocket.cpp
@@ -60,10 +60,10 @@
 
     \bold{Note:} TCP sockets cannot be opened in QIODevice::Unbuffered mode.
 
-    \sa QTcpServer, QUdpSocket, QFtp, QHttp, {Fortune Server Example},
-        {Fortune Client Example}, {Threaded Fortune Server Example},
-        {Blocking Fortune Client Example}, {Loopback Example},
-        {Torrent Example}
+    \sa QTcpServer, QUdpSocket, QFtp, QNetworkAccessManager,
+    {Fortune Server Example}, {Fortune Client Example},
+    {Threaded Fortune Server Example}, {Blocking Fortune Client Example},
+    {Loopback Example}, {Torrent Example}
 */
 
 #include "qlist.h"
diff --git a/src/network/socket/qtcpsocket.h b/src/network/socket/qtcpsocket.h
index 81f81de..4e1003a 100644
--- a/src/network/socket/qtcpsocket.h
+++ b/src/network/socket/qtcpsocket.h
@@ -43,6 +43,7 @@
 #define QTCPSOCKET_H
 
 #include <QtNetwork/qabstractsocket.h>
+#include <QtCore/qvariant.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/opengl/qgl_x11.cpp b/src/opengl/qgl_x11.cpp
index d8af4d5..6381bc2 100644
--- a/src/opengl/qgl_x11.cpp
+++ b/src/opengl/qgl_x11.cpp
@@ -82,6 +82,25 @@ extern const QX11Info *qt_x11Info(const QPaintDevice *pd);
 #define GLX_SAMPLES_ARB         100001
 #endif
 
+#ifndef GLX_EXT_texture_from_pixmap
+#define GLX_TEXTURE_2D_BIT_EXT             0x00000002
+#define GLX_TEXTURE_RECTANGLE_BIT_EXT      0x00000004
+#define GLX_BIND_TO_TEXTURE_RGB_EXT        0x20D0
+#define GLX_BIND_TO_TEXTURE_RGBA_EXT       0x20D1
+#define GLX_BIND_TO_MIPMAP_TEXTURE_EXT     0x20D2
+#define GLX_BIND_TO_TEXTURE_TARGETS_EXT    0x20D3
+#define GLX_Y_INVERTED_EXT                 0x20D4
+#define GLX_TEXTURE_FORMAT_EXT             0x20D5
+#define GLX_TEXTURE_TARGET_EXT             0x20D6
+#define GLX_MIPMAP_TEXTURE_EXT             0x20D7
+#define GLX_TEXTURE_FORMAT_NONE_EXT        0x20D8
+#define GLX_TEXTURE_FORMAT_RGB_EXT         0x20D9
+#define GLX_TEXTURE_FORMAT_RGBA_EXT        0x20DA
+#define GLX_TEXTURE_2D_EXT                 0x20DC
+#define GLX_TEXTURE_RECTANGLE_EXT          0x20DD
+#define GLX_FRONT_LEFT_EXT                 0x20DE
+#endif
+
 /*
   The qt_gl_choose_cmap function is internal and used by QGLWidget::setContext()
   and GLX (not Windows).  If the application can't find any sharable
@@ -1517,15 +1536,21 @@ void QGLExtensions::init()
     }
 }
 
-
+#if !defined(glXBindTexImageEXT)
 typedef void (*qt_glXBindTexImageEXT)(Display*, GLXDrawable, int, const int*);
-typedef void (*qt_glXReleaseTexImageEXT)(Display*, GLXDrawable, int);
 static qt_glXBindTexImageEXT glXBindTexImageEXT = 0;
+#endif
+#if !defined(glXReleaseTexImageEXT)
+typedef void (*qt_glXReleaseTexImageEXT)(Display*, GLXDrawable, int);
 static qt_glXReleaseTexImageEXT glXReleaseTexImageEXT = 0;
+#endif
 static bool qt_resolved_texture_from_pixmap = false;
 
 QGLTexture *QGLContextPrivate::bindTextureFromNativePixmap(QPixmap *pm, const qint64 key, bool canInvert)
 {
+#if !defined(Q_OS_LINUX)
+    return 0;
+#else
     Q_Q(QGLContext);
 
     if (pm->data_ptr()->classId() != QPixmapData::X11Class)
@@ -1540,6 +1565,7 @@ QGLTexture *QGLContextPrivate::bindTextureFromNativePixmap(QPixmap *pm, const qi
          !(QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_2_0))
         return 0;
 
+
     if (!qt_resolved_texture_from_pixmap) {
         qt_resolved_texture_from_pixmap = true;
 
@@ -1625,15 +1651,18 @@ QGLTexture *QGLContextPrivate::bindTextureFromNativePixmap(QPixmap *pm, const qi
 
     return texture;
 #endif //!defined(GLX_VERSION_1_3) || defined(Q_OS_HPUX)
+#endif //!defined(Q_OS_LINUX
 }
 
 void QGLTexture::deleteBoundPixmap()
 {
+#if defined(GLX_VERSION_1_3) && !defined(Q_OS_HPUX) && defined(Q_OS_LINUX)
     if (boundPixmap) {
         glXReleaseTexImageEXT(QX11Info::display(), boundPixmap, GLX_FRONT_LEFT_EXT);
         glXDestroyPixmap(QX11Info::display(), boundPixmap);
         boundPixmap = 0;
     }
+#endif
 }
 
 
diff --git a/src/opengl/qgl_x11egl.cpp b/src/opengl/qgl_x11egl.cpp
index 11131ea..c6904fe 100644
--- a/src/opengl/qgl_x11egl.cpp
+++ b/src/opengl/qgl_x11egl.cpp
@@ -258,7 +258,8 @@ void QGLWidget::setContext(QGLContext *context, const QGLContext* shareContext,
     // If the application has set WA_TranslucentBackground and not explicitly set
     // the alpha buffer size to zero, modify the format so it have an alpha channel
     QGLFormat& fmt = d->glcx->d_func()->glFormat;
-    if (testAttribute(Qt::WA_TranslucentBackground) && fmt.alphaBufferSize() == -1)
+    const bool useArgbVisual = testAttribute(Qt::WA_TranslucentBackground);
+    if (useArgbVisual && fmt.alphaBufferSize() == -1)
         fmt.setAlphaBufferSize(1);
 
     bool createFailed = false;
@@ -297,8 +298,24 @@ void QGLWidget::setContext(QGLContext *context, const QGLContext* shareContext,
         int matchingCount = 0;
         chosenVisualInfo = XGetVisualInfo(x11Info().display(), VisualIDMask, &vi, &matchingCount);
         if (chosenVisualInfo) {
-            qDebug("Using X Visual ID (%d) provided by EGL", (int)vi.visualid);
-            vi = *chosenVisualInfo;
+            if (useArgbVisual) {
+                // Check to make sure the visual provided by EGL is ARGB
+                XRenderPictFormat *format;
+                format = XRenderFindVisualFormat(x11Info().display(), chosenVisualInfo->visual);
+                if (format->type == PictTypeDirect && format->direct.alphaMask) {
+                    qDebug("Using opaque X Visual ID (%d) provided by EGL", (int)vi.visualid);
+                    vi = *chosenVisualInfo;
+                }
+                else {
+                    qWarning("Warning: EGL suggested using X visual ID %d for config %d, but this is not ARGB",
+                             nativeVisualId, (int)qeglCtx->config());
+                    vi.visualid = 0;
+                }
+            }
+            else {
+                qDebug("Using opaque X Visual ID (%d) provided by EGL", (int)vi.visualid);
+                vi = *chosenVisualInfo;
+            }
             XFree(chosenVisualInfo);
         }
         else {
@@ -469,7 +486,7 @@ void QGLWidgetPrivate::recreateEglSurface(bool force)
     }
 }
 
-GLuint QGLContextPrivate::bindTextureFromNativePixmap(const QPixmap& pm, const qint64 key, bool canInvert)
+QGLTexture *QGLContextPrivate::bindTextureFromNativePixmap(QPixmap *pm, const qint64 key, bool canInvert)
 {
     // TODO
     return 0;
diff --git a/src/opengl/qglframebufferobject.cpp b/src/opengl/qglframebufferobject.cpp
index 3685661..abec78a 100644
--- a/src/opengl/qglframebufferobject.cpp
+++ b/src/opengl/qglframebufferobject.cpp
@@ -746,8 +746,11 @@ QGLFramebufferObject::~QGLFramebufferObject()
 
     The framebuffer can become invalid if the initialization process
     fails, the user attaches an invalid buffer to the framebuffer
-    object, or a non-power of 2 width/height is specified as the
+    object, or a non-power of two width/height is specified as the
     texture size if the texture target is \c{GL_TEXTURE_2D}.
+    The non-power of two limitation does not apply if the OpenGL version
+    is 2.0 or higher, or if the GL_ARB_texture_non_power_of_two extension
+    is present.
 */
 bool QGLFramebufferObject::isValid() const
 {
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbmouse.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbmouse.cpp
index 142993d..4365a5d 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbmouse.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbmouse.cpp
@@ -203,7 +203,6 @@ void QDirectFBMouseHandlerPrivate::readMouseData()
         int wheel = 0;
 
         if (input.type == DIET_AXISMOTION) {
-#ifdef QT_NO_DIRECTFB_LAYER
             if (input.flags & DIEF_AXISABS) {
                 switch (input.axis) {
                 case DIAI_X: x = input.axisabs; break;
@@ -223,19 +222,6 @@ void QDirectFBMouseHandlerPrivate::readMouseData()
                              "unknown axis (releative) %d", input.axis);
                 }
             }
-#else
-            if (input.axis == DIAI_X || input.axis == DIAI_Y) {
-                DFBResult result = layer->GetCursorPosition(layer, &x, &y);
-                if (result != DFB_OK) {
-                    DirectFBError("QDirectFBMouseHandler::readMouseData",
-                                  result);
-                }
-            } else if (input.axis == DIAI_Z) {
-                Q_ASSERT(input.flags & DIEF_AXISREL);
-                wheel = input.axisrel;
-                wheel *= -120;
-            }
-#endif
         }
 
         Qt::MouseButtons buttons = Qt::NoButton;
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
index 94f1aeb..b264ac0 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
@@ -466,7 +466,7 @@ void QDirectFBPaintEngine::drawImage(const QRectF &r, const QImage &image,
     d->blit(r, imgSurface, sr);
     if (release) {
 #if (Q_DIRECTFB_VERSION >= 0x010000)
-        imgSurface->ReleaseSource(imgSurface);
+        d->surface->ReleaseSource(d->surface);
 #endif
         imgSurface->Release(imgSurface);
     }
@@ -608,6 +608,8 @@ void QDirectFBPaintEngine::drawTextItem(const QPointF &p,
 
 void QDirectFBPaintEngine::fill(const QVectorPath &path, const QBrush &brush)
 {
+    if (brush.style() == Qt::NoBrush)
+        return;
     RASTERFALLBACK(FILL_PATH, path, brush, VOID_ARG());
     Q_D(QDirectFBPaintEngine);
     d->lock();
@@ -618,6 +620,8 @@ void QDirectFBPaintEngine::fill(const QVectorPath &path, const QBrush &brush)
 void QDirectFBPaintEngine::fillRect(const QRectF &rect, const QBrush &brush)
 {
     Q_D(QDirectFBPaintEngine);
+    if (brush.style() == Qt::NoBrush)
+        return;
     d->updateClip();
     if (!d->unsupportedCompositionMode
         && !(d->transformationType & (QDirectFBPaintEnginePrivate::RectsUnsupported))
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp
index 0928643..030e51f 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp
@@ -70,7 +70,6 @@ public:
     IDirectFBDisplayLayer *dfbLayer;
 #endif
     IDirectFBScreen *dfbScreen;
-    QRegion prevExpose;
 
     QSet<IDirectFBSurface*> allocatedSurfaces;
 
@@ -82,6 +81,7 @@ public:
 #endif
     QDirectFBScreen::DirectFBFlags directFBFlags;
     QImage::Format alphaPixmapFormat;
+    QColor backgroundColor;
 };
 
 QDirectFBScreenPrivate::QDirectFBScreenPrivate(QDirectFBScreen *screen)
@@ -141,6 +141,7 @@ IDirectFBSurface *QDirectFBScreen::createDFBSurface(const QImage &img, SurfaceCr
 {
     if (img.isNull()) // assert?
         return 0;
+
     if (QDirectFBScreen::getSurfacePixelFormat(img.format()) == DSPF_UNKNOWN) {
         QImage image = img.convertToFormat(img.hasAlphaChannel()
                                            ? d_ptr->alphaPixmapFormat
@@ -321,10 +322,10 @@ IDirectFBSurface *QDirectFBScreen::copyToDFBSurface(const QImage &img,
     DFBResult result = dfbSurface->Blit(dfbSurface, imgSurface, 0, 0, 0);
     if (result != DFB_OK)
         DirectFBError("QDirectFBScreen::copyToDFBSurface()", result);
+    imgSurface->Release(imgSurface);
 #if (Q_DIRECTFB_VERSION >= 0x010000)
     dfbSurface->ReleaseSource(dfbSurface);
 #endif
-    imgSurface->Release(imgSurface);
 #else // QT_NO_DIRECTFB_PREALLOCATED
     Q_ASSERT(image.format() == pixmapFormat);
     int bpl;
@@ -744,6 +745,7 @@ QPixmapData *QDirectFBScreenPrivate::createPixmapData(QPixmapData::PixelType typ
     return new QDirectFBPixmapData(type);
 }
 
+#if (Q_DIRECTFB_VERSION >= 0x000923)
 #ifdef QT_NO_DEBUG
 struct FlagDescription;
 static const FlagDescription *accelerationDescriptions = 0;
@@ -801,9 +803,6 @@ static const FlagDescription drawDescriptions[] = {
 };
 #endif
 
-
-
-#if (Q_DIRECTFB_VERSION >= 0x000923)
 static const QByteArray flagDescriptions(uint mask, const FlagDescription *flags)
 {
 #ifdef QT_NO_DEBUG
@@ -1047,6 +1046,14 @@ bool QDirectFBScreen::connect(const QString &displaySpec)
         printDirectFBInfo(d_ptr->dfb, d_ptr->dfbSurface);
 #endif
 
+    QRegExp backgroundColorRegExp("bgcolor=?(.+)");
+    backgroundColorRegExp.setCaseSensitivity(Qt::CaseInsensitive);
+    if (displayArgs.indexOf(backgroundColorRegExp) != -1) {
+        d_ptr->backgroundColor.setNamedColor(backgroundColorRegExp.cap(1));
+    }
+    if (!d_ptr->backgroundColor.isValid())
+        d_ptr->backgroundColor = Qt::green;
+
     return true;
 }
 
@@ -1087,7 +1094,7 @@ bool QDirectFBScreen::initDevice()
 #endif
 
 #ifndef QT_NO_QWS_CURSOR
-#ifdef QT_NO_DIRECTFB_LAYER
+#if defined QT_NO_DIRECTFB_WM || defined QT_NO_DIRECTFB_LAYER
     QScreenCursor::initSoftwareCursor();
 #else
     qt_screencursor = new QDirectFBScreenCursor;
@@ -1145,203 +1152,134 @@ QWSWindowSurface *QDirectFBScreen::createSurface(const QString &key) const
     return QScreen::createSurface(key);
 }
 
-void QDirectFBScreen::compose(const QRegion &region)
-{
-    const QList<QWSWindow*> windows = QWSServer::instance()->clientWindows();
-
-    QRegion blitRegion = region;
-    QRegion blendRegion;
-
-    d_ptr->dfbSurface->SetBlittingFlags(d_ptr->dfbSurface, DSBLIT_NOFX);
-
-    // blit opaque region
-    for (int i = 0; i < windows.size(); ++i) {
-        QWSWindow *win = windows.at(i);
-        QWSWindowSurface *surface = win->windowSurface();
-        if (!surface)
-            continue;
-
-        const QRegion r = win->allocatedRegion() & blitRegion;
-        if (r.isEmpty())
-            continue;
-
-        blitRegion -= r;
-
-        if (surface->isRegionReserved()) {
-            // nothing
-        } else if (win->isOpaque()) {
-            const QPoint offset = win->requestedRegion().boundingRect().topLeft();
-
-            if (surface->key() == QLatin1String("directfb")) {
-                QDirectFBWindowSurface *s = static_cast<QDirectFBWindowSurface*>(surface);
-                blit(s->directFBSurface(), offset, r);
-            } else {
-                blit(surface->image(), offset, r);
-            }
-        } else {
-            blendRegion += r;
-        }
-        if (blitRegion.isEmpty())
-            break;
-    }
-
-    { // fill background
-        const QRegion fill = blitRegion + blendRegion;
-        if (!fill.isEmpty()) {
-            const QColor color = QWSServer::instance()->backgroundBrush().color();
-            solidFill(color, fill);
-            blitRegion = QRegion();
-        }
-    }
-
-    if (blendRegion.isEmpty())
-        return;
-
-    // blend non-opaque region
-    for (int i = windows.size() - 1; i >= 0; --i) {
-        QWSWindow *win = windows.at(i);
-        QWSWindowSurface *surface = win->windowSurface();
-        if (!surface)
-            continue;
-
-        const QRegion r = win->allocatedRegion() & blendRegion;
-        if (r.isEmpty())
-            continue;
-
-        DFBSurfaceBlittingFlags flags = DSBLIT_NOFX;
-        if (!win->isOpaque()) {
-            flags |= DSBLIT_BLEND_ALPHACHANNEL;
-            const uint opacity = win->opacity();
-            if (opacity < 255) {
-                flags |= DSBLIT_BLEND_COLORALPHA;
-                d_ptr->dfbSurface->SetColor(d_ptr->dfbSurface, 0xff, 0xff, 0xff, opacity);
-            }
-        }
-        d_ptr->dfbSurface->SetBlittingFlags(d_ptr->dfbSurface, flags);
-
-        const QPoint offset = win->requestedRegion().boundingRect().topLeft();
-
-        if (surface->key() == QLatin1String("directfb")) {
-            QDirectFBWindowSurface *s = static_cast<QDirectFBWindowSurface*>(surface);
-            blit(s->directFBSurface(), offset, r);
-        } else {
-            blit(surface->image(), offset, r);
-        }
-    }
-#if (Q_DIRECTFB_VERSION >= 0x010000)
-    d_ptr->dfbSurface->ReleaseSource(d_ptr->dfbSurface);
-#endif
-}
-
 // Normally, when using DirectFB to compose the windows (I.e. when
 // QT_NO_DIRECTFB_WM isn't set), exposeRegion will simply return. If
 // QT_NO_DIRECTFB_WM is set, exposeRegion will compose only non-directFB
 // window surfaces. Normal, directFB surfaces are handled by DirectFB.
+static inline bool needExposeRegion()
+{
+#ifdef QT_NO_DIRECTFB_WM
+    return true;
+#endif
+#ifdef QT_NO_DIRECTFB_LAYER
+#ifndef QT_NO_QWS_CURSOR
+    return true;
+#endif
+#endif
+    return false;
+}
+
 void QDirectFBScreen::exposeRegion(QRegion r, int changing)
 {
+    if (!needExposeRegion()) {
+        return;
+    }
+
     const QList<QWSWindow*> windows = QWSServer::instance()->clientWindows();
     if (changing < 0 || changing >= windows.size())
         return;
 
-#ifndef QT_NO_DIRECTFB_WM
+
     QWSWindow *win = windows.at(changing);
     QWSWindowSurface *s = win->windowSurface();
-    if (s && s->key() == QLatin1String("directfb"))
-        return;
-#endif
-
     r &= region();
     if (r.isEmpty())
         return;
 
-    if (d_ptr->flipFlags & DSFLIP_BLIT) {
-        const QRect brect = r.boundingRect();
-        DFBRegion dfbRegion = { brect.left(), brect.top(),
-                                brect.right(), brect.bottom() };
-        compose(r);
-        d_ptr->dfbSurface->Flip(d_ptr->dfbSurface, &dfbRegion,
-                                d_ptr->flipFlags);
+    const QRect brect = r.boundingRect();
+
+    if (!s) {
+        solidFill(d_ptr->backgroundColor, r);
     } else {
-        compose(r + d_ptr->prevExpose);
-        d_ptr->dfbSurface->Flip(d_ptr->dfbSurface, 0, d_ptr->flipFlags);
+        const QRect windowGeometry = s->geometry();
+        const QRegion outsideWindow = r.subtracted(windowGeometry);
+        if (!outsideWindow.isEmpty()) {
+            solidFill(d_ptr->backgroundColor, outsideWindow);
+        }
+        const QRegion insideWindow = r.intersected(windowGeometry);
+        if (!insideWindow.isEmpty()) {
+            QDirectFBWindowSurface *dfbWindowSurface = (s->key() == QLatin1String("directfb"))
+                                                       ? static_cast<QDirectFBWindowSurface*>(s) : 0;
+            if (dfbWindowSurface) {
+                IDirectFBSurface *surface = dfbWindowSurface->directFBSurface();
+                const int n = insideWindow.numRects();
+                if (n == 1 || d_ptr->directFBFlags & BoundingRectFlip) {
+                    const QRect source = (insideWindow.boundingRect().intersected(windowGeometry)).translated(-windowGeometry.topLeft());
+                    const DFBRectangle rect = {
+                        source.x(), source.y(), source.width(), source.height()
+                    };
+                    d_ptr->dfbSurface->Blit(d_ptr->dfbSurface, surface, &rect,
+                                            windowGeometry.x() + source.x(),
+                                            windowGeometry.y() + source.y());
+                } else {
+                    const QVector<QRect> rects = insideWindow.rects();
+                    QVarLengthArray<DFBRectangle, 16> dfbRectangles(n);
+                    QVarLengthArray<DFBPoint, 16> dfbPoints(n);
+
+                    for (int i=0; i<n; ++i) {
+                        const QRect source = (rects.at(i).intersected(windowGeometry)).translated(-windowGeometry.topLeft());
+                        DFBRectangle &rect = dfbRectangles[i];
+                        rect.x = source.x();
+                        rect.y = source.y();
+                        rect.w = source.width();
+                        rect.h = source.height();
+                        dfbPoints[i].x = (windowGeometry.x() + source.x());
+                        dfbPoints[i].y = (windowGeometry.y() + source.y());
+                    }
+                    d_ptr->dfbSurface->BatchBlit(d_ptr->dfbSurface, surface, dfbRectangles.constData(),
+                                                 dfbPoints.constData(), n);
+                }
+            }
+        }
     }
-    d_ptr->prevExpose = r;
-}
 
-
-void QDirectFBScreen::blit(const QImage &img, const QPoint &topLeft,
-                           const QRegion &reg)
-{
-    IDirectFBSurface *src = createDFBSurface(img, QDirectFBScreen::DontTrackSurface);
-    if (!src) {
-        qWarning("QDirectFBScreen::blit(): Error creating surface");
-        return;
-    }
-    blit(src, topLeft, reg);
+    if (QScreenCursor *cursor = QScreenCursor::instance()) {
+        const QRect cursorRectangle = cursor->boundingRect();
+        if (cursor->isVisible() && !cursor->isAccelerated() && cursorRectangle.intersects(brect)) {
+            const QImage image = cursor->image();
+            IDirectFBSurface *surface = createDFBSurface(image, QDirectFBScreen::DontTrackSurface);
+            d_ptr->dfbSurface->SetBlittingFlags(d_ptr->dfbSurface, DSBLIT_BLEND_ALPHACHANNEL);
+            d_ptr->dfbSurface->Blit(d_ptr->dfbSurface, surface, 0, cursorRectangle.x(), cursorRectangle.y());
+            surface->Release(surface);
 #if (Q_DIRECTFB_VERSION >= 0x010000)
-    d_ptr->dfbSurface->ReleaseSource(d_ptr->dfbSurface);
+            d_ptr->dfbSurface->ReleaseSource(d_ptr->dfbSurface);
 #endif
-    src->Release(src);
-}
-
-void QDirectFBScreen::blit(IDirectFBSurface *src, const QPoint &topLeft,
-                           const QRegion &region)
-{
-    const QVector<QRect> rs = region.translated(-offset()).rects();
-    const int size = rs.size();
-    const QPoint tl = topLeft - offset();
-
-    QVarLengthArray<DFBRectangle> rects(size);
-    QVarLengthArray<DFBPoint> points(size);
-
-    int n = 0;
-    for (int i = 0; i < size; ++i) {
-        const QRect r = rs.at(i);
-        if (!r.isValid())
-            continue;
-        rects[n].x = r.x() - tl.x();
-        rects[n].y = r.y() - tl.y();
-        rects[n].w = r.width();
-        rects[n].h = r.height();
-        points[n].x = r.x();
-        points[n].y = r.y();
-        ++n;
+        }
     }
-
-    d_ptr->dfbSurface->BatchBlit(d_ptr->dfbSurface, src, rects.data(),
-                                 points.data(), n);
+    flipSurface(d_ptr->dfbSurface, d_ptr->flipFlags, r, QPoint());
 }
 
-// This function is only ever called by QScreen::drawBackground which
-// is only ever called by QScreen::compose which is never called with
-// DirectFB so it's really a noop.
 void QDirectFBScreen::solidFill(const QColor &color, const QRegion &region)
 {
     if (region.isEmpty())
         return;
 
-    if (QDirectFBScreen::getImageFormat(d_ptr->dfbSurface) == QImage::Format_RGB32) {
-        data = QDirectFBScreen::lockSurface(d_ptr->dfbSurface, DSLF_WRITE, &lstep);
-        if (!data)
-            return;
-
-        QScreen::solidFill(color, region);
-        d_ptr->dfbSurface->Unlock(d_ptr->dfbSurface);
-        data = 0;
-        lstep = 0;
+    d_ptr->dfbSurface->SetColor(d_ptr->dfbSurface,
+                                color.red(), color.green(), color.blue(),
+                                color.alpha());
+    const int n = region.numRects();
+    if (n > 1) {
+        const QRect r = region.boundingRect();
+        d_ptr->dfbSurface->FillRectangle(d_ptr->dfbSurface, r.x(), r.y(), r.width(), r.height());
     } else {
-        d_ptr->dfbSurface->SetColor(d_ptr->dfbSurface,
-                                    color.red(), color.green(), color.blue(),
-                                    color.alpha());
         const QVector<QRect> rects = region.rects();
-        for (int i=0; i<rects.size(); ++i) {
+        QVarLengthArray<DFBRectangle, 32> rectArray(n);
+        for (int i=0; i<n; ++i) {
             const QRect &r = rects.at(i);
-            d_ptr->dfbSurface->FillRectangle(d_ptr->dfbSurface,
-                                             r.x(), r.y(), r.width(), r.height());
+            rectArray[i].x = r.x();
+            rectArray[i].y = r.y();
+            rectArray[i].w = r.width();
+            rectArray[i].h = r.height();
         }
+        d_ptr->dfbSurface->FillRectangles(d_ptr->dfbSurface, rectArray.constData(), n);
     }
 }
 
+void QDirectFBScreen::erase(const QRegion &region)
+{
+    solidFill(d_ptr->backgroundColor, region);
+}
+
 QImage::Format QDirectFBScreen::alphaPixmapFormat() const
 {
     return d_ptr->alphaPixmapFormat;
@@ -1377,3 +1315,31 @@ uchar *QDirectFBScreen::lockSurface(IDirectFBSurface *surface, uint flags, int *
     return reinterpret_cast<uchar*>(mem);
 }
 
+
+void QDirectFBScreen::flipSurface(IDirectFBSurface *surface, DFBSurfaceFlipFlags flipFlags,
+                                  const QRegion &region, const QPoint &offset)
+{
+    if (!(flipFlags & DSFLIP_BLIT)) {
+        surface->Flip(surface, 0, flipFlags);
+    } else {
+        if (!(d_ptr->directFBFlags & BoundingRectFlip) && region.numRects() > 1) {
+            const QVector<QRect> rects = region.rects();
+            const DFBSurfaceFlipFlags nonWaitFlags = flipFlags & ~DSFLIP_WAIT;
+            for (int i=0; i<rects.size(); ++i) {
+                const QRect &r = rects.at(i);
+                const DFBRegion dfbReg = { r.x() + offset.x(), r.y() + offset.y(),
+                                           r.x() + r.width() + offset.x(),
+                                           r.y() + r.height() + offset.y() };
+                surface->Flip(surface, &dfbReg, i + 1 < rects.size() ? nonWaitFlags : flipFlags);
+            }
+        } else {
+            const QRect r = region.boundingRect();
+            const DFBRegion dfbReg = { r.x() + offset.x(), r.y() + offset.y(),
+                                       r.x() + r.width() + offset.x(),
+                                       r.y() + r.height() + offset.y() };
+            surface->Flip(surface, &dfbReg, flipFlags);
+        }
+    }
+}
+
+
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h
index 69b09e9..63c608e 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h
@@ -52,7 +52,6 @@ QT_MODULE(Gui)
 
 #define Q_DIRECTFB_VERSION ((DIRECTFB_MAJOR_VERSION << 16) | (DIRECTFB_MINOR_VERION << 8) | DIRECTFB_MICRO_VERSION)
 
-#include <QDebug>
 #define DIRECTFB_DECLARE_OPERATORS_FOR_FLAGS(F)                         \
     static inline F operator~(F f) { return F(~int(f)); } \
     static inline F operator&(F left, F right) { return F(int(left) & int(right)); } \
@@ -94,7 +93,6 @@ public:
     void shutdownDevice();
 
     void exposeRegion(QRegion r, int changing);
-    void blit(const QImage &img, const QPoint &topLeft, const QRegion &region);
     void scroll(const QRegion &region, const QPoint &offset);
     void solidFill(const QColor &color, const QRegion &region);
 
@@ -131,9 +129,12 @@ public:
                                      QImage::Format format,
                                      SurfaceCreationOptions options);
     IDirectFBSurface *copyToDFBSurface(const QImage &image,
-                                     QImage::Format format,
-                                     SurfaceCreationOptions options);
+                                       QImage::Format format,
+                                       SurfaceCreationOptions options);
+    void flipSurface(IDirectFBSurface *surface, DFBSurfaceFlipFlags flipFlags,
+                     const QRegion &region, const QPoint &offset);
     void releaseDFBSurface(IDirectFBSurface *surface);
+    void erase(const QRegion &region);
 
     using QScreen::depth;
     static int depth(DFBSurfacePixelFormat format);
@@ -155,14 +156,9 @@ public:
 #endif
 
     static uchar *lockSurface(IDirectFBSurface *surface, uint flags, int *bpl = 0);
-
 private:
     IDirectFBSurface *createDFBSurface(DFBSurfaceDescription desc,
                                        SurfaceCreationOptions options);
-    void compose(const QRegion &r);
-    void blit(IDirectFBSurface *src, const QPoint &topLeft,
-              const QRegion &region);
-
     QDirectFBScreenPrivate *d_ptr;
     friend class SurfaceCache;
 };
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp
index 7dcf398..a1009ac 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp
@@ -44,10 +44,10 @@
 #include "qdirectfbpaintengine.h"
 
 #include <qwidget.h>
+#include <qwindowsystem_qws.h>
 #include <qpaintdevice.h>
 #include <qvarlengtharray.h>
 
-
 //#define QT_DIRECTFB_DEBUG_SURFACES 1
 
 QDirectFBWindowSurface::QDirectFBWindowSurface(DFBSurfaceFlipFlags flip, QDirectFBScreen *scr)
@@ -59,6 +59,11 @@ QDirectFBWindowSurface::QDirectFBWindowSurface(DFBSurfaceFlipFlags flip, QDirect
     , flipFlags(flip)
     , boundingRectFlip(scr->directFBFlags() & QDirectFBScreen::BoundingRectFlip)
 {
+#ifdef QT_NO_DIRECTFB_WM
+    mode = Offscreen;
+#else
+    mode = Window;
+#endif
     setSurfaceFlags(Opaque | Buffered);
 #ifdef QT_DIRECTFB_TIMING
     frames = 0;
@@ -75,11 +80,17 @@ QDirectFBWindowSurface::QDirectFBWindowSurface(DFBSurfaceFlipFlags flip, QDirect
     , flipFlags(flip)
     , boundingRectFlip(scr->directFBFlags() & QDirectFBScreen::BoundingRectFlip)
 {
-    onscreen = widget->testAttribute(Qt::WA_PaintOnScreen);
-    if (onscreen)
+    if (widget && widget->testAttribute(Qt::WA_PaintOnScreen)) {
         setSurfaceFlags(Opaque | RegionReserved);
-    else
+        mode = Primary;
+    } else {
+#ifdef QT_NO_DIRECTFB_WM
+        mode = Offscreen;
+#else
+        mode = Window;
+#endif
         setSurfaceFlags(Opaque | Buffered);
+    }
 #ifdef QT_DIRECTFB_TIMING
     frames = 0;
     timer.start();
@@ -99,7 +110,7 @@ bool QDirectFBWindowSurface::isValid() const
 void QDirectFBWindowSurface::createWindow()
 {
 #ifdef QT_NO_DIRECTFB_LAYER
-#warning QT_NO_DIRECTFB_LAYER requires QT_NO_DIRECTFB_WM
+#error QT_NO_DIRECTFB_LAYER requires QT_NO_DIRECTFB_WM
 #else
     IDirectFBDisplayLayer *layer = screen->dfbDisplayLayer();
     if (!layer)
@@ -129,8 +140,40 @@ void QDirectFBWindowSurface::createWindow()
 }
 #endif // QT_NO_DIRECTFB_WM
 
-void QDirectFBWindowSurface::setGeometry(const QRect &rect, const QRegion &mask)
+#ifndef QT_NO_DIRECTFB_WM
+static DFBResult setGeometry(IDirectFBWindow *dfbWindow, const QRect &old, const QRect &rect)
 {
+    DFBResult result = DFB_OK;
+    const bool isMove = old.isEmpty() || rect.topLeft() != old.topLeft();
+    const bool isResize = rect.size() != old.size();
+
+#if (Q_DIRECTFB_VERSION >= 0x010000)
+    if (isResize && isMove) {
+        result = dfbWindow->SetBounds(dfbWindow, rect.x(), rect.y(),
+                                      rect.width(), rect.height());
+    } else if (isResize) {
+        result = dfbWindow->Resize(dfbWindow,
+                                   rect.width(), rect.height());
+    } else if (isMove) {
+        result = dfbWindow->MoveTo(dfbWindow, rect.x(), rect.y());
+    }
+#else
+    if (isResize) {
+        result = dfbWindow->Resize(dfbWindow,
+                                   rect.width(), rect.height());
+    }
+    if (isMove) {
+        result = dfbWindow->MoveTo(dfbWindow, rect.x(), rect.y());
+    }
+#endif
+    return result;
+}
+#endif
+
+void QDirectFBWindowSurface::setGeometry(const QRect &rect)
+{
+    IDirectFBSurface *primarySurface = screen->dfbSurface();
+    Q_ASSERT(primarySurface);
     if (rect.isNull()) {
 #ifndef QT_NO_DIRECTFB_WM
         if (dfbWindow) {
@@ -138,22 +181,21 @@ void QDirectFBWindowSurface::setGeometry(const QRect &rect, const QRegion &mask)
             dfbWindow = 0;
         }
 #endif
-        if (dfbSurface && dfbSurface != screen->dfbSurface()) {
-            dfbSurface->Release(dfbSurface);
+        if (dfbSurface) {
+            if (dfbSurface != primarySurface) {
+                dfbSurface->Release(dfbSurface);
+            }
             dfbSurface = 0;
         }
     } else if (rect != geometry()) {
+        const QRect oldRect = geometry();
         DFBResult result = DFB_OK;
-
         // If we're in a resize, the surface shouldn't be locked
         Q_ASSERT((lockedImage == 0) || (rect.size() == geometry().size()));
-
-        if (onscreen) {
-            IDirectFBSurface *primarySurface = screen->dfbSurface();
-            Q_ASSERT(primarySurface);
+        switch (mode) {
+        case Primary:
             if (dfbSurface && dfbSurface != primarySurface)
                 dfbSurface->Release(dfbSurface);
-
             if (rect == screen->region().boundingRect()) {
                 dfbSurface = primarySurface;
             } else {
@@ -161,58 +203,32 @@ void QDirectFBWindowSurface::setGeometry(const QRect &rect, const QRegion &mask)
                                          rect.width(), rect.height() };
                 result = primarySurface->GetSubSurface(primarySurface, &r, &dfbSurface);
             }
-        } else {
-            const bool isResize = rect.size() != geometry().size();
-#ifdef QT_NO_DIRECTFB_WM
-            if (isResize) {
+            break;
+        case Window:
+#ifndef QT_NO_DIRECTFB_WM
+            if (!dfbWindow)
+                createWindow();
+            ::setGeometry(dfbWindow, oldRect, rect);
+            // ### do I need to release and get the surface again here?
+#endif
+            break;
+        case Offscreen: {
+            if (!dfbSurface || oldRect.size() != rect.size()) {
                 if (dfbSurface)
                     dfbSurface->Release(dfbSurface);
-
-                IDirectFB *dfb = screen->dfb();
-                if (!dfb) {
-                    qFatal("QDirectFBWindowSurface::setGeometry(): "
-                           "Unable to get DirectFB handle!");
-                }
-
                 dfbSurface = screen->createDFBSurface(rect.size(), screen->pixelFormat(), QDirectFBScreen::DontTrackSurface);
-            } else {
-                Q_ASSERT(dfbSurface);
-            }
-#else
-            const QRect oldRect = geometry();
-            const bool isMove = oldRect.isEmpty() ||
-                                rect.topLeft() != oldRect.topLeft();
-
-            if (!dfbWindow)
-                createWindow();
-
-#if (Q_DIRECTFB_VERSION >= 0x010000)
-            if (isResize && isMove) {
-                result = dfbWindow->SetBounds(dfbWindow, rect.x(), rect.y(),
-                                              rect.width(), rect.height());
-            } else if (isResize) {
-                result = dfbWindow->Resize(dfbWindow,
-                                           rect.width(), rect.height());
-            } else if (isMove) {
-                result = dfbWindow->MoveTo(dfbWindow, rect.x(), rect.y());
-            }
-#else
-            if (isResize) {
-                result = dfbWindow->Resize(dfbWindow,
-                                           rect.width(), rect.height());
-            }
-            if (isMove) {
-                result = dfbWindow->MoveTo(dfbWindow, rect.x(), rect.y());
             }
-#endif
-#endif
+            const QRegion region = QRegion(oldRect.isEmpty() ? screen->region() : QRegion(oldRect)).subtracted(rect);
+            screen->erase(region);
+            screen->flipSurface(primarySurface, flipFlags, region, QPoint());
+            break; }
         }
 
         if (result != DFB_OK)
             DirectFBErrorFatal("QDirectFBWindowSurface::setGeometry()", result);
     }
 
-    QWSWindowSurface::setGeometry(rect, mask);
+    QWSWindowSurface::setGeometry(rect);
 }
 
 QByteArray QDirectFBWindowSurface::permanentState() const
@@ -254,7 +270,6 @@ static inline void scrollSurface(IDirectFBSurface *surface, const QRect &r, int
     surface->Blit(surface, surface, &rect, r.x() + dx, r.y() + dy);
 }
 
-
 bool QDirectFBWindowSurface::scroll(const QRegion &region, int dx, int dy)
 {
     if (!dfbSurface || !(flipFlags & DSFLIP_BLIT) || region.isEmpty())
@@ -272,35 +287,13 @@ bool QDirectFBWindowSurface::scroll(const QRegion &region, int dx, int dy)
     return true;
 }
 
-bool QDirectFBWindowSurface::move(const QPoint &offset)
-{
-    QWSWindowSurface::move(offset);
-
-#ifdef QT_NO_DIRECTFB_WM
-    return true; // buffered
-#else
-    if (!dfbWindow)
-        return false;
-
-    DFBResult status = dfbWindow->Move(dfbWindow, offset.x(), offset.y());
-    return (status == DFB_OK);
-#endif
-}
-
-QRegion QDirectFBWindowSurface::move(const QPoint &offset, const QRegion &newClip)
+bool QDirectFBWindowSurface::move(const QPoint &moveBy)
 {
-#ifdef QT_NO_DIRECTFB_WM
-    return QWSWindowSurface::move(offset, newClip);
-#else
-    Q_UNUSED(offset);
-    Q_UNUSED(newClip);
-
-    // DirectFB handles the entire move, so there's no need to blit.
-    return QRegion();
-#endif
+    setGeometry(geometry().translated(moveBy));
+    return true;
 }
 
-QPaintEngine* QDirectFBWindowSurface::paintEngine() const
+QPaintEngine *QDirectFBWindowSurface::paintEngine() const
 {
     if (!engine) {
         QDirectFBWindowSurface *that = const_cast<QDirectFBWindowSurface*>(this);
@@ -333,57 +326,93 @@ inline bool isWidgetOpaque(const QWidget *w)
 
     return false;
 }
-void QDirectFBWindowSurface::flush(QWidget *widget, const QRegion &region,
+
+void QDirectFBWindowSurface::flush(QWidget *, const QRegion &region,
                                    const QPoint &offset)
 {
-    Q_UNUSED(widget);
-#ifdef QT_NO_DIRECTFB_WM
-    Q_UNUSED(region);
-    Q_UNUSED(offset);
-#endif
-
-    QWidget *win = window();
-
     // hw: make sure opacity information is updated before compositing
-    const bool opaque = isWidgetOpaque(win);
-    if (opaque != isOpaque()) {
-        SurfaceFlags flags = Buffered;
-        if (opaque)
-            flags |= Opaque;
-        setSurfaceFlags(flags);
-    }
+    if (QWidget *win = window()) {
+
+        const bool opaque = isWidgetOpaque(win);
+        if (opaque != isOpaque()) {
+            SurfaceFlags flags = surfaceFlags();
+            if (opaque) {
+                flags |= Opaque;
+            } else {
+                flags &= ~Opaque;
+            }
+            setSurfaceFlags(flags);
+        }
 
 #ifndef QT_NO_DIRECTFB_WM
-    const quint8 winOpacity = quint8(win->windowOpacity() * 255);
-    quint8 opacity;
+        const quint8 winOpacity = quint8(win->windowOpacity() * 255);
+        quint8 opacity;
 
-    if (dfbWindow) {
-        dfbWindow->GetOpacity(dfbWindow, &opacity);
-        if (winOpacity != opacity)
-            dfbWindow->SetOpacity(dfbWindow, winOpacity);
-    }
+        if (dfbWindow) {
+            dfbWindow->GetOpacity(dfbWindow, &opacity);
+            if (winOpacity != opacity)
+                dfbWindow->SetOpacity(dfbWindow, winOpacity);
+        }
 #endif
-    if (!(flipFlags & DSFLIP_BLIT)) {
-        dfbSurface->Flip(dfbSurface, 0, flipFlags);
-    } else {
-        if (!boundingRectFlip && region.numRects() > 1) {
+    }
+
+    const QRect windowGeometry = QDirectFBWindowSurface::geometry();
+    IDirectFBSurface *primarySurface = screen->dfbSurface();
+    if (mode == Offscreen) {
+        primarySurface->SetBlittingFlags(primarySurface, DSBLIT_NOFX);
+        const QRect windowRect(0, 0, windowGeometry.width(), windowGeometry.height());
+        const int n = region.numRects();
+        if (n == 1 || boundingRectFlip ) {
+            const QRect regionBoundingRect = region.boundingRect().translated(offset);
+            const QRect source = windowRect & regionBoundingRect;
+            const DFBRectangle rect = {
+                source.x(), source.y(), source.width(), source.height()
+            };
+            primarySurface->Blit(primarySurface, dfbSurface, &rect,
+                                 windowGeometry.x() + source.x(),
+                                 windowGeometry.y() + source.y());
+        } else {
             const QVector<QRect> rects = region.rects();
-            const DFBSurfaceFlipFlags nonWaitFlags = flipFlags & ~DSFLIP_WAIT;
-            for (int i=0; i<rects.size(); ++i) {
-                const QRect &r = rects.at(i);
-                const DFBRegion dfbReg = { r.x() + offset.x(), r.y() + offset.y(),
-                                           r.x() + r.width() + offset.x(),
-                                           r.y() + r.height() + offset.y() };
-                dfbSurface->Flip(dfbSurface, &dfbReg, i + 1 < rects.size() ? nonWaitFlags : flipFlags);
+            QVarLengthArray<DFBRectangle, 16> dfbRectangles(n);
+            QVarLengthArray<DFBPoint, 16> dfbPoints(n);
+
+            for (int i=0; i<n; ++i) {
+                const QRect &r = rects.at(i).translated(offset);
+                const QRect source = windowRect & r;
+                DFBRectangle &rect = dfbRectangles[i];
+                rect.x = source.x();
+                rect.y = source.y();
+                rect.w = source.width();
+                rect.h = source.height();
+                dfbPoints[i].x = (windowGeometry.x() + source.x());
+                dfbPoints[i].y = (windowGeometry.y() + source.y());
             }
-        } else {
-            const QRect r = region.boundingRect();
-            const DFBRegion dfbReg = { r.x() + offset.x(), r.y() + offset.y(),
-                                       r.x() + r.width() + offset.x(),
-                                       r.y() + r.height() + offset.y() };
-            dfbSurface->Flip(dfbSurface, &dfbReg, flipFlags);
+            primarySurface->BatchBlit(primarySurface, dfbSurface, dfbRectangles.constData(),
+                                      dfbPoints.constData(), n);
         }
     }
+
+    if (QScreenCursor *cursor = QScreenCursor::instance()) {
+        const QRect cursorRectangle = cursor->boundingRect();
+        if (cursor->isVisible() && !cursor->isAccelerated()
+            && region.intersects(cursorRectangle.translated(-(offset + windowGeometry.topLeft())))) {
+            const QImage image = cursor->image();
+
+            IDirectFBSurface *surface = screen->createDFBSurface(image, QDirectFBScreen::DontTrackSurface);
+            primarySurface->SetBlittingFlags(primarySurface, DSBLIT_BLEND_ALPHACHANNEL);
+            primarySurface->Blit(primarySurface, surface, 0, cursorRectangle.x(), cursorRectangle.y());
+            surface->Release(surface);
+#if (Q_DIRECTFB_VERSION >= 0x010000)
+            primarySurface->ReleaseSource(primarySurface);
+#endif
+        }
+    }
+    if (mode == Offscreen) {
+        screen->flipSurface(primarySurface, flipFlags, region, offset + windowGeometry.topLeft());
+    } else {
+        screen->flipSurface(dfbSurface, flipFlags, region, offset);
+    }
+
 #ifdef QT_DIRECTFB_TIMING
     enum { Secs = 3 };
     ++frames;
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.h b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.h
index 7885b73..c46d93b 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.h
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.h
@@ -67,7 +67,7 @@ public:
 
     bool isValid() const;
 
-    void setGeometry(const QRect &rect, const QRegion &mask);
+    void setGeometry(const QRect &rect);
 
     QString key() const { return QLatin1String("directfb"); }
     QByteArray permanentState() const;
@@ -76,7 +76,6 @@ public:
     bool scroll(const QRegion &area, int dx, int dy);
 
     bool move(const QPoint &offset);
-    QRegion move(const QPoint &offset, const QRegion &newClip);
 
     QImage image() const { return QImage(); }
     QPaintDevice *paintDevice() { return this; }
@@ -88,7 +87,6 @@ public:
     void endPaint(const QRegion &);
 
     QImage *buffer(const QWidget *widget);
-
 private:
 #ifndef QT_NO_DIRECTFB_WM
     void createWindow();
@@ -96,7 +94,11 @@ private:
 #endif
     QDirectFBPaintEngine *engine;
 
-    bool onscreen;
+    enum Mode {
+        Primary,
+        Offscreen,
+        Window
+    } mode;
 
     QList<QImage*> bufferImages;
     DFBSurfaceFlipFlags flipFlags;
diff --git a/src/plugins/kbddrivers/kbddrivers.pro b/src/plugins/kbddrivers/kbddrivers.pro
index a34b780..dbab47b 100644
--- a/src/plugins/kbddrivers/kbddrivers.pro
+++ b/src/plugins/kbddrivers/kbddrivers.pro
@@ -1,5 +1,2 @@
 TEMPLATE = subdirs
 contains(kbd-plugins, linuxinput): SUBDIRS += linuxinput
-contains(kbd-plugins, sl5000): SUBDIRS += sl5000
-contains(kbd-plugins, vr41xx): SUBDIRS += vr41xx
-contains(kbd-plugins, yopy): SUBDIRS += yopy
diff --git a/src/plugins/kbddrivers/sl5000/main.cpp b/src/plugins/kbddrivers/sl5000/main.cpp
deleted file mode 100644
index cc68747..0000000
--- a/src/plugins/kbddrivers/sl5000/main.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <qkbddriverplugin_qws.h>
-#include <qkbdsl5000_qws.h>
-
-QT_BEGIN_NAMESPACE
-
-class QSL5000KbdDriver : public QKbdDriverPlugin
-{
-public:
-    QSL5000KbdDriver();
-
-    QStringList keys() const;
-    QWSKeyboardHandler* create(const QString &driver, const QString &device);
-};
-
-QSL5000KbdDriver::QSL5000KbdDriver()
-    : QKbdDriverPlugin()
-{
-}
-
-QStringList QSL5000KbdDriver::keys() const
-{
-    return (QStringList() << QLatin1String("SL5000"));
-}
-
-QWSKeyboardHandler* QSL5000KbdDriver::create(const QString &driver,
-                                             const QString &device)
-{
-    if (driver.compare(QLatin1String("SL5000"), Qt::CaseInsensitive))
-        return 0;
-    return new QWSSL5000KeyboardHandler(device);
-}
-
-Q_EXPORT_PLUGIN2(qwssl5000kbddriver, QSL5000KbdDriver)
-
-QT_END_NAMESPACE
diff --git a/src/plugins/kbddrivers/sl5000/sl5000.pro b/src/plugins/kbddrivers/sl5000/sl5000.pro
deleted file mode 100644
index e52cf0d..0000000
--- a/src/plugins/kbddrivers/sl5000/sl5000.pro
+++ /dev/null
@@ -1,16 +0,0 @@
-TARGET = qsl5000kbddriver
-include(../../qpluginbase.pri)
-
-QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/kbddrivers
-target.path = $$[QT_INSTALL_PLUGINS]/kbddrivers
-INSTALLS += target
-
-DEFINES += QT_QWS_KBD_SL5000 QT_QWS_KBD_TTY
-
-HEADERS	= $$QT_SOURCE_TREE/src/gui/embedded/qkbdsl5000_qws.h \
-          $$QT_SOURCE_TREE/src/gui/embedded/qkbdtty_qws.h
-
-SOURCES	= main.cpp \
-	$$QT_SOURCE_TREE/src/gui/embedded/qkbdsl5000_qws.cpp \
-        $$QT_SOURCE_TREE/src/gui/embedded/qkbdtty_qws.cpp
-
diff --git a/src/plugins/kbddrivers/vr41xx/main.cpp b/src/plugins/kbddrivers/vr41xx/main.cpp
deleted file mode 100644
index c9ba4d7..0000000
--- a/src/plugins/kbddrivers/vr41xx/main.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <qkbddriverplugin_qws.h>
-#include <qkbdvr41xx_qws.h>
-
-QT_BEGIN_NAMESPACE
-
-class QVr41xxKbdDriver : public QKbdDriverPlugin
-{
-public:
-    QVr41xxKbdDriver();
-
-    QStringList keys() const;
-    QWSKeyboardHandler* create(const QString &driver, const QString &device);
-};
-
-QVr41xxKbdDriver::QVr41xxKbdDriver()
-    : QKbdDriverPlugin()
-{
-}
-
-QStringList QVr41xxKbdDriver::keys() const
-{
-    return (QStringList() << QLatin1String("VR41xx"));
-}
-
-QWSKeyboardHandler* QVr41xxKbdDriver::create(const QString &driver,
-                                             const QString &device)
-{
-    if (driver.compare(QLatin1String("VR41xx"), Qt::CaseInsensitive))
-        return 0;
-    return new QWSVr41xxKeyboardHandler(device);
-}
-
-Q_EXPORT_PLUGIN2(qwsvr41xxkbddriver, QVr41xxKbdDriver)
-
-QT_END_NAMESPACE
diff --git a/src/plugins/kbddrivers/vr41xx/vr41xx.pro b/src/plugins/kbddrivers/vr41xx/vr41xx.pro
deleted file mode 100644
index f9f103f..0000000
--- a/src/plugins/kbddrivers/vr41xx/vr41xx.pro
+++ /dev/null
@@ -1,14 +0,0 @@
-TARGET = qvr41xxkbddriver
-include(../../qpluginbase.pri)
-
-QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/kbddrivers
-target.path = $$[QT_INSTALL_PLUGINS]/kbddrivers
-INSTALLS += target
-
-DEFINES += QT_QWS_KBD_VR41XX
-
-HEADERS	= $$QT_SOURCE_TREE/src/gui/embedded/qkbdvr41xx_qws.h
-
-SOURCES	= main.cpp \
-	$$QT_SOURCE_TREE/src/gui/embedded/qkbdvr41xx_qws.cpp
-
diff --git a/src/plugins/kbddrivers/yopy/main.cpp b/src/plugins/kbddrivers/yopy/main.cpp
deleted file mode 100644
index 7079d88..0000000
--- a/src/plugins/kbddrivers/yopy/main.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <qkbddriverplugin_qws.h>
-#include <qkbdyopy_qws.h>
-
-QT_BEGIN_NAMESPACE
-
-class QYopyKbdDriver : public QKbdDriverPlugin
-{
-public:
-    QYopyKbdDriver();
-
-    QStringList keys() const;
-    QWSKeyboardHandler* create(const QString &driver, const QString &device);
-};
-
-QYopyKbdDriver::QYopyKbdDriver()
-    : QKbdDriverPlugin()
-{
-}
-
-QStringList QYopyKbdDriver::keys() const
-{
-    return (QStringList() << QLatin1String("Yopy"));
-}
-
-QWSKeyboardHandler* QYopyKbdDriver::create(const QString &driver,
-                                           const QString &device)
-{
-    if (driver.compare(QLatin1String("Yopy"), Qt::CaseInsensitive))
-        return 0;
-    return new QWSYopyKeyboardHandler(device);
-}
-
-Q_EXPORT_PLUGIN2(qwsyopykbddriver, QYopyKbdDriver)
-
-QT_END_NAMESPACE
diff --git a/src/plugins/kbddrivers/yopy/yopy.pro b/src/plugins/kbddrivers/yopy/yopy.pro
deleted file mode 100644
index 66a663c..0000000
--- a/src/plugins/kbddrivers/yopy/yopy.pro
+++ /dev/null
@@ -1,14 +0,0 @@
-TARGET = qyopykbddriver
-include(../../qpluginbase.pri)
-
-QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/kbddrivers
-target.path = $$[QT_INSTALL_PLUGINS]/kbddrivers
-INSTALLS += target
-
-DEFINES += QT_QWS_KBD_YOPY
-
-HEADERS	= $$QT_SOURCE_TREE/src/gui/embedded/qkbdyopy_qws.h
-
-SOURCES	= main.cpp \
-	$$QT_SOURCE_TREE/src/gui/embedded/qkbdyopy_qws.cpp
-
diff --git a/src/plugins/mousedrivers/bus/bus.pro b/src/plugins/mousedrivers/bus/bus.pro
deleted file mode 100644
index cdb0332..0000000
--- a/src/plugins/mousedrivers/bus/bus.pro
+++ /dev/null
@@ -1,14 +0,0 @@
-TARGET = qbusmousedriver
-include(../../qpluginbase.pri)
-
-QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/mousedrivers
-target.path = $$[QT_INSTALL_PLUGINS]/mousedrivers
-INSTALLS += target
-
-DEFINES += QT_QWS_MOUSE_BUS
-
-HEADERS	= $$QT_SOURCE_TREE/src/gui/embedded/qmousebus_qws.h
-
-SOURCES	= main.cpp \
-	$$QT_SOURCE_TREE/src/gui/embedded/qmousebus_qws.cpp
-
diff --git a/src/plugins/mousedrivers/bus/main.cpp b/src/plugins/mousedrivers/bus/main.cpp
deleted file mode 100644
index f56c890..0000000
--- a/src/plugins/mousedrivers/bus/main.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <qmousedriverplugin_qws.h>
-#include <qmousebus_qws.h>
-
-QT_BEGIN_NAMESPACE
-
-class QBusMouseDriver : public QMouseDriverPlugin
-{
-public:
-    QBusMouseDriver();
-
-    QStringList keys() const;
-    QWSMouseHandler* create(const QString &driver, const QString &device);
-};
-
-QBusMouseDriver::QBusMouseDriver()
-    : QMouseDriverPlugin()
-{
-}
-
-QStringList QBusMouseDriver::keys() const
-{
-    return (QStringList() << "Bus");
-}
-
-QWSMouseHandler* QBusMouseDriver::create(const QString &driver,
-                                         const QString &device)
-{
-    if (driver.compare(QLatin1String("Bus"), Qt::CaseInsensitive))
-        return 0;
-    return new QWSBusMouseHandler(driver, device);
-}
-
-Q_EXPORT_PLUGIN2(qwsbusmousehandler, QBusMouseDriver)
-
-QT_END_NAMESPACE
diff --git a/src/plugins/mousedrivers/linuxis/linuxis.pro b/src/plugins/mousedrivers/linuxis/linuxis.pro
deleted file mode 100644
index bcc209b..0000000
--- a/src/plugins/mousedrivers/linuxis/linuxis.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-TARGET = linuxismousehandler
-include(../../qpluginbase.pri)
-
-QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/mousedrivers
-target.path = $$[QT_INSTALL_PLUGINS]/mousedrivers
-INSTALLS += target
-
-HEADERS = linuxismousedriverplugin.h linuxismousehandler.h
-SOURCES = linuxismousedriverplugin.cpp linuxismousehandler.cpp
-
diff --git a/src/plugins/mousedrivers/linuxis/linuxismousedriverplugin.cpp b/src/plugins/mousedrivers/linuxis/linuxismousedriverplugin.cpp
deleted file mode 100644
index 4d530d9..0000000
--- a/src/plugins/mousedrivers/linuxis/linuxismousedriverplugin.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "linuxismousedriverplugin.h"
-#include "linuxismousehandler.h"
-
-#include <qdebug.h>
-#if 1
-#define qLog(x) qDebug()
-#else
-#define qLog(x) while (0) qDebug()
-#endif
-LinuxInputSubsystemMouseDriverPlugin::LinuxInputSubsystemMouseDriverPlugin( QObject *parent )
-    : QMouseDriverPlugin( parent )
-{
-}
-
-LinuxInputSubsystemMouseDriverPlugin::~LinuxInputSubsystemMouseDriverPlugin()
-{
-}
-
-QWSMouseHandler* LinuxInputSubsystemMouseDriverPlugin::create(const QString& driver, const QString& device)
-{
-    if ( driver.toLower() == "linuxis" ) {
-        qLog(Input) << "Before call LinuxInputSubsystemMouseHandler()";
-        return new LinuxInputSubsystemMouseHandler(device);
-    }
-    return 0;
-}
-
-QWSMouseHandler* LinuxInputSubsystemMouseDriverPlugin::create(const QString& driver)
-{
-    if( driver.toLower() == "linuxis" ) {
-        qLog(Input) << "Before call LinuxInputSubsystemMouseHandler()";
-        return new LinuxInputSubsystemMouseHandler();
-    }
-    return 0;
-}
-
-QStringList LinuxInputSubsystemMouseDriverPlugin::keys() const
-{
-    return QStringList() << "linuxis";
-}
-
-Q_EXPORT_PLUGIN2(qwslinuxismousehandler, LinuxInputSubsystemMouseDriverPlugin)
diff --git a/src/plugins/mousedrivers/linuxis/linuxismousedriverplugin.h b/src/plugins/mousedrivers/linuxis/linuxismousedriverplugin.h
deleted file mode 100644
index 57759c5..0000000
--- a/src/plugins/mousedrivers/linuxis/linuxismousedriverplugin.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef LINUXISMOUSEDRIVERPLUGIN_H
-#define LINUXISMOUSEDRIVERPLUGIN_H
-
-#include <QtGui/QWSMouseHandlerFactoryInterface>
-
-class LinuxInputSubsystemMouseDriverPlugin : public QMouseDriverPlugin {
-    Q_OBJECT
-public:
-    LinuxInputSubsystemMouseDriverPlugin( QObject *parent  = 0 );
-    ~LinuxInputSubsystemMouseDriverPlugin();
-
-    QWSMouseHandler* create(const QString& driver);
-    QWSMouseHandler* create(const QString& driver, const QString& device);
-    QStringList keys()const;
-};
-
-#endif // LINUXISMOUSEDRIVERPLUGIN_H
diff --git a/src/plugins/mousedrivers/linuxis/linuxismousehandler.cpp b/src/plugins/mousedrivers/linuxis/linuxismousehandler.cpp
deleted file mode 100644
index aaa6eae..0000000
--- a/src/plugins/mousedrivers/linuxis/linuxismousehandler.cpp
+++ /dev/null
@@ -1,180 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "linuxismousehandler.h"
-
-#include <QFile>
-#include <QTextStream>
-#include <QScreen>
-#include <QSocketNotifier>
-#include <QDebug>
-
-#include <qdebug.h>
-
-#include <string.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <limits.h>
-
-#include <linux/input.h>
-
-
-#if 1
-#define qLog(x) qDebug()
-#else
-#define qLog(x) while (0) qDebug()
-#endif
-
-
-// sanity check values of the range of possible mouse positions
-#define MOUSE_SAMPLE_MIN    0
-#define MOUSE_SAMPLE_MAX    2000
-
-LinuxInputSubsystemMouseHandler::LinuxInputSubsystemMouseHandler(const QString &device)
-    : mouseX(0), mouseY(0), mouseBtn(0), mouseIdx(0)
-{
-    qLog(Input) << "Loaded LinuxInputSubsystem touchscreen plugin!";
-    setObjectName("LinuxInputSubsystem Mouse Handler");
-    mouseFd = ::open(device.toLocal8Bit().constData(), O_RDONLY | O_NDELAY);
-    // mouseFd = ::open(device.toLocal8Bit().constData(), O_RDONLY);
-    if (mouseFd >= 0) {
-        qLog(Input) << "Opened" << device << "as touchscreen input";
-        m_notify = new QSocketNotifier(mouseFd, QSocketNotifier::Read, this);
-        connect(m_notify, SIGNAL(activated(int)), this, SLOT(readMouseData()));
-    } else {
-        qWarning("Cannot open %s for touchscreen input (%s)",
-                 device.toLocal8Bit().constData(), strerror(errno));
-        return;
-    }
-}
-
-LinuxInputSubsystemMouseHandler::~LinuxInputSubsystemMouseHandler()
-{
-    if (mouseFd >= 0)
-        ::close(mouseFd);
-}
-
-void LinuxInputSubsystemMouseHandler::suspend()
-{
-    m_notify->setEnabled( false );
-}
-
-void LinuxInputSubsystemMouseHandler::resume()
-{
-    m_notify->setEnabled( true );
-}
-
-void LinuxInputSubsystemMouseHandler::readMouseData()
-{
-    if (!qt_screen)
-        return;
-
-    int n;
-
-    do {
-        n = read(mouseFd, mouseBuf + mouseIdx, mouseBufSize - mouseIdx);
-        if (n > 0)
-            mouseIdx += n;
-
-        struct input_event *data;
-        int idx = 0;
-
-        while (mouseIdx-idx >= (int)sizeof(struct input_event)) {
-            uchar *mb = mouseBuf + idx;
-            data = (struct input_event *) mb;
-	    // qLog(Input) << "mouse event type =" << data->type << "code =" << data->code << "value =" << data->value;
-	    bool unknown = false;
-	    if (data->type == EV_ABS) {
-		if (data->code == ABS_X) {
-                    //qLog(Input) << "\tABS_X" << data->value;
-		    mouseX = data->value;
-		} else if (data->code == ABS_Y) {
-                    //qLog(Input) << "\tABS_Y" << data->value;
-		    mouseY = data->value;
-		} else {
-		    unknown = true;
-		}
-	    } else if (data->type == EV_REL) {
-                //qLog(Input) << "\tEV_REL" << hex << data->code << dec << data->value;
-                if (data->code == REL_X) {
-                    mouseX += data->value;
-                } else if (data->code == REL_Y) {
-                    mouseY += data->value;
-                } else {
-                    unknown = true;
-                }
-	    } else if (data->type == EV_KEY && data->code == BTN_TOUCH) {
-                qLog(Input) << "\tBTN_TOUCH" << data->value;
-		mouseBtn = data->value ? Qt::LeftButton : 0;
-	    } else if (data->type == EV_KEY) {
-                int button = 0;
-                switch (data->code) {
-                case BTN_LEFT: button = Qt::LeftButton; break;
-                case BTN_MIDDLE: button = Qt::MidButton; break;
-                case BTN_RIGHT: button = Qt::RightButton; break;
-                }
-                if (data->value)
-                    mouseBtn |= button;
-                else
-                    mouseBtn &= ~button;
-	    } else if (data->type == EV_SYN && data->code == SYN_REPORT) {
-		QPoint pos( mouseX, mouseY );
-                oldmouse = transform( pos );
-                //qLog(Input) << "\tSYN_REPORT" << mouseBtn << pos << oldmouse;
-                emit mouseChanged(oldmouse, mouseBtn);
-
-	    } else {
-		unknown = true;
-	    }
-	    if (unknown) {
-		qWarning("unknown mouse event type=%x, code=%x, value=%x", data->type, data->code, data->value);
-	    }
-	    idx += sizeof(struct input_event);
-        }
-        int surplus = mouseIdx - idx;
-        for (int i = 0; i < surplus; i++)
-            mouseBuf[i] = mouseBuf[idx+i];
-        mouseIdx = surplus;
-    } while (n > 0);
-}
-
diff --git a/src/plugins/mousedrivers/linuxis/linuxismousehandler.h b/src/plugins/mousedrivers/linuxis/linuxismousehandler.h
deleted file mode 100644
index c898ddb..0000000
--- a/src/plugins/mousedrivers/linuxis/linuxismousehandler.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef LINUXISMOUSEHANDLER_H
-#define LINUXISMOUSEHANDLER_H
-
-#include <QtGui/QWSCalibratedMouseHandler>
-
-class QSocketNotifier;
-class LinuxInputSubsystemMouseHandler : public QObject, public QWSCalibratedMouseHandler {
-    Q_OBJECT
-public:
-    LinuxInputSubsystemMouseHandler(const QString &device = QString("/dev/input/event0"));
-    ~LinuxInputSubsystemMouseHandler();
-
-    void suspend();
-    void resume();
-
-private:
-    int mouseX, mouseY;
-    int mouseBtn;
-    static const int mouseBufSize = 2048;
-    uchar mouseBuf[mouseBufSize];
-    int mouseIdx;
-    QPoint oldmouse;
-
-    QSocketNotifier *m_notify;
-    int  mouseFd;
-
-private Q_SLOTS:
-    void readMouseData();
-};
-
-#endif // LINUXISMOUSEHANDLER_H
diff --git a/src/plugins/mousedrivers/mousedrivers.pro b/src/plugins/mousedrivers/mousedrivers.pro
index e644361..f89682b 100644
--- a/src/plugins/mousedrivers/mousedrivers.pro
+++ b/src/plugins/mousedrivers/mousedrivers.pro
@@ -1,8 +1,5 @@
 TEMPLATE = subdirs
-contains(mouse-plugins, bus): SUBDIRS += bus
 contains(mouse-plugins, linuxtp): SUBDIRS += linuxtp
 contains(mouse-plugins, pc): SUBDIRS += pc
 contains(mouse-plugins, tslib): SUBDIRS += tslib
-contains(mouse-plugins, vr41xx): SUBDIRS += vr41xx
-contains(mouse-plugins, yopy): SUBDIRS += yopy
-contains(mouse-plugins, linuxis): SUBDIRS += linuxis
+contains(mouse-plugins, linuxinput): SUBDIRS += linuxinput
diff --git a/src/plugins/mousedrivers/vr41xx/main.cpp b/src/plugins/mousedrivers/vr41xx/main.cpp
deleted file mode 100644
index 8802a02..0000000
--- a/src/plugins/mousedrivers/vr41xx/main.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <qmousedriverplugin_qws.h>
-#include <qmousevr41xx_qws.h>
-
-QT_BEGIN_NAMESPACE
-
-class QVr41xxMouseDriver : public QMouseDriverPlugin
-{
-public:
-    QVr41xxMouseDriver();
-
-    QStringList keys() const;
-    QWSMouseHandler* create(const QString &driver, const QString &device);
-};
-
-QVr41xxMouseDriver::QVr41xxMouseDriver()
-    : QMouseDriverPlugin()
-{
-}
-
-QStringList QVr41xxMouseDriver::keys() const
-{
-    return (QStringList() << QLatin1String("VR41xx"));
-}
-
-QWSMouseHandler* QVr41xxMouseDriver::create(const QString &driver,
-                                            const QString &device)
-{
-    if (driver.compare(QLatin1String("VR41xx"), Qt::CaseInsensitive))
-        return 0;
-    return new QWSVr41xxMouseHandler(driver, device);
-}
-
-Q_EXPORT_PLUGIN2(qwsvr41xxmousehandler, QVr41xxMouseDriver)
-
-QT_END_NAMESPACE
diff --git a/src/plugins/mousedrivers/vr41xx/vr41xx.pro b/src/plugins/mousedrivers/vr41xx/vr41xx.pro
deleted file mode 100644
index 1c22d04..0000000
--- a/src/plugins/mousedrivers/vr41xx/vr41xx.pro
+++ /dev/null
@@ -1,14 +0,0 @@
-TARGET = qvr41xxmousedriver
-include(../../qpluginbase.pri)
-
-QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/mousedrivers
-target.path = $$[QT_INSTALL_PLUGINS]/mousedrivers
-INSTALLS += target
-
-DEFINES += QT_QWS_MOUSE_VR41XX
-
-HEADERS	= $$QT_SOURCE_TREE/src/gui/embedded/qmousevr41xx_qws.h
-
-SOURCES	= main.cpp \
-	$$QT_SOURCE_TREE/src/gui/embedded/qmousevr41xx_qws.cpp
-
diff --git a/src/plugins/mousedrivers/yopy/main.cpp b/src/plugins/mousedrivers/yopy/main.cpp
deleted file mode 100644
index 9db9c4f..0000000
--- a/src/plugins/mousedrivers/yopy/main.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <qmousedriverplugin_qws.h>
-#include <qmouseyopy_qws.h>
-
-QT_BEGIN_NAMESPACE
-
-class QYopyMouseDriver : public QMouseDriverPlugin
-{
-public:
-    QYopyMouseDriver();
-
-    QStringList keys() const;
-    QWSMouseHandler* create(const QString &driver, const QString &device);
-};
-
-QYopyMouseDriver::QYopyMouseDriver()
-    : QMouseDriverPlugin()
-{
-}
-
-QStringList QYopyMouseDriver::keys() const
-{
-    return (QStringList() << QLatin1String("Yopy"));
-}
-
-QWSMouseHandler* QYopyMouseDriver::create(const QString &driver,
-                                          const QString &device)
-{
-    if (driver.compare(QLatin1String("yopy"), Qt::CaseInsensitive))
-        return 0;
-    return new QWSYopyMouseHandler(driver, device);
-}
-
-Q_EXPORT_PLUGIN2(qwsyopymousehandler, QYopyMouseDriver)
-
-QT_END_NAMESPACE
diff --git a/src/plugins/mousedrivers/yopy/yopy.pro b/src/plugins/mousedrivers/yopy/yopy.pro
deleted file mode 100644
index 3045430..0000000
--- a/src/plugins/mousedrivers/yopy/yopy.pro
+++ /dev/null
@@ -1,14 +0,0 @@
-TARGET = qyopymousedriver
-include(../../qpluginbase.pri)
-
-QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/mousedrivers
-target.path = $$[QT_INSTALL_PLUGINS]/mousedrivers
-INSTALLS += target
-
-DEFINES += QT_QWS_MOUSE_YOPY
-
-HEADERS	= $$QT_SOURCE_TREE/src/gui/embedded/qmouseyopy_qws.h
-
-SOURCES	= main.cpp \
-	$$QT_SOURCE_TREE/src/gui/embedded/qmouseyopy_qws.cpp
-
diff --git a/src/qt3support/widgets/q3dockarea.cpp b/src/qt3support/widgets/q3dockarea.cpp
index a823caa..d76835a 100644
--- a/src/qt3support/widgets/q3dockarea.cpp
+++ b/src/qt3support/widgets/q3dockarea.cpp
@@ -482,7 +482,7 @@ int Q3DockAreaLayout::widthForHeight(int h) const
     \img qmainwindow-qdockareas.png QMainWindow's Q3DockAreas
 
     \target lines
-    \section2 Lines.
+    \section1 Lines.
 
     Q3DockArea uses the concept of lines. A line is a horizontal
     region which may contain dock windows side-by-side. A dock area
diff --git a/src/script/qscriptengine.cpp b/src/script/qscriptengine.cpp
index de78403..911d714 100644
--- a/src/script/qscriptengine.cpp
+++ b/src/script/qscriptengine.cpp
@@ -935,7 +935,7 @@ QScriptSyntaxCheckResult QScriptEngine::checkSyntax(const QString &program)
   the file name is accessible through the "fileName" property if it's
   provided with this function.
 
-  \sa canEvaluate(), hasUncaughtException(), isEvaluating(), abortEvaluation()
+  \sa checkSyntax(), hasUncaughtException(), isEvaluating(), abortEvaluation()
 */
 QScriptValue QScriptEngine::evaluate(const QString &program, const QString &fileName, int lineNumber)
 {
diff --git a/src/script/qscriptvalue.cpp b/src/script/qscriptvalue.cpp
index 48e1318..520e76f 100644
--- a/src/script/qscriptvalue.cpp
+++ b/src/script/qscriptvalue.cpp
@@ -1442,7 +1442,7 @@ bool QScriptValue::isUndefined() const
   Note that function values, variant values, and QObject values are
   objects, so this function returns true for such values.
 
-  \sa toObject(), QScriptEngine::newObject()
+  \sa QScriptEngine::toObject(), QScriptEngine::newObject()
 */
 bool QScriptValue::isObject() const
 {
diff --git a/src/testlib/qtest.h b/src/testlib/qtest.h
index 9d6f68d..8cdfab0 100644
--- a/src/testlib/qtest.h
+++ b/src/testlib/qtest.h
@@ -53,6 +53,7 @@
 #include <QtCore/qstringlist.h>
 #include <QtCore/qdatetime.h>
 #include <QtCore/qobject.h>
+#include <QtCore/qvariant.h>
 #include <QtCore/qurl.h>
 
 #include <QtCore/qpoint.h>
@@ -146,6 +147,30 @@ template<> inline char *toString(const QUrl &uri)
     return qstrdup(uri.toEncoded().constData());
 }
 
+template<> inline char *toString(const QVariant &v)
+{
+    QByteArray vstring("QVariant(");
+    if (v.isValid()) {
+        QByteArray type(v.typeName());
+        if (type.isEmpty()) {
+            type = QByteArray::number(v.userType());
+        }
+        vstring.append(type);
+        if (!v.isNull()) {
+            vstring.append(',');
+            if (v.canConvert(QVariant::String)) {
+                vstring.append(qVariantValue<QString>(v).toLatin1());
+            }
+            else {
+                vstring.append("<value not representable as string>");
+            }
+        }
+    }
+    vstring.append(')');
+
+    return qstrdup(vstring.constData());
+}
+
 #ifndef QTEST_NO_SPECIALIZATIONS
 template<>
 #endif
diff --git a/src/testlib/qtestcoreelement.h b/src/testlib/qtestcoreelement.h
index a6aa56d..8c029b5 100644
--- a/src/testlib/qtestcoreelement.h
+++ b/src/testlib/qtestcoreelement.h
@@ -74,7 +74,7 @@ class QTestCoreElement: public QTestCoreList<ElementType>
 
 template<class ElementType>
 QTestCoreElement<ElementType>::QTestCoreElement(int t)
-:listOfAttributes(0), type((QTest::LogElementType)t)
+    :listOfAttributes(0), type(QTest::LogElementType(t))
 {
 }
 
diff --git a/src/testlib/qtestfilelogger.cpp b/src/testlib/qtestfilelogger.cpp
index a717058..a64a452 100644
--- a/src/testlib/qtestfilelogger.cpp
+++ b/src/testlib/qtestfilelogger.cpp
@@ -73,10 +73,10 @@ void QTestFileLogger::init()
                 QTestResult::currentTestObjectName());
 
     // Keep filenames simple
-    for (int i = 0; i < sizeof(filename) && filename[i]; ++i) {
+    for (uint i = 0; i < sizeof(filename) && filename[i]; ++i) {
         char& c = filename[i];
-        if (!(c >= 'a' && c <= 'z' || c >= 'A' && c <= 'Z' || c >= '0' && c <= '9' || c == '-'
-            || c == '.')) {
+        if (!((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')
+              || (c >= '0' && c <= '9') || c == '-' || c == '.')) {
             c = '_';
         }
     }
diff --git a/src/xml/sax/qxml.cpp b/src/xml/sax/qxml.cpp
index 6be6988..3b1726b 100644
--- a/src/xml/sax/qxml.cpp
+++ b/src/xml/sax/qxml.cpp
@@ -244,6 +244,16 @@ public:
 class QXmlParseExceptionPrivate
 {
 public:
+    QXmlParseExceptionPrivate()
+        : column(-1), line(-1)
+    {
+    }
+    QXmlParseExceptionPrivate(const QXmlParseExceptionPrivate &other)
+        : msg(other.msg), column(other.column), line(other.line),
+          pub(other.pub), sys(other.sys)
+    {
+    }
+
     QString msg;
     int column;
     int line;
@@ -553,6 +563,14 @@ QXmlParseException::QXmlParseException(const QString& name, int c, int l,
 }
 
 /*!
+    Creates a copy of \a other.
+*/
+QXmlParseException::QXmlParseException(const QXmlParseException& other)
+{
+    d = new QXmlParseExceptionPrivate(*other.d);
+}
+
+/*!
     Destroys the QXmlParseException.
 */
 QXmlParseException::~QXmlParseException()
@@ -3012,19 +3030,13 @@ void QXmlSimpleReaderPrivate::initIncrementalParsing()
     parse() to work incrementally, and making subsequent calls to the
     parseContinue() function, until all the data has been processed.
 
-    A common way to perform incremental parsing is to connect the
-    \c readyRead() signal of the input source to a slot, and handle the
-    incoming data there. For example, the following code shows how a
-    parser for \l{http://web.resource.org/rss/1.0/}{RSS feeds} can be
-    used to incrementally parse data that it receives from a QHttp
-    object:
-
-    \snippet doc/src/snippets/xml/rsslisting/rsslisting.cpp 1
-
+    A common way to perform incremental parsing is to connect the \c
+    readyRead() signal of a \l{QNetworkReply} {network reply} a slot,
+    and handle the incoming data there. See QNetworkAccessManager.
+    
     Aspects of the parsing behavior can be adapted using setFeature()
-    and setProperty(). For example, the following code could be used
-    to enable reporting of namespace prefixes to the content handler:
-
+    and setProperty().
+    
     QXmlSimpleReader is not reentrant. If you want to use the class
     in threaded code, lock the code using QXmlSimpleReader with a
     locking mechanism, such as a QMutex.
diff --git a/src/xml/sax/qxml.h b/src/xml/sax/qxml.h
index 8aa7e63..6ccd44e 100644
--- a/src/xml/sax/qxml.h
+++ b/src/xml/sax/qxml.h
@@ -193,6 +193,7 @@ class Q_XML_EXPORT QXmlParseException
 public:
     explicit QXmlParseException(const QString &name = QString(), int c = -1, int l = -1,
                                 const QString &p = QString(), const QString &s = QString());
+    QXmlParseException(const QXmlParseException &other);
     ~QXmlParseException();
 
     int columnNumber() const;
diff --git a/src/xmlpatterns/parser/qmaintainingreader.cpp b/src/xmlpatterns/parser/qmaintainingreader.cpp
index 0513555..292e0fd 100644
--- a/src/xmlpatterns/parser/qmaintainingreader.cpp
+++ b/src/xmlpatterns/parser/qmaintainingreader.cpp
@@ -147,7 +147,8 @@ void MaintainingReader<TokenLookupClass, LookupKey>::validateElement(const Looku
 
     if(m_elementDescriptions.contains(elementName))
     {
-        const ElementDescription<TokenLookupClass, LookupKey> &desc = m_elementDescriptions.value(elementName);
+        // QHash::value breaks in Metrowerks Compiler
+        const ElementDescription<TokenLookupClass, LookupKey> &desc = *m_elementDescriptions.find(elementName);
         const int attCount = m_currentAttributes.count();
 
         QSet<typename TokenLookupClass::NodeName> encounteredXSLTAtts;
@@ -172,7 +173,7 @@ void MaintainingReader<TokenLookupClass, LookupKey>::validateElement(const Looku
                     QStringList allowed;
 
                     for(int i = 0; i < totalCount; ++i)
-                        allowed.append(formatKeyword(toString(all.at(i))));
+                        allowed.append(QPatternist::formatKeyword(TokenLookupClass::toString(all.at(i))));
 
                     /* Note, we can't run toString() on attrName, because we're in this branch,
                      * the token lookup doesn't have the string(!).*/
@@ -229,7 +230,7 @@ void MaintainingReader<TokenLookupClass, LookupKey>::validateElement(const Looku
         if(!requiredButMissing.isEmpty())
         {
             error(QtXmlPatterns::tr("The attribute %1 must appear on element %2.")
-                             .arg(formatKeyword(toString(*requiredButMissing.constBegin())),
+                             .arg(QPatternist::formatKeyword(TokenLookupClass::toString(*requiredButMissing.constBegin())),
                                   formatKeyword(name())),
                   ReportContext::XTSE0010);
         }
diff --git a/src/xmlpatterns/parser/qmaintainingreader_p.h b/src/xmlpatterns/parser/qmaintainingreader_p.h
index c2c991e..eb20bdb 100644
--- a/src/xmlpatterns/parser/qmaintainingreader_p.h
+++ b/src/xmlpatterns/parser/qmaintainingreader_p.h
@@ -59,6 +59,7 @@
 #include <QXmlStreamReader>
 
 #include "qxpathhelper_p.h"
+#include "qxslttokenlookup_p.h"
 
 class QUrl;