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

71 files changed, 404 insertions, 177 deletions

diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/unicode/Unicode.h b/src/3rdparty/webkit/JavaScriptCore/wtf/unicode/Unicode.h
index e6e8f23..5b849e4 100644
--- a/src/3rdparty/webkit/JavaScriptCore/wtf/unicode/Unicode.h
+++ b/src/3rdparty/webkit/JavaScriptCore/wtf/unicode/Unicode.h
@@ -32,6 +32,6 @@
 #error "Unknown Unicode implementation"
 #endif
 
-COMPILE_ASSERT(sizeof(UChar) == 2, UCharIsTwoBytes);
+COMPILE_ASSERT(sizeof(UChar) == 2, UCharIsTwoBytes)
 
 #endif // WTF_UNICODE_H
diff --git a/src/corelib/codecs/qutfcodec.cpp b/src/corelib/codecs/qutfcodec.cpp
index 1ac592e..d9defe1 100644
--- a/src/corelib/codecs/qutfcodec.cpp
+++ b/src/corelib/codecs/qutfcodec.cpp
@@ -478,7 +478,7 @@ QByteArray QUtf32Codec::convertFromUnicode(const QChar *uc, int len, ConverterSt
             data[2] = 0;
             data[3] = 0;
         }
-        data += 2;
+        data += 4;
     }
     if (endian == BE) {
         for (int i = 0; i < len; ++i) {
diff --git a/src/corelib/global/qfeatures.h b/src/corelib/global/qfeatures.h
index f11c9df..9f7c7ba 100644
--- a/src/corelib/global/qfeatures.h
+++ b/src/corelib/global/qfeatures.h
@@ -311,6 +311,11 @@
 #define QT_NO_ACCESSIBILITY
 #endif
 
+// Animation
+#if !defined(QT_NO_ANIMATION) && (defined(QT_NO_PROPERTIES))
+#define QT_NO_ANIMATION
+#endif
+
 // QButtonGroup
 #if !defined(QT_NO_BUTTONGROUP) && (defined(QT_NO_GROUPBOX))
 #define QT_NO_BUTTONGROUP
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 3990c7d..a10b6d6 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -1004,6 +1004,7 @@ typedef int QNoImplicitBoolCast;
 #define QT_NO_FPU
 #endif
 
+// This logic must match the one in qmetatype.h
 #if defined(QT_COORD_TYPE)
 typedef QT_COORD_TYPE qreal;
 #elif defined(QT_NO_FPU) || defined(QT_ARCH_ARM) || defined(QT_ARCH_WINDOWSCE)
diff --git a/src/corelib/global/qt_windows.h b/src/corelib/global/qt_windows.h
index 2ce4059..7fc7f47 100644
--- a/src/corelib/global/qt_windows.h
+++ b/src/corelib/global/qt_windows.h
@@ -106,6 +106,9 @@
 #ifndef WM_MOUSEWHEEL
 #define WM_MOUSEWHEEL 0x020A
 #endif
+#ifndef WM_MOUSEHWHEEL
+#define WM_MOUSEHWHEEL 0x020E
+#endif
 #ifndef ETO_PDY
 #define ETO_PDY 0x2000
 #endif
diff --git a/src/corelib/kernel/qcoreapplication_win.cpp b/src/corelib/kernel/qcoreapplication_win.cpp
index 815a558..9c1c235 100644
--- a/src/corelib/kernel/qcoreapplication_win.cpp
+++ b/src/corelib/kernel/qcoreapplication_win.cpp
@@ -409,6 +409,7 @@ struct {
  { 0x020B, "WM_XBUTTONDOWN" },
  { 0x020C, "WM_XBUTTONUP" },
  { 0x020D, "WM_XBUTTONDBLCLK" },
+ { 0x020E, "WM_MOUSEHWHEEL" },
  { 0x0210, "WM_PARENTNOTIFY" },
  { 0x0211, "WM_ENTERMENULOOP" },
  { 0x0212, "WM_EXITMENULOOP" },
@@ -898,6 +899,9 @@ QString decodeMSG(const MSG& msg)
 #ifdef WM_MOUSEWHEEL
         case WM_MOUSEWHEEL:
 #endif
+#ifdef WM_MOUSEHWHEEL
+        case WM_MOUSEHWHEEL:
+#endif
 #ifdef WM_LBUTTONDBLCLK
         case WM_LBUTTONDBLCLK:
 #endif
diff --git a/src/corelib/kernel/qeventdispatcher_unix.cpp b/src/corelib/kernel/qeventdispatcher_unix.cpp
index 1b9cb93..033225b 100644
--- a/src/corelib/kernel/qeventdispatcher_unix.cpp
+++ b/src/corelib/kernel/qeventdispatcher_unix.cpp
@@ -420,10 +420,18 @@ bool QTimerInfoList::timerWait(timeval &tm)
     timeval currentTime = updateCurrentTime();
     repairTimersIfNeeded();
 
-    if (isEmpty())
-        return false;
+    // Find first waiting timer not already active
+    QTimerInfo *t = 0;
+    for (QTimerInfoList::const_iterator it = constBegin(); it != constEnd(); ++it) {
+	if (!(*it)->inTimerEvent) {
+	    t = *it;
+	    break;
+	}
+    }
+
+    if (!t)
+      return false;
 
-    QTimerInfo *t = first();        // first waiting timer
     if (currentTime < t->timeout) {
         // time to wait
         tm = t->timeout - currentTime;
diff --git a/src/corelib/kernel/qeventdispatcher_win.cpp b/src/corelib/kernel/qeventdispatcher_win.cpp
index 2dd5534..7d3a13a 100644
--- a/src/corelib/kernel/qeventdispatcher_win.cpp
+++ b/src/corelib/kernel/qeventdispatcher_win.cpp
@@ -696,7 +696,8 @@ bool QEventDispatcherWin32::processEvents(QEventLoop::ProcessEventsFlags flags)
                          && msg.message <= WM_KEYLAST)
                         || (msg.message >= WM_MOUSEFIRST
                             && msg.message <= WM_MOUSELAST)
-                        || msg.message == WM_MOUSEWHEEL)) {
+                        || msg.message == WM_MOUSEWHEEL
+                        || msg.message == WM_MOUSEHWHEEL)) {
                     // queue user input events for later processing
                     haveMessage = false;
                     d->queuedUserInputEvents.append(msg);
diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp
index b65f956..6f3316c 100644
--- a/src/corelib/kernel/qmetaobject.cpp
+++ b/src/corelib/kernel/qmetaobject.cpp
@@ -2003,6 +2003,11 @@ QVariant::Type QMetaProperty::type() const
         if (enumMetaTypeId == 0)
             return QVariant::Int;
     }
+#ifdef QT_COORD_TYPE
+    // qreal metatype must be resolved at runtime.
+    if (strcmp(typeName(), "qreal") == 0)
+        return QVariant::Type(qMetaTypeId<qreal>());
+#endif
 
     return QVariant::UserType;
 }
diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp
index ce10bae..a0b954f 100644
--- a/src/corelib/kernel/qmetatype.cpp
+++ b/src/corelib/kernel/qmetatype.cpp
@@ -179,6 +179,7 @@ QT_BEGIN_NAMESPACE
     \omitvalue LastCoreExtType
     \omitvalue LastCoreType
     \omitvalue LastGuiType
+    \omitvalue QReal
 
     Additional types can be registered using Q_DECLARE_METATYPE().
 
diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h
index 648f933..be8a667 100644
--- a/src/corelib/kernel/qmetatype.h
+++ b/src/corelib/kernel/qmetatype.h
@@ -86,6 +86,15 @@ public:
         UShort = 133, UChar = 134, Float = 135, QObjectStar = 136, QWidgetStar = 137,
         LastCoreExtType = 137 /* QWidgetStar */,
 
+// This logic must match the one in qglobal.h
+#if defined(QT_COORD_TYPE)
+        QReal = 0,
+#elif defined(QT_NO_FPU) || defined(QT_ARCH_ARM) || defined(QT_ARCH_WINDOWSCE)
+        QReal = Float,
+#else
+        QReal = Double,
+#endif
+
         User = 256
     };
 
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index 543422c..1501351 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -897,7 +897,8 @@ QObjectPrivate::Connection::~Connection()
     \relates QObject
 
     Returns the given \a object cast to type T if the object is of type
-    T (or of a subclass); otherwise returns 0.
+    T (or of a subclass); otherwise returns 0.  If \a object is 0 then 
+    it will also return 0.
 
     The class T must inherit (directly or indirectly) QObject and be
     declared with the \l Q_OBJECT macro.
diff --git a/src/corelib/kernel/qobjectdefs.h b/src/corelib/kernel/qobjectdefs.h
index 3a22323..f5d08ce 100644
--- a/src/corelib/kernel/qobjectdefs.h
+++ b/src/corelib/kernel/qobjectdefs.h
@@ -55,7 +55,7 @@ class QByteArray;
 class QString;
 
 #ifndef Q_MOC_OUTPUT_REVISION
-#define Q_MOC_OUTPUT_REVISION 61
+#define Q_MOC_OUTPUT_REVISION 62
 #endif
 
 // The following macros are our "extensions" to C++
diff --git a/src/corelib/kernel/qtranslator.cpp b/src/corelib/kernel/qtranslator.cpp
index 5ba9898..38fa216 100644
--- a/src/corelib/kernel/qtranslator.cpp
+++ b/src/corelib/kernel/qtranslator.cpp
@@ -149,6 +149,9 @@ static int numerusHelper(int n, const uchar *rules, int rulesSize)
                     leftOperand %= 10;
                 } else if (opcode & Q_MOD_100) {
                     leftOperand %= 100;
+                } else if (opcode & Q_LEAD_1000) {
+                    while (leftOperand >= 1000)
+                        leftOperand /= 1000;
                 }
 
                 int op = opcode & Q_OP_MASK;
diff --git a/src/corelib/kernel/qtranslator_p.h b/src/corelib/kernel/qtranslator_p.h
index 77ec8f5..a7d58c5 100644
--- a/src/corelib/kernel/qtranslator_p.h
+++ b/src/corelib/kernel/qtranslator_p.h
@@ -62,6 +62,7 @@ enum {
     Q_NOT         = 0x08,
     Q_MOD_10      = 0x10,
     Q_MOD_100     = 0x20,
+    Q_LEAD_1000   = 0x40,
 
     Q_AND         = 0xFD,
     Q_OR          = 0xFE,
diff --git a/src/corelib/tools/qstringbuilder.h b/src/corelib/tools/qstringbuilder.h
index 1e67b7d..7b16197 100644
--- a/src/corelib/tools/qstringbuilder.h
+++ b/src/corelib/tools/qstringbuilder.h
@@ -169,6 +169,30 @@ template <> struct QConcatenable<QStringRef>
     }
 };
 
+#ifndef QT_NO_CAST_FROM_ASCII
+template <int N> struct QConcatenable<char[N]>
+{
+    typedef char type[N];
+    static int size(const char *) { return N - 1; }
+    static inline void appendTo(const char *a, QChar *&out)
+    {
+        for (int i = 0; i < N - 1; ++i)
+            *out++ = QLatin1Char(a[i]);
+    }
+};
+
+template <> struct QConcatenable<const char *>
+{
+    typedef char const *type;
+    static int size(const char *a) { return qstrlen(a); }
+    static inline void appendTo(const char *a, QChar *&out)
+    {
+        while (*a)
+            *out++ = QLatin1Char(*a++);
+    }
+};
+#endif
+
 template <typename A, typename B>
 struct QConcatenable< QStringBuilder<A, B> >
 {
diff --git a/src/dbus/qdbus_symbols_p.h b/src/dbus/qdbus_symbols_p.h
index 764d368..db5e1bb 100644
--- a/src/dbus/qdbus_symbols_p.h
+++ b/src/dbus/qdbus_symbols_p.h
@@ -353,7 +353,7 @@ DEFINEFUNC(dbus_bool_t     , dbus_signature_validate_single, (const char       *
                                                               DBusError        *error),
            (signature, error), return)
 DEFINEFUNC(dbus_bool_t     , dbus_type_is_basic, (int            typecode),
-           (typecode), return);
+           (typecode), return)
 DEFINEFUNC(dbus_bool_t     , dbus_type_is_fixed, (int            typecode),
            (typecode), return)
 
diff --git a/src/dbus/qdbusmessage.cpp b/src/dbus/qdbusmessage.cpp
index 19f0b04..96dcd3b 100644
--- a/src/dbus/qdbusmessage.cpp
+++ b/src/dbus/qdbusmessage.cpp
@@ -161,7 +161,6 @@ DBusMessage *QDBusMessagePrivate::toDBusMessage(const QDBusMessage &message)
 
     // not ok;
     q_dbus_message_unref(msg);
-    Q_ASSERT(false);
     return 0;
 }
 
diff --git a/src/dbus/qdbusthreaddebug_p.h b/src/dbus/qdbusthreaddebug_p.h
index 20d819f..f2ac598 100644
--- a/src/dbus/qdbusthreaddebug_p.h
+++ b/src/dbus/qdbusthreaddebug_p.h
@@ -100,7 +100,7 @@ enum ThreadAction {
     RemoveWatchAction = 61,
     ToggleWatchAction = 62,
     SocketReadAction = 63,
-    SocketWriteAction = 64,
+    SocketWriteAction = 64
 };
 
 struct QDBusLockerBase
diff --git a/src/gui/accessible/qaccessible.cpp b/src/gui/accessible/qaccessible.cpp
index b0878ab..bd8a9ec 100644
--- a/src/gui/accessible/qaccessible.cpp
+++ b/src/gui/accessible/qaccessible.cpp
@@ -394,7 +394,7 @@ Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader,
     (QAccessibleFactoryInterface_iid, QLatin1String("/accessible")))
 #endif
 
-Q_GLOBAL_STATIC(QList<QAccessible::InterfaceFactory>, qAccessibleFactories);
+Q_GLOBAL_STATIC(QList<QAccessible::InterfaceFactory>, qAccessibleFactories)
 
 QAccessible::UpdateHandler QAccessible::updateHandler = 0;
 QAccessible::RootObjectHandler QAccessible::rootObjectHandler = 0;
diff --git a/src/gui/dialogs/qcolordialog.cpp b/src/gui/dialogs/qcolordialog.cpp
index 7e885da..dc7e3cc 100644
--- a/src/gui/dialogs/qcolordialog.cpp
+++ b/src/gui/dialogs/qcolordialog.cpp
@@ -1750,7 +1750,7 @@ void QColorDialog::setVisible(bool visible)
     \overload
     \since 4.5
 
-    Opens the dialog and connects its accepted() signal to the slot specified
+    Opens the dialog and connects its colorSelected() signal to the slot specified
     by \a receiver and \a member.
 
     The signal will be disconnected from the slot when the dialog is closed.
diff --git a/src/gui/dialogs/qfiledialog.cpp b/src/gui/dialogs/qfiledialog.cpp
index 76f0309..493cec5 100644
--- a/src/gui/dialogs/qfiledialog.cpp
+++ b/src/gui/dialogs/qfiledialog.cpp
@@ -638,8 +638,9 @@ QFileDialog::Options QFileDialog::options() const
 
     \since 4.5
 
-    Opens the dialog and connects its accepted() signal to the slot specified
-    by \a receiver and \a member.
+    This function connects one of its signals to the slot specified by \a receiver
+    and \a member. The specific signal depends is filesSelected() if fileMode is
+    ExistingFiles and fileSelected() if fileMode is anything else.
 
     The signal will be disconnected from the slot when the dialog is closed.
 */
diff --git a/src/gui/dialogs/qfontdialog.cpp b/src/gui/dialogs/qfontdialog.cpp
index c7484e7..3384132 100644
--- a/src/gui/dialogs/qfontdialog.cpp
+++ b/src/gui/dialogs/qfontdialog.cpp
@@ -940,7 +940,7 @@ bool QFontDialogPrivate::sharedFontPanelAvailable = true;
     \since 4.5
     \overload
 
-    Opens the dialog and connects its accepted() signal to the slot specified
+    Opens the dialog and connects its fontSelected() signal to the slot specified
     by \a receiver and \a member.
 
     The signal will be disconnected from the slot when the dialog is closed.
diff --git a/src/gui/dialogs/qinputdialog.cpp b/src/gui/dialogs/qinputdialog.cpp
index 8608334..30f3151 100644
--- a/src/gui/dialogs/qinputdialog.cpp
+++ b/src/gui/dialogs/qinputdialog.cpp
@@ -1019,8 +1019,16 @@ QString QInputDialog::cancelButtonText() const
     \since 4.5
     \overload
 
-    Opens the dialog and connects its accepted() signal to the slot specified
-    by \a receiver and \a member.
+    This function connects one of its signals to the slot specified by \a receiver
+    and \a member. The specific signal depends on the arguments that are specified
+    in \a member. These are:
+
+    \list
+      \o textValueSelected() if \a member has a QString for its first argument.
+      \o intValueSelected() if \a member has an int for its first argument.
+      \o doubleValueSelected() if \a member has a double for its first argument.
+      \o accepted() if \a member has NO arguments.
+    \endlist
 
     The signal will be disconnected from the slot when the dialog is closed.
 */
diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp
index bf8ca0a..fbe8364 100644
--- a/src/gui/graphicsview/qgraphicsscene.cpp
+++ b/src/gui/graphicsview/qgraphicsscene.cpp
@@ -2933,11 +2933,13 @@ void QGraphicsScene::addItem(QGraphicsItem *item)
         d->allItemsIgnoreHoverEvents = false;
         d->enableMouseTrackingOnViews();
     }
+#ifndef QT_NO_CURSOR
     if (d->allItemsUseDefaultCursor && item->hasCursor()) {
         d->allItemsUseDefaultCursor = false;
         if (d->allItemsIgnoreHoverEvents) // already enabled otherwise
             d->enableMouseTrackingOnViews();
     }
+#endif //QT_NO_CURSOR
 
     // Update selection lists
     if (item->isSelected())
diff --git a/src/gui/image/qpixmapdatafactory.cpp b/src/gui/image/qpixmapdatafactory.cpp
index 699489d..bba7378 100644
--- a/src/gui/image/qpixmapdatafactory.cpp
+++ b/src/gui/image/qpixmapdatafactory.cpp
@@ -84,7 +84,7 @@ QPixmapData* QSimplePixmapDataFactory::create(QPixmapData::PixelType type)
 #endif
 }
 
-Q_GLOBAL_STATIC(QSimplePixmapDataFactory, factory);
+Q_GLOBAL_STATIC(QSimplePixmapDataFactory, factory)
 
 #endif // !defined(Q_WS_QWS)
 
diff --git a/src/gui/kernel/qaction.cpp b/src/gui/kernel/qaction.cpp
index b2afbd0..051b6a6 100644
--- a/src/gui/kernel/qaction.cpp
+++ b/src/gui/kernel/qaction.cpp
@@ -76,7 +76,7 @@ static QString qt_strippedText(QString s)
         s.remove(i-1,1);
     }
     return s.trimmed();
-};
+}
 
 
 QActionPrivate::QActionPrivate() : group(0), enabled(1), forceDisabled(0),
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
index f2a3498..4923d23 100644
--- a/src/gui/kernel/qapplication.cpp
+++ b/src/gui/kernel/qapplication.cpp
@@ -405,7 +405,7 @@ QPalette *QApplicationPrivate::set_pal = 0;        // default palette set by pro
 QGraphicsSystem *QApplicationPrivate::graphics_system = 0; // default graphics system
 QString QApplicationPrivate::graphics_system_name;         // graphics system id - for delayed initialization
 
-Q_GLOBAL_STATIC(QMutex, applicationFontMutex);
+Q_GLOBAL_STATIC(QMutex, applicationFontMutex)
 QFont *QApplicationPrivate::app_font = 0;        // default application font
 QFont *QApplicationPrivate::sys_font = 0;        // default system font
 QFont *QApplicationPrivate::set_font = 0;        // default font set by programmer
diff --git a/src/gui/kernel/qapplication_mac.mm b/src/gui/kernel/qapplication_mac.mm
index d5fa9ea..6a592e4 100644
--- a/src/gui/kernel/qapplication_mac.mm
+++ b/src/gui/kernel/qapplication_mac.mm
@@ -154,6 +154,10 @@
 #define kThemeBrushAlternatePrimaryHighlightColor -5
 #endif
 
+#define kCMDeviceUnregisteredNotification CFSTR("CMDeviceUnregisteredNotification")
+#define kCMDefaultDeviceNotification CFSTR("CMDefaultDeviceNotification")
+#define kCMDeviceProfilesNotification CFSTR("CMDeviceProfilesNotification")
+#define kCMDefaultDeviceProfileNotification CFSTR("CMDefaultDeviceProfileNotification")
 
 QT_BEGIN_NAMESPACE
 
@@ -1040,11 +1044,29 @@ void qt_release_app_proc_handler()
 #endif
 }
 
+void qt_color_profile_changed(CFNotificationCenterRef, void *, CFStringRef, const void *,
+                              CFDictionaryRef)
+{
+    QCoreGraphicsPaintEngine::cleanUpMacColorSpaces();
+}
 /* platform specific implementations */
 void qt_init(QApplicationPrivate *priv, int)
 {
     if (qt_is_gui_used) {
         CGDisplayRegisterReconfigurationCallback(qt_mac_display_change_callbk, 0);
+        CFNotificationCenterRef center = CFNotificationCenterGetDistributedCenter();
+        CFNotificationCenterAddObserver(center, qApp, qt_color_profile_changed,
+                                        kCMDeviceUnregisteredNotification, 0,
+                                        CFNotificationSuspensionBehaviorDeliverImmediately);
+        CFNotificationCenterAddObserver(center, qApp, qt_color_profile_changed,
+                                        kCMDefaultDeviceNotification, 0,
+                                        CFNotificationSuspensionBehaviorDeliverImmediately);
+        CFNotificationCenterAddObserver(center, qApp, qt_color_profile_changed,
+                                        kCMDeviceProfilesNotification, 0,
+                                        CFNotificationSuspensionBehaviorDeliverImmediately);
+        CFNotificationCenterAddObserver(center, qApp, qt_color_profile_changed,
+                                        kCMDefaultDeviceProfileNotification, 0,
+                                        CFNotificationSuspensionBehaviorDeliverImmediately);
         ProcessSerialNumber psn;
         if (GetCurrentProcess(&psn) == noErr) {
             // Jambi needs to transform itself since most people aren't "used"
@@ -1224,6 +1246,12 @@ void qt_release_apple_event_handler()
 void qt_cleanup()
 {
     CGDisplayRemoveReconfigurationCallback(qt_mac_display_change_callbk, 0);
+    CFNotificationCenterRef center = CFNotificationCenterGetDistributedCenter();
+    CFNotificationCenterRemoveObserver(center, qApp, kCMDeviceUnregisteredNotification, 0);
+    CFNotificationCenterRemoveObserver(center, qApp, kCMDefaultDeviceNotification, 0);
+    CFNotificationCenterRemoveObserver(center, qApp, kCMDeviceProfilesNotification, 0);
+    CFNotificationCenterRemoveObserver(center, qApp, kCMDefaultDeviceProfileNotification, 0);
+
 #ifndef QT_MAC_USE_COCOA
     qt_release_app_proc_handler();
     if (app_proc_handlerUPP) {
diff --git a/src/gui/kernel/qapplication_win.cpp b/src/gui/kernel/qapplication_win.cpp
index 7e97784..b21eb36 100644
--- a/src/gui/kernel/qapplication_win.cpp
+++ b/src/gui/kernel/qapplication_win.cpp
@@ -625,6 +625,13 @@ static void qt_set_windows_font_resources()
 
 static void qt_win_read_cleartype_settings()
 {
+#ifdef Q_OS_WINCE
+     UINT result;
+     BOOL ok;
+     ok = SystemParametersInfo(SPI_GETFONTSMOOTHING, 0, &result, 0);
+     if (ok)
+         qt_cleartype_enabled = result;
+#else
     QT_WA({
         UINT result;
         BOOL ok;
@@ -638,6 +645,7 @@ static void qt_win_read_cleartype_settings()
         if (ok)
             qt_cleartype_enabled = (result == FE_FONTSMOOTHINGCLEARTYPE);
     });
+#endif
 }
 
 
@@ -1408,6 +1416,7 @@ static bool qt_is_translatable_mouse_event(UINT message)
     return (message >= WM_MOUSEFIRST && message <= WM_MOUSELAST ||
                 message >= WM_XBUTTONDOWN && message <= WM_XBUTTONDBLCLK)
             && message != WM_MOUSEWHEEL
+            && message != WM_MOUSEHWHEEL
 
 #ifndef Q_WS_WINCE
             || message >= WM_NCMOUSEMOVE && message <= WM_NCMBUTTONDBLCLK
@@ -1758,6 +1767,7 @@ LRESULT CALLBACK QtWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam
             break;
 
         case WM_MOUSEWHEEL:
+        case WM_MOUSEHWHEEL:
             result = widget->translateWheelEvent(msg);
             break;
 
@@ -2657,6 +2667,7 @@ bool qt_try_modal(QWidget *widget, MSG *msg, int& ret)
 #endif
         if ((type >= WM_MOUSEFIRST && type <= WM_MOUSELAST) ||
              type == WM_MOUSEWHEEL || type == (int)WM95_MOUSEWHEEL ||
+             type == WM_MOUSEHWHEEL ||
              type == WM_MOUSELEAVE ||
              (type >= WM_KEYFIRST && type <= WM_KEYLAST)
 #ifndef Q_WS_WINCE
@@ -3268,12 +3279,12 @@ bool QETWidget::translateWheelEvent(const MSG &msg)
     state = translateButtonState(GET_KEYSTATE_WPARAM(msg.wParam), 0, 0);
 
     int delta;
-    if (msg.message == WM_MOUSEWHEEL)
+    if (msg.message == WM_MOUSEWHEEL || msg.message == WM_MOUSEHWHEEL)
         delta = (short) HIWORD (msg.wParam);
     else
         delta = (int) msg.wParam;
 
-    Qt::Orientation orient = (state&Qt::AltModifier
+    Qt::Orientation orient = (msg.message == WM_MOUSEHWHEEL || state&Qt::AltModifier
 #if 0
     // disabled for now - Trenton's one-wheel mouse makes trouble...
     // "delta" for usual wheels is +-120. +-240 seems to indicate
@@ -3287,6 +3298,13 @@ bool QETWidget::translateWheelEvent(const MSG &msg)
 #endif
        ) ? Qt::Horizontal : Qt::Vertical;
 
+    // according to the MSDN documentation on WM_MOUSEHWHEEL:
+    // a positive value indicates that the wheel was rotated to the right;
+    // a negative value indicates that the wheel was rotated to the left.
+    // Qt defines this value as the exact opposite, so we have to flip the value!
+    if (msg.message == WM_MOUSEHWHEEL)
+        delta = -delta;
+
     QPoint globalPos;
 
     globalPos.rx() = (short)LOWORD (msg.lParam);
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index d436ffb..6026821 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -5674,15 +5674,10 @@ void QWidget::setFocus(Qt::FocusReason reason)
             w = w->isWindow() ? 0 : w->parentWidget();
         }
     } else {
-        while (w && w->isVisible()) {
+        while (w) {
             w->d_func()->focus_child = f;
             w = w->isWindow() ? 0 : w->parentWidget();
         }
-        // a special case, if there is an invisible parent, notify him
-        // about the focus_child widget, so that if it becomes
-        // visible, the focus widget will be respected.
-        if (w)
-            w->d_func()->focus_child = f;
     }
 
 #ifndef QT_NO_GRAPHICSVIEW
@@ -5757,8 +5752,9 @@ void QWidget::setFocus(Qt::FocusReason reason)
 void QWidget::clearFocus()
 {
     QWidget *w = this;
-    while (w && w->d_func()->focus_child == this) {
-        w->d_func()->focus_child = 0;
+    while (w) {
+        if (w->d_func()->focus_child == this)
+            w->d_func()->focus_child = 0;
         w = w->parentWidget();
     }
 #ifndef QT_NO_GRAPHICSVIEW
@@ -6734,10 +6730,6 @@ void QWidgetPrivate::show_helper()
     if (QApplicationPrivate::hidden_focus_widget == q) {
         QApplicationPrivate::hidden_focus_widget = 0;
         q->setFocus(Qt::OtherFocusReason);
-    } else if (focus_child) {
-        // if we are shown and there is an explicit focus child widget
-        // set, respect it by giving him focus.
-        focus_child->setFocus(Qt::OtherFocusReason);
     }
 
     // Process events when showing a Qt::SplashScreen widget before the event loop
diff --git a/src/gui/painting/qdrawhelper.cpp b/src/gui/painting/qdrawhelper.cpp
index bbe1a76..0d1da54 100644
--- a/src/gui/painting/qdrawhelper.cpp
+++ b/src/gui/painting/qdrawhelper.cpp
@@ -7225,13 +7225,13 @@ inline void qt_rectfill_template(QRasterBuffer *rasterBuffer,
 QT_RECTFILL(quint32)
 QT_RECTFILL(quint16)
 QT_RECTFILL(qargb8565)
-QT_RECTFILL(qrgb666);
-QT_RECTFILL(qargb6666);
+QT_RECTFILL(qrgb666)
+QT_RECTFILL(qargb6666)
 QT_RECTFILL(qrgb555)
 QT_RECTFILL(qargb8555)
 QT_RECTFILL(qrgb888)
-QT_RECTFILL(qrgb444);
-QT_RECTFILL(qargb4444);
+QT_RECTFILL(qrgb444)
+QT_RECTFILL(qargb4444)
 #undef QT_RECTFILL
 
 
diff --git a/src/gui/painting/qpaintengine_mac_p.h b/src/gui/painting/qpaintengine_mac_p.h
index 298c145..9b85800 100644
--- a/src/gui/painting/qpaintengine_mac_p.h
+++ b/src/gui/painting/qpaintengine_mac_p.h
@@ -233,6 +233,8 @@ protected:
     friend class QMacPrintEngine;
     friend class QMacPrintEnginePrivate;
     friend void qt_mac_display_change_callbk(CGDirectDisplayID, CGDisplayChangeSummaryFlags, void *);
+    friend void qt_color_profile_changed(CFNotificationCenterRef center, void *,
+                                         CFStringRef , const void *, CFDictionaryRef);
     QCoreGraphicsPaintEngine(QPaintEnginePrivate &dptr);
 
 private:
diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp
index 30c454c..0810bb9 100644
--- a/src/gui/painting/qpaintengine_raster.cpp
+++ b/src/gui/painting/qpaintengine_raster.cpp
@@ -1058,7 +1058,7 @@ void QRasterPaintEnginePrivate::drawImage(const QPointF &pt,
         int d = x + iw - cx2;
         iw -= d;
     }
-    if (iw < 0)
+    if (iw <= 0)
         return;
 
     // adapt the y paremeters...
@@ -1075,7 +1075,7 @@ void QRasterPaintEnginePrivate::drawImage(const QPointF &pt,
         int d = y + ih - cy2;
         ih -= d;
     }
-    if (ih < 0)
+    if (ih <= 0)
         return;
 
     // call the blend function...
diff --git a/src/gui/painting/qpaintengine_x11.cpp b/src/gui/painting/qpaintengine_x11.cpp
index 9cc9683..2e6d593 100644
--- a/src/gui/painting/qpaintengine_x11.cpp
+++ b/src/gui/painting/qpaintengine_x11.cpp
@@ -1826,9 +1826,10 @@ Q_GUI_EXPORT void qt_x11_drawImage(const QRect &rect, const QPoint &pos, const Q
     const int h = rect.height();
 
     QImage im;
-    if ((QSysInfo::ByteOrder == QSysInfo::BigEndian
-         && ((ImageByteOrder(X11->display) == LSBFirst) || bgr_layout))
-        || (ImageByteOrder(X11->display) == MSBFirst && QSysInfo::ByteOrder == QSysInfo::LittleEndian))
+    int image_byte_order = ImageByteOrder(X11->display);
+    if ((QSysInfo::ByteOrder == QSysInfo::BigEndian && ((image_byte_order == LSBFirst) || bgr_layout))
+        || (image_byte_order == MSBFirst && QSysInfo::ByteOrder == QSysInfo::LittleEndian)
+        || (image_byte_order == LSBFirst && bgr_layout))
     {
         im = image.copy(rect);
         const int iw = im.bytesPerLine() / 4;
@@ -1836,19 +1837,21 @@ Q_GUI_EXPORT void qt_x11_drawImage(const QRect &rect, const QPoint &pos, const Q
         for (int i=0; i < h; i++) {
             uint *p = data;
             uint *end = p + w;
-            if (bgr_layout && ImageByteOrder(X11->display) == MSBFirst && QSysInfo::ByteOrder == QSysInfo::LittleEndian) {
+            if (bgr_layout && image_byte_order == MSBFirst && QSysInfo::ByteOrder == QSysInfo::LittleEndian) {
                 while (p < end) {
                     *p = ((*p << 8) & 0xffffff00) | ((*p >> 24) & 0x000000ff);
                     p++;
                 }
-            } else if ((ImageByteOrder(X11->display) == LSBFirst && QSysInfo::ByteOrder == QSysInfo::BigEndian)
-                    || (ImageByteOrder(X11->display) == MSBFirst && QSysInfo::ByteOrder == QSysInfo::LittleEndian)) {
+            } else if ((image_byte_order == LSBFirst && QSysInfo::ByteOrder == QSysInfo::BigEndian)
+                    || (image_byte_order == MSBFirst && QSysInfo::ByteOrder == QSysInfo::LittleEndian)) {
                 while (p < end) {
                     *p = ((*p << 24) & 0xff000000) | ((*p << 8) & 0x00ff0000)
                         | ((*p >> 8) & 0x0000ff00) | ((*p >> 24) & 0x000000ff);
                     p++;
                 }
-            } else if (ImageByteOrder(X11->display) == MSBFirst && QSysInfo::ByteOrder == QSysInfo::BigEndian) {
+            } else if ((image_byte_order == MSBFirst && QSysInfo::ByteOrder == QSysInfo::BigEndian)
+                       || (image_byte_order == LSBFirst && bgr_layout))
+            {
                 while (p < end) {
                     *p = ((*p << 16) & 0x00ff0000) | ((*p >> 16) & 0x000000ff)
                         | ((*p ) & 0xff00ff00);
diff --git a/src/gui/painting/qpainter_p.h b/src/gui/painting/qpainter_p.h
index 258b25a..6c8821a 100644
--- a/src/gui/painting/qpainter_p.h
+++ b/src/gui/painting/qpainter_p.h
@@ -92,8 +92,8 @@ inline Qt::PenJoinStyle qpen_joinStyle(const QPen &p) { return data_ptr(p)->join
 // QBrush inline functions...
 inline QBrush::DataPtr &data_ptr(const QBrush &p) { return const_cast<QBrush &>(p).data_ptr(); }
 inline bool qbrush_fast_equals(const QBrush &a, const QBrush &b) { return data_ptr(a) == data_ptr(b); }
-inline Qt::BrushStyle qbrush_style(const QBrush &b) { return data_ptr(b)->style; };
-inline const QColor &qbrush_color(const QBrush &b) { return data_ptr(b)->color; };
+inline Qt::BrushStyle qbrush_style(const QBrush &b) { return data_ptr(b)->style; }
+inline const QColor &qbrush_color(const QBrush &b) { return data_ptr(b)->color; }
 inline bool qbrush_has_transform(const QBrush &b) { return data_ptr(b)->transform.type() > QTransform::TxNone; }
 
 class QPainterClipInfo
diff --git a/src/gui/painting/qpdf_p.h b/src/gui/painting/qpdf_p.h
index 1d45ca1..7d92c0c 100644
--- a/src/gui/painting/qpdf_p.h
+++ b/src/gui/painting/qpdf_p.h
@@ -158,7 +158,7 @@ namespace QPdf {
 
 
     QByteArray stripSpecialCharacters(const QByteArray &string);
-};
+}
 
 
 class QPdfPage : public QPdf::ByteStream
diff --git a/src/gui/painting/qvectorpath_p.h b/src/gui/painting/qvectorpath_p.h
index 2713cda..2602a3d 100644
--- a/src/gui/painting/qvectorpath_p.h
+++ b/src/gui/painting/qvectorpath_p.h
@@ -94,7 +94,7 @@ public:
         // Shape rendering specifiers...
         OddEvenFill             = 0x1000,
         WindingFill             = 0x2000,
-        ImplicitClose           = 0x4000,
+        ImplicitClose           = 0x4000
     };
 
     // ### Falcon: introduca a struct XY for points so lars is not so confused...
diff --git a/src/gui/styles/qmotifstyle.cpp b/src/gui/styles/qmotifstyle.cpp
index be0e3eb..d6b8a7a 100644
--- a/src/gui/styles/qmotifstyle.cpp
+++ b/src/gui/styles/qmotifstyle.cpp
@@ -298,8 +298,11 @@ void QMotifStyle::unpolish(QWidget* widget)
 {
     QCommonStyle::unpolish(widget);
 #ifndef QT_NO_PROGRESSBAR
-    if (qobject_cast<QProgressBar *>(widget))
+    if (qobject_cast<QProgressBar *>(widget)) {
+        Q_D(QMotifStyle);
         widget->removeEventFilter(this);
+        d->bars.removeAll(static_cast<QProgressBar*>(widget));
+     }
 #endif
 }
 
diff --git a/src/gui/text/qfontdatabase_x11.cpp b/src/gui/text/qfontdatabase_x11.cpp
index 605a7dd..8f67cec 100644
--- a/src/gui/text/qfontdatabase_x11.cpp
+++ b/src/gui/text/qfontdatabase_x11.cpp
@@ -392,7 +392,7 @@ int qt_mib_for_xlfd_encoding(const char *encoding)
     int id = qt_xlfd_encoding_id(encoding);
     if (id != -1) return xlfd_encoding[id].mib;
     return 0;
-};
+}
 
 int qt_encoding_id_for_mib(int mib)
 {
diff --git a/src/gui/text/qfontengine_win.cpp b/src/gui/text/qfontengine_win.cpp
index 002e670..d172a81 100644
--- a/src/gui/text/qfontengine_win.cpp
+++ b/src/gui/text/qfontengine_win.cpp
@@ -1333,6 +1333,7 @@ bool QFontEngineWin::getSfntTableData(uint tag, uchar *buffer, uint *length) con
 #    define CLEARTYPE_QUALITY       5
 #endif
 
+extern bool qt_cleartype_enabled;
 
 QNativeImage *QFontEngineWin::drawGDIGlyph(HFONT font, glyph_t glyph, int margin,
                                            const QTransform &t)
@@ -1408,7 +1409,11 @@ QNativeImage *QFontEngineWin::drawGDIGlyph(HFONT font, glyph_t glyph, int margin
 
     QNativeImage *ni = new QNativeImage(iw + 2 * margin + 4,
                                         ih + 2 * margin + 4,
-                                        QNativeImage::systemFormat(), true);
+                                        QNativeImage::systemFormat(), !qt_cleartype_enabled);
+
+    /*If cleartype is enabled we use the standard system format even on Windows CE 
+      and not the special textbuffer format we have to use if cleartype is disabled*/
+
     ni->image.fill(0xffffffff);
 
     HDC hdc = ni->hdc;
@@ -1437,7 +1442,6 @@ QNativeImage *QFontEngineWin::drawGDIGlyph(HFONT font, glyph_t glyph, int margin
 }
 
 
-extern bool qt_cleartype_enabled;
 extern uint qt_pow_gamma[256];
 
 QImage QFontEngineWin::alphaMapForGlyph(glyph_t glyph, const QTransform &xform)
diff --git a/src/gui/widgets/qmainwindowlayout_p.h b/src/gui/widgets/qmainwindowlayout_p.h
index 1159aac..24a58a6 100644
--- a/src/gui/widgets/qmainwindowlayout_p.h
+++ b/src/gui/widgets/qmainwindowlayout_p.h
@@ -341,34 +341,4 @@ QT_END_NAMESPACE
 
 #endif // QT_NO_MAINWINDOW
 
-QT_BEGIN_NAMESPACE
-static inline int pick(Qt::Orientation o, const QPoint &pos)
-{ return o == Qt::Horizontal ? pos.x() : pos.y(); }
-
-static inline int pick(Qt::Orientation o, const QSize &size)
-{ return o == Qt::Horizontal ? size.width() : size.height(); }
-
-static inline int &rpick(Qt::Orientation o, QPoint &pos)
-{ return o == Qt::Horizontal ? pos.rx() : pos.ry(); }
-
-static inline int &rpick(Qt::Orientation o, QSize &size)
-{ return o == Qt::Horizontal ? size.rwidth() : size.rheight(); }
-
-static inline QSizePolicy::Policy pick(Qt::Orientation o, const QSizePolicy &policy)
-{ return o == Qt::Horizontal ? policy.horizontalPolicy() : policy.verticalPolicy(); }
-
-static inline int perp(Qt::Orientation o, const QPoint &pos)
-{ return o == Qt::Vertical ? pos.x() : pos.y(); }
-
-static inline int perp(Qt::Orientation o, const QSize &size)
-{ return o == Qt::Vertical ? size.width() : size.height(); }
-
-static inline int &rperp(Qt::Orientation o, QPoint &pos)
-{ return o == Qt::Vertical ? pos.rx() : pos.ry(); }
-
-static inline int &rperp(Qt::Orientation o, QSize &size)
-{ return o == Qt::Vertical ? size.rwidth() : size.rheight(); }
-
-QT_END_NAMESPACE
-
 #endif // QDYNAMICMAINWINDOWLAYOUT_P_H
diff --git a/src/gui/widgets/qmenu_mac.mm b/src/gui/widgets/qmenu_mac.mm
index 786633c..67656b4 100644
--- a/src/gui/widgets/qmenu_mac.mm
+++ b/src/gui/widgets/qmenu_mac.mm
@@ -907,8 +907,6 @@ static NSMenuItem *qt_mac_menu_merge_action(OSMenuRef merge, QMacMenuAction *act
         }
     }
 
-    if ([ret tag] != 0)
-        ret = 0; // already taken
 #endif
     return ret;
 }
@@ -1168,15 +1166,15 @@ QMenuPrivate::QMacMenuPrivate::addAction(QMacMenuAction *action, QMacMenuAction
             GetMenuItemAttributes(action->menu, itemCount , &testattr);
             if (mergedItems.contains(action->command)
                  && (testattr & kMenuItemAttrSeparator)) {
-                    InsertMenuItemTextWithCFString(action->menu, 0, qMax(itemCount - 1, 0), attr, action->command);
-                    index = itemCount;
-                 } else {
-                    MenuItemIndex tmpIndex;
-                    AppendMenuItemTextWithCFString(action->menu, 0, attr, action->command, &tmpIndex);
-                    index = tmpIndex;
-                    if (mergedItems.contains(action->command))
-                        AppendMenuItemTextWithCFString(action->menu, 0, kMenuItemAttrSeparator, 0, &tmpIndex);
-                 }
+                InsertMenuItemTextWithCFString(action->menu, 0, qMax(itemCount - 1, 0), attr, action->command);
+                index = itemCount;
+            } else {
+                MenuItemIndex tmpIndex;
+                AppendMenuItemTextWithCFString(action->menu, 0, attr, action->command, &tmpIndex);
+                index = tmpIndex;
+                if (mergedItems.contains(action->command))
+                    AppendMenuItemTextWithCFString(action->menu, 0, kMenuItemAttrSeparator, 0, &tmpIndex);
+            }
 #else
             [menu addItem:newItem];
 #endif
@@ -1477,11 +1475,18 @@ QMenuPrivate::QMacMenuPrivate::removeAction(QMacMenuAction *action)
         DeleteMenuItem(action->menu, qt_mac_menu_find_action(action->menu, action));
 #else
     QMacCocoaAutoReleasePool pool;
-    QT_MANGLE_NAMESPACE(QCocoaMenuLoader) *loader = getMenuLoader();
-    if (action->menuItem == [loader quitMenuItem] || action->menuItem == [loader preferencesMenuItem])
-        [action->menuItem setEnabled:false];
-    else
+    if (action->merged) {
+        if (reinterpret_cast<QAction *>([action->menuItem tag]) == action->action) {
+            QT_MANGLE_NAMESPACE(QCocoaMenuLoader) *loader = getMenuLoader();
+            [action->menuItem setEnabled:false];
+            if (action->menuItem != [loader quitMenuItem]
+                && action->menuItem != [loader preferencesMenuItem]) {
+                [[action->menuItem menu] removeItem:action->menuItem];
+            }
+        }
+    } else {
         [[action->menuItem menu] removeItem:action->menuItem];
+    }
 #endif
     actionItems.removeAll(action);
 }
@@ -1936,6 +1941,23 @@ bool QMenuBar::macUpdateMenuBar()
             [loader ensureAppMenuInMenu:menu];
             [NSApp setMainMenu:menu];
             syncMenuBarItemsVisiblity(mb->d_func()->mac_menubar);
+
+            if (OSMenuRef tmpMerge = QMenuPrivate::mergeMenuHash.value(menu)) {
+                if (QMenuMergeList *mergeList
+                        = QMenuPrivate::mergeMenuItemsHash.value(tmpMerge)) {
+                    const int mergeListSize = mergeList->size();
+
+                    for (int i = 0; i < mergeListSize; ++i) {
+                        const QMenuMergeItem &mergeItem = mergeList->at(i);
+                        // Ideally we would call QMenuPrivate::syncAction, but that requires finding
+                        // the original QMen and likely doing more work than we need.
+                        // For example, enabled is handled below.
+                        [mergeItem.menuItem setTag:reinterpret_cast<long>(
+                                                    static_cast<QAction *>(mergeItem.action->action))];
+                        [mergeItem.menuItem setHidden:!(mergeItem.action->action->isVisible())];
+                    }
+                }
+            }
 #endif
             QWidget *modalWidget = qApp->activeModalWidget();
             if (mb != menubars()->value(modalWidget)) {
diff --git a/src/gui/widgets/qplaintextedit.cpp b/src/gui/widgets/qplaintextedit.cpp
index f317742..af11aa7 100644
--- a/src/gui/widgets/qplaintextedit.cpp
+++ b/src/gui/widgets/qplaintextedit.cpp
@@ -444,7 +444,7 @@ QPlainTextEditControl::QPlainTextEditControl(QPlainTextEdit *parent)
 void QPlainTextEditPrivate::_q_cursorPositionChanged()
 {
     pageUpDownLastCursorYIsValid = false;
-};
+}
 
 void QPlainTextEditPrivate::_q_verticalScrollbarActionTriggered(int action) {
     if (action == QAbstractSlider::SliderPageStepAdd) {
@@ -1756,7 +1756,7 @@ void QPlainTextEdit::paintEvent(QPaintEvent *e)
 
     QTextBlock block = firstVisibleBlock();
     qreal maximumWidth = document()->documentLayout()->documentSize().width();
-    
+
     // keep right margin clean from full-width selection
     int maxX = offset.x() + qMax((qreal)viewportRect.width(), maximumWidth)
                - document()->documentMargin();
diff --git a/src/gui/widgets/qprogressbar.cpp b/src/gui/widgets/qprogressbar.cpp
index 804220d..adc3582 100644
--- a/src/gui/widgets/qprogressbar.cpp
+++ b/src/gui/widgets/qprogressbar.cpp
@@ -349,6 +349,8 @@ void QProgressBar::setRange(int minimum, int maximum)
     \property QProgressBar::textVisible
     \brief whether the current completed percentage should be displayed
 
+    This property may be ignored by the style (e.g., QMacStyle never draws the text).
+
     \sa textDirection
 */
 void QProgressBar::setTextVisible(bool visible)
diff --git a/src/gui/widgets/qtoolbararealayout.cpp b/src/gui/widgets/qtoolbararealayout.cpp
index 49f4a9e..240d059 100644
--- a/src/gui/widgets/qtoolbararealayout.cpp
+++ b/src/gui/widgets/qtoolbararealayout.cpp
@@ -113,7 +113,7 @@ QSize QToolBarAreaLayoutLine::sizeHint() const
             continue;
 
         QSize sh = item.sizeHint();
-        a += pick(o, sh) + item.extraSpace;
+        a += item.preferredSize > 0 ? item.preferredSize : pick(o, sh);
         b = qMax(b, perp(o, sh));
     }
 
@@ -163,12 +163,17 @@ void QToolBarAreaLayoutLine::fitLayout()
         int itemMin = pick(o, item.minimumSize());
         int itemHint = pick(o, item.sizeHint());
         //we ensure the extraspace is not too low
-        item.extraSpace = qMax(itemMin - itemHint, item.extraSpace);
-        itemHint  += item.extraSpace;
-        int itemExtra = qMin(itemHint - itemMin, extra);
+        item.size = qMax(item.size, itemHint);
+        if (item.preferredSize > 0) {
+            //preferredSize would be the default size
+            item.size = item.preferredSize;
+        }
+
+        //the extraspace is the space above the item minimum sizehint
+        int extraSpace = qMin(item.size - itemMin, extra);
+        item.size = itemMin + extraSpace; //that is the real size
 
-        item.size = itemMin + itemExtra;
-        extra -= itemExtra;
+        extra -= extraSpace;
 
         last = i;
     }
@@ -395,17 +400,15 @@ void QToolBarAreaLayoutInfo::removeToolBarBreak(QToolBar *before)
 
 void QToolBarAreaLayoutInfo::moveToolBar(QToolBar *toolbar, int pos)
 {
-    if (dirty) {
+    if (dirty)
         fitLayout();
-    }
 
     dirty = true;
 
-    if (o == Qt::Vertical) {
+    if (o == Qt::Vertical)
         pos -= rect.top();
-    }
 
-    //here we actually update the extraSpace for the line containing the toolbar so that we move it
+    //here we actually update the preferredSize for the line containing the toolbar so that we move it
     for (int j = 0; j < lines.count(); ++j) {
         QToolBarAreaLayoutLine &line = lines[j];
 
@@ -432,22 +435,21 @@ void QToolBarAreaLayoutInfo::moveToolBar(QToolBar *toolbar, int pos)
                         newPos = qMin(pos, maxPos);
                     }
 
-                    //let's update the previous extra space
+                    //extra is the number of pixels to add to the previous toolbar
                     int extra = newPos - current.pos;
 
-                    if (qAbs(previous.extraSpace + extra) < QApplication::startDragDistance()) {
+                    //we check if the previous is near its size hint
+                    //in which case we try to stick to it
+                    if (qAbs(pick(o, previous.sizeHint()) - (previous.size + extra)) < QApplication::startDragDistance()) {
                         //we stick to the default space
                         extra = 0;
                     }
 
                     //update for the current item
-                    current.extraSpace -= extra;
-                    //this ensures the toolbars to be pushed to the right when necessary
-                    current.extraSpace = qMax(pick(o,current.minimumSize())- pick(o,current.sizeHint()), current.extraSpace);
- 
-                    if (extra >= 0) {
-                        previous.extraSpace += extra;
+                    current.extendSize(line.o, -extra);
 
+                    if (extra >= 0) {
+                        previous.extendSize(line.o, extra);
                     } else {
                         //we need to push the toolbars on the left starting with previous
                         extra = -extra; // we just need to know the number of pixels
@@ -455,13 +457,13 @@ void QToolBarAreaLayoutInfo::moveToolBar(QToolBar *toolbar, int pos)
                         for(int l = previousIndex; l >=0; --l) {
                             QToolBarAreaLayoutItem &item = line.toolBarItems[l];
                             if (!item.skip()) {
-                                const int minExtraSpace = pick(o, item.minimumSize()) - pick(o, item.sizeHint());
-                                const int margin =  item.extraSpace - minExtraSpace;
+                                const int minPreferredSize = pick(o, item.minimumSize());
+                                const int margin =  item.size - minPreferredSize;
                                 if (margin < extra) {
-                                    item.extraSpace = minExtraSpace;
+                                    item.resize(line.o, minPreferredSize);
                                     extra -= margin;
                                 } else {
-                                    item.extraSpace -= extra;
+                                    item.extendSize(line.o, -extra);
                                     extra = 0;
                                 }
                             }
@@ -536,13 +538,22 @@ bool QToolBarAreaLayoutInfo::insertGap(QList<int> path, QLayoutItem *item)
     gap_item.gap = true;
     gap_item.widgetItem = item;
 
-    //update the previous item's extra space
+    //update the previous item's preferred size
     for(int p = k - 1 ; p >= 0; --p) {
         QToolBarAreaLayoutItem &previous = line.toolBarItems[p];
         if (!previous.skip()) {
             //we found the previous one
-            gap_item.extraSpace = qMax(0, previous.extraSpace - pick(o, gap_item.sizeHint()));
-            previous.extraSpace = qMin(previous.extraSpace, 0);
+            int previousSizeHint = pick(line.o, previous.sizeHint());
+            int previousExtraSpace = previous.size - previousSizeHint;
+
+            if (previousExtraSpace > 0) {
+                //in this case we reset the space
+                previous.preferredSize = -1;
+                previous.size = previousSizeHint;
+
+                gap_item.resize(o, previousExtraSpace);
+            }
+
             break;
         }
     }
@@ -1132,15 +1143,22 @@ QLayoutItem *QToolBarAreaLayout::unplug(QList<int> path, QToolBarAreaLayout *oth
     //update the leading space here
     QToolBarAreaLayoutInfo &info = docks[path.at(0)];
     QToolBarAreaLayoutLine &line = info.lines[path.at(1)];
-    if (item.extraSpace != 0) {
+    if (item.size != pick(line.o, item.realSizeHint())) {
+        //the item doesn't have its default size
+        //so we'll give this to the next item
         int newExtraSpace = 0;
+        //let's iterate over the siblings of the current item that pare placed before it
+        //we need to find just the one before
         for (int i = path.at(2) - 1; i >= 0; --i) {
             QToolBarAreaLayoutItem &previous = line.toolBarItems[i];
             if (!previous.skip()) {
+                //we need to check if it has a previous element and a next one
+                //the previous will get its size changed
                 for (int j = path.at(2) + 1; j < line.toolBarItems.count(); ++j) {
                     const QToolBarAreaLayoutItem &next = line.toolBarItems.at(j);
                     if (!next.skip()) {
-                        newExtraSpace = previous.extraSpace = next.pos - previous.pos - pick(line.o, previous.sizeHint());
+                        newExtraSpace = next.pos - previous.pos - pick(line.o, previous.sizeHint());
+                        previous.resize(line.o, next.pos - previous.pos);
                     }
                     break;
                 }
@@ -1154,7 +1172,7 @@ QLayoutItem *QToolBarAreaLayout::unplug(QList<int> path, QToolBarAreaLayout *oth
             for (int i = path.at(2) - 1; i >= 0; --i) {
                 QToolBarAreaLayoutItem &previous = line.toolBarItems[i];
                 if (!previous.skip()) {
-                    previous.extraSpace = newExtraSpace;
+                    previous.resize(line.o, pick(line.o, previous.sizeHint()) + newExtraSpace);
                     break;
                 }
             }
@@ -1162,7 +1180,6 @@ QLayoutItem *QToolBarAreaLayout::unplug(QList<int> path, QToolBarAreaLayout *oth
         }
     }
 
-
     Q_ASSERT(!item.gap);
     item.gap = true;
     return item.widgetItem;
@@ -1253,8 +1270,8 @@ void QToolBarAreaLayout::saveState(QDataStream &stream) const
                 }
                 stream << shownOrientation;
                 stream << item.pos;
-                //if extraSpace is 0 the item has its "normal" size, so no need to store the size (we store -1)
-                stream << (item.extraSpace == 0 ? -1 : (pick(line.o, item.realSizeHint()) + item.extraSpace));
+                //we store the preferred size. If the use rdidn't resize the toolbars it will be -1
+                stream << item.preferredSize;
 
                 uint geom0, geom1;
                 packRect(&geom0, &geom1, widget->geometry(), widget->isWindow());
@@ -1339,10 +1356,7 @@ bool QToolBarAreaLayout::restoreState(QDataStream &stream, const QList<QToolBar*
                 toolBar->setVisible(shown & 1);
                 toolBar->d_func()->setWindowState(floating, true, rect);
 
-                //if it is -1, it means we should use the default size
-                item.extraSpace = (item.size == -1) ? 0 : item.size - pick(line.o, item.realSizeHint());
-
-
+                item.preferredSize = item.size;
                 line.toolBarItems.append(item);
             }
         }
diff --git a/src/gui/widgets/qtoolbararealayout_p.h b/src/gui/widgets/qtoolbararealayout_p.h
index 574e366..5662ffc 100644
--- a/src/gui/widgets/qtoolbararealayout_p.h
+++ b/src/gui/widgets/qtoolbararealayout_p.h
@@ -59,6 +59,33 @@
 
 QT_BEGIN_NAMESPACE
 
+static inline int pick(Qt::Orientation o, const QPoint &pos)
+{ return o == Qt::Horizontal ? pos.x() : pos.y(); }
+
+static inline int pick(Qt::Orientation o, const QSize &size)
+{ return o == Qt::Horizontal ? size.width() : size.height(); }
+
+static inline int &rpick(Qt::Orientation o, QPoint &pos)
+{ return o == Qt::Horizontal ? pos.rx() : pos.ry(); }
+
+static inline int &rpick(Qt::Orientation o, QSize &size)
+{ return o == Qt::Horizontal ? size.rwidth() : size.rheight(); }
+
+static inline QSizePolicy::Policy pick(Qt::Orientation o, const QSizePolicy &policy)
+{ return o == Qt::Horizontal ? policy.horizontalPolicy() : policy.verticalPolicy(); }
+
+static inline int perp(Qt::Orientation o, const QPoint &pos)
+{ return o == Qt::Vertical ? pos.x() : pos.y(); }
+
+static inline int perp(Qt::Orientation o, const QSize &size)
+{ return o == Qt::Vertical ? size.width() : size.height(); }
+
+static inline int &rperp(Qt::Orientation o, QPoint &pos)
+{ return o == Qt::Vertical ? pos.rx() : pos.ry(); }
+
+static inline int &rperp(Qt::Orientation o, QSize &size)
+{ return o == Qt::Vertical ? size.rwidth() : size.rheight(); }
+
 #ifndef QT_NO_TOOLBAR
 
 class QToolBar;
@@ -70,17 +97,41 @@ class QToolBarAreaLayoutItem
 {
 public:
     QToolBarAreaLayoutItem(QLayoutItem *item = 0)
-        : widgetItem(item), pos(0), size(-1), extraSpace(0), gap(false) {}
+        : widgetItem(item), pos(0), size(-1), preferredSize(-1), gap(false) {}
 
     bool skip() const;
     QSize minimumSize() const;
     QSize sizeHint() const;
-    QSize realSizeHint() const; 
+    QSize realSizeHint() const;
+
+    void resize(Qt::Orientation o, int newSize)
+    {
+        newSize = qMax(pick(o, minimumSize()), newSize);
+        int sizeh = pick(o, sizeHint());
+        if (newSize == sizeh) {
+            preferredSize = -1;
+            size = sizeh;
+        } else {
+            preferredSize = newSize;
+        }
+    }
+
+    void extendSize(Qt::Orientation o, int extent)
+    {
+        int newSize = qMax(pick(o, minimumSize()), (preferredSize > 0 ? preferredSize : size) + extent);
+        int sizeh = pick(o, sizeHint());
+        if (newSize == sizeh) {
+            preferredSize = -1;
+            size = sizeh;
+        } else {
+            preferredSize = newSize;
+        }
+    }
 
     QLayoutItem *widgetItem;
     int pos;
     int size;
-    int extraSpace;
+    int preferredSize;
     bool gap;
 };
 
diff --git a/src/gui/widgets/qvalidator.cpp b/src/gui/widgets/qvalidator.cpp
index 3aca13d..0a7c43c 100644
--- a/src/gui/widgets/qvalidator.cpp
+++ b/src/gui/widgets/qvalidator.cpp
@@ -370,7 +370,7 @@ static int numDigits(qlonglong n)
     if (n == 0)
         return 1;
     return (int)log10(double(n)) + 1;
-};
+}
 
 static qlonglong pow10(int exp)
 {
diff --git a/src/network/access/qnetworkaccesshttpbackend.cpp b/src/network/access/qnetworkaccesshttpbackend.cpp
index bd364cb..7517000 100644
--- a/src/network/access/qnetworkaccesshttpbackend.cpp
+++ b/src/network/access/qnetworkaccesshttpbackend.cpp
@@ -212,6 +212,7 @@ QNetworkAccessHttpBackendFactory::create(QNetworkAccessManager::Operation op,
     case QNetworkAccessManager::PostOperation:
     case QNetworkAccessManager::HeadOperation:
     case QNetworkAccessManager::PutOperation:
+    case QNetworkAccessManager::DeleteOperation:
         break;
 
     default:
@@ -244,6 +245,10 @@ static QNetworkReply::NetworkError statusCodeFromHttp(int httpStatusCode, const
         code = QNetworkReply::ContentNotFoundError;
         break;
 
+    case 405:               // Method Not Allowed
+        code = QNetworkReply::ContentOperationNotPermittedError;
+        break;
+
     case 407:
         code = QNetworkReply::ProxyAuthenticationRequiredError;
         break;
@@ -485,6 +490,11 @@ void QNetworkAccessHttpBackend::postRequest()
         httpRequest.setUploadByteDevice(createUploadByteDevice());
         break;
 
+    case QNetworkAccessManager::DeleteOperation:
+        invalidateCache();
+        httpRequest.setOperation(QHttpNetworkRequest::Delete);
+        break;
+
     default:
         break;                  // can't happen
     }
diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp
index bf06ede..024f191 100644
--- a/src/network/access/qnetworkaccessmanager.cpp
+++ b/src/network/access/qnetworkaccessmanager.cpp
@@ -148,6 +148,9 @@ static void ensureInitialized()
     \value PostOperation        send the contents of an HTML form for
     processing via HTTP POST (created with post())
 
+    \value DeleteOperation      delete contents operation (created with
+    deleteResource())
+
     \omitvalue UnknownOperation
 
     \sa QNetworkReply::operation()
@@ -555,7 +558,7 @@ QNetworkReply *QNetworkAccessManager::head(const QNetworkRequest &request)
     a new QNetworkReply object opened for reading which emits its
     QIODevice::readyRead() signal whenever new data arrives.
 
-    \sa post(), put()
+    \sa post(), put(), deleteResource()
 */
 QNetworkReply *QNetworkAccessManager::get(const QNetworkRequest &request)
 {
@@ -577,7 +580,7 @@ QNetworkReply *QNetworkAccessManager::get(const QNetworkRequest &request)
     Note: sending a POST request on protocols other than HTTP and
     HTTPS is undefined and will probably fail.
 
-    \sa get(), put()
+    \sa get(), put(), deleteResource()
 */
 QNetworkReply *QNetworkAccessManager::post(const QNetworkRequest &request, QIODevice *data)
 {
@@ -642,6 +645,20 @@ QNetworkReply *QNetworkAccessManager::put(const QNetworkRequest &request, const
 }
 
 /*!
+    \since 4.6
+
+    This function is used to send a request to delete the resource
+    identified by the URL of \a request.
+    This feature is currently available for HTTP only, performing an HTTP DELETE request.
+
+    \sa get(), post(), put()
+*/
+QNetworkReply *QNetworkAccessManager::deleteResource(const QNetworkRequest &request)
+{
+    return d_func()->postProcess(createRequest(QNetworkAccessManager::DeleteOperation, request));
+}
+
+/*!
     Returns a new QNetworkReply object to handle the operation \a op
     and request \a req. The device \a outgoingData is always 0 for Get and
     Head requests, but is the value passed to post() and put() in
diff --git a/src/network/access/qnetworkaccessmanager.h b/src/network/access/qnetworkaccessmanager.h
index 4fe218e..79f512c 100644
--- a/src/network/access/qnetworkaccessmanager.h
+++ b/src/network/access/qnetworkaccessmanager.h
@@ -74,6 +74,7 @@ public:
         GetOperation,
         PutOperation,
         PostOperation,
+        DeleteOperation,
 
         UnknownOperation = 0
     };
@@ -100,6 +101,7 @@ public:
     QNetworkReply *post(const QNetworkRequest &request, const QByteArray &data);
     QNetworkReply *put(const QNetworkRequest &request, QIODevice *data);
     QNetworkReply *put(const QNetworkRequest &request, const QByteArray &data);
+    QNetworkReply *deleteResource(const QNetworkRequest &request);
 
 Q_SIGNALS:
 #ifndef QT_NO_NETWORKPROXY
diff --git a/src/network/kernel/qauthenticator.cpp b/src/network/kernel/qauthenticator.cpp
index b672765..cae3024 100644
--- a/src/network/kernel/qauthenticator.cpp
+++ b/src/network/kernel/qauthenticator.cpp
@@ -46,6 +46,7 @@
 #include <qbytearray.h>
 #include <qcryptographichash.h>
 #include <qhttp.h>
+#include <qiodevice.h>
 #include <qdatastream.h>
 #include <qendian.h>
 #include <qstring.h>
diff --git a/src/network/kernel/qnetworkproxy.cpp b/src/network/kernel/qnetworkproxy.cpp
index fd3a85a..a5fd60e 100644
--- a/src/network/kernel/qnetworkproxy.cpp
+++ b/src/network/kernel/qnetworkproxy.cpp
@@ -324,7 +324,7 @@ QList<QNetworkProxy> QGlobalNetworkProxy::proxyForQuery(const QNetworkProxyQuery
     return result;
 }
 
-Q_GLOBAL_STATIC(QGlobalNetworkProxy, globalNetworkProxy);
+Q_GLOBAL_STATIC(QGlobalNetworkProxy, globalNetworkProxy)
 
 namespace {
     template<bool> struct StaticAssertTest;
diff --git a/src/network/socket/qlocalsocket_win.cpp b/src/network/socket/qlocalsocket_win.cpp
index 39c9284..ace3bc5 100644
--- a/src/network/socket/qlocalsocket_win.cpp
+++ b/src/network/socket/qlocalsocket_win.cpp
@@ -144,7 +144,7 @@ void QLocalSocket::connectToServer(const QString &name, OpenMode openMode)
                        0,              // no sharing
                        NULL,           // default security attributes
                        OPEN_EXISTING,  // opens existing pipe
-                       0,              // default attributes
+                       FILE_FLAG_OVERLAPPED,
                        NULL);          // no template file
         }, {
         localSocket = CreateFileA(
@@ -153,7 +153,7 @@ void QLocalSocket::connectToServer(const QString &name, OpenMode openMode)
                        0,              // no sharing
                        NULL,           // default security attributes
                        OPEN_EXISTING,  // opens existing pipe
-                       0,              // default attributes
+                       FILE_FLAG_OVERLAPPED,
                        NULL);          // no template file
         });
         if (localSocket != INVALID_HANDLE_VALUE)
diff --git a/src/opengl/gl2paintengineex/qglengineshadermanager_p.h b/src/opengl/gl2paintengineex/qglengineshadermanager_p.h
index 9bc81ef..afbc918 100644
--- a/src/opengl/gl2paintengineex/qglengineshadermanager_p.h
+++ b/src/opengl/gl2paintengineex/qglengineshadermanager_p.h
@@ -257,7 +257,7 @@ static const GLuint QT_TEXTURE_COORDS_ATTR = 1;
 
 class QGLEngineShaderManager : public QObject
 {
-    Q_OBJECT;
+    Q_OBJECT
 public:
     QGLEngineShaderManager(QGLContext* context);
     ~QGLEngineShaderManager();
@@ -352,7 +352,7 @@ public:
 */
 
 #if defined (QT_DEBUG)
-    Q_ENUMS(ShaderName);
+    Q_ENUMS(ShaderName)
 #endif
 
 
diff --git a/src/opengl/gl2paintengineex/qglgradientcache_p.h b/src/opengl/gl2paintengineex/qglgradientcache_p.h
index 9bf58c7..f088359 100644
--- a/src/opengl/gl2paintengineex/qglgradientcache_p.h
+++ b/src/opengl/gl2paintengineex/qglgradientcache_p.h
@@ -52,7 +52,7 @@
 
 #include <QMultiHash>
 #include <QObject>
-#include <QtOpenGL>
+#include <QtOpenGL/QtOpenGL>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index 60039eb..2e72851 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -1456,7 +1456,7 @@ struct DDSFormat {
 #define GL_GENERATE_MIPMAP_HINT_SGIS  0x8192
 #endif
 
-Q_GLOBAL_STATIC(QGLShareRegister, _qgl_share_reg);
+Q_GLOBAL_STATIC(QGLShareRegister, _qgl_share_reg)
 Q_OPENGL_EXPORT QGLShareRegister* qgl_share_reg()
 {
     return _qgl_share_reg();
@@ -2609,7 +2609,7 @@ const QGLContext* QGLContext::currentContext()
 */
 
 /*! \fn int QGLContext::choosePixelFormat(void* dummyPfd, HDC pdc)
-  
+
     \bold{Win32 only:} This virtual function chooses a pixel format
     that matches the OpenGL \link setFormat() format\endlink.
     Reimplement this function in a subclass if you need a custom
@@ -2623,7 +2623,7 @@ const QGLContext* QGLContext::currentContext()
 */
 
 /*! \fn void *QGLContext::chooseVisual()
-  
+
   \bold{X11 only:} This virtual function tries to find a visual that
   matches the format, reducing the demands if the original request
   cannot be met.
@@ -4354,7 +4354,7 @@ void QGLWidgetPrivate::initContext(QGLContext *context, const QGLWidget* shareWi
 }
 
 #if defined(Q_WS_X11) || defined(Q_WS_MAC) || defined(Q_WS_QWS)
-Q_GLOBAL_STATIC(QString, qt_gl_lib_name);
+Q_GLOBAL_STATIC(QString, qt_gl_lib_name)
 
 Q_OPENGL_EXPORT void qt_set_gl_library_name(const QString& name)
 {
diff --git a/src/opengl/qgl_x11.cpp b/src/opengl/qgl_x11.cpp
index 28a50bd..da61634 100644
--- a/src/opengl/qgl_x11.cpp
+++ b/src/opengl/qgl_x11.cpp
@@ -129,7 +129,7 @@ struct QGLCMapCleanupHandler {
     CMapEntryHash *cmap_hash;
     GLCMapHash *qglcmap_hash;
 };
-Q_GLOBAL_STATIC(QGLCMapCleanupHandler, cmap_handler);
+Q_GLOBAL_STATIC(QGLCMapCleanupHandler, cmap_handler)
 
 static void cleanup_cmaps()
 {
diff --git a/src/opengl/qglshaderprogram.h b/src/opengl/qglshaderprogram.h
index ab30c32..06bff42 100644
--- a/src/opengl/qglshaderprogram.h
+++ b/src/opengl/qglshaderprogram.h
@@ -103,7 +103,7 @@ private:
 
     friend class QGLShaderProgram;
 
-    Q_DISABLE_COPY(QGLShader);
+    Q_DISABLE_COPY(QGLShader)
 };
 
 class QGLShaderProgramPrivate;
@@ -279,7 +279,7 @@ public:
 private:
     QGLShaderProgramPrivate *d;
 
-    Q_DISABLE_COPY(QGLShaderProgram);
+    Q_DISABLE_COPY(QGLShaderProgram)
 
     bool init();
 };
diff --git a/src/opengl/util/fragmentprograms_p.h b/src/opengl/util/fragmentprograms_p.h
index ecf0bf8..d4b54d4 100644
--- a/src/opengl/util/fragmentprograms_p.h
+++ b/src/opengl/util/fragmentprograms_p.h
@@ -71,7 +71,7 @@ enum FragmentVariable {
     VAR_FMP2_M_RADIUS2,
     VAR_FMP,
     VAR_INV_MATRIX_M0,
-    VAR_ANGLE,
+    VAR_ANGLE
 };
 
 enum FragmentBrushType {
@@ -80,7 +80,7 @@ enum FragmentBrushType {
     FRAGMENT_PROGRAM_BRUSH_CONICAL,
     FRAGMENT_PROGRAM_BRUSH_LINEAR,
     FRAGMENT_PROGRAM_BRUSH_TEXTURE,
-    FRAGMENT_PROGRAM_BRUSH_PATTERN,
+    FRAGMENT_PROGRAM_BRUSH_PATTERN
 };
 
 enum FragmentCompositionModeType {
@@ -109,12 +109,12 @@ enum FragmentCompositionModeType {
     COMPOSITION_MODES_DIFFERENCE_NOMASK,
     COMPOSITION_MODES_EXCLUSION_NOMASK,
     COMPOSITION_MODE_BLEND_MODE_MASK,
-    COMPOSITION_MODE_BLEND_MODE_NOMASK,
+    COMPOSITION_MODE_BLEND_MODE_NOMASK
 };
 
 enum FragmentMaskType {
     FRAGMENT_PROGRAM_MASK_TRAPEZOID_AA,
-    FRAGMENT_PROGRAM_MASK_ELLIPSE_AA,
+    FRAGMENT_PROGRAM_MASK_ELLIPSE_AA
 };
 
 static const unsigned int num_fragment_variables = 19;
diff --git a/src/opengl/util/generator.cpp b/src/opengl/util/generator.cpp
index dac5a2d..430ced1 100644
--- a/src/opengl/util/generator.cpp
+++ b/src/opengl/util/generator.cpp
@@ -48,6 +48,7 @@
 #include <QTextStream>
 
 #include <QtDebug>
+#include <cstdlib>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qt3support/widgets/q3action.cpp b/src/qt3support/widgets/q3action.cpp
index 311212a..caca47b 100644
--- a/src/qt3support/widgets/q3action.cpp
+++ b/src/qt3support/widgets/q3action.cpp
@@ -415,7 +415,7 @@ static QString qt_stripMenuText(QString s)
     s.remove(QLatin1String("..."));
     s.remove(QLatin1Char('&'));
     return s.trimmed();
-};
+}
 
 /*!
     Constructs an action called \a name with parent \a parent.
diff --git a/src/script/qscriptextqobject.cpp b/src/script/qscriptextqobject.cpp
index 4522807..0a346f0 100644
--- a/src/script/qscriptextqobject.cpp
+++ b/src/script/qscriptextqobject.cpp
@@ -1883,8 +1883,6 @@ void QScript::QtFunction::execute(QScriptContextPrivate *context)
         return;
     }
 
-    QScriptValueImpl result = eng_p->undefinedValue();
-
     const QMetaObject *meta = qobj->metaObject();
 
     QObject *thisQObject = context->thisObject().toQObject();
diff --git a/src/script/qscriptsyntaxchecker_p.h b/src/script/qscriptsyntaxchecker_p.h
index 0c02d24..18f0611 100644
--- a/src/script/qscriptsyntaxchecker_p.h
+++ b/src/script/qscriptsyntaxchecker_p.h
@@ -71,7 +71,7 @@ public:
     enum State {
         Error,
         Intermediate,
-        Valid,
+        Valid
     };
 
     struct Result {
diff --git a/src/script/qscriptvalue.cpp b/src/script/qscriptvalue.cpp
index a253985..f72d1db 100644
--- a/src/script/qscriptvalue.cpp
+++ b/src/script/qscriptvalue.cpp
@@ -904,6 +904,7 @@ qsreal QScriptValue::toInteger() const
     \row    \o QObject Object \o A QVariant containing a pointer to the QObject.
     \row    \o Date Object \o A QVariant containing the date value (toDateTime()).
     \row    \o RegExp Object \o A QVariant containing the regular expression value (toRegExp()).
+    \row    \o Array Object \o The array is converted to a QVariantList.
     \row    \o Object     \o If the value is primitive, then the result is converted to a QVariant according to the above rules; otherwise, an invalid QVariant is returned.
     \endtable
 
diff --git a/src/script/qscriptvalueimpl.cpp b/src/script/qscriptvalueimpl.cpp
index a890839..7c7b711 100644
--- a/src/script/qscriptvalueimpl.cpp
+++ b/src/script/qscriptvalueimpl.cpp
@@ -339,6 +339,8 @@ QVariant QScriptValueImpl::toVariant() const
         if (isQObject())        
             return qVariantFromValue(toQObject());
 #endif
+        if (isArray())
+            return QScriptEnginePrivate::variantListFromArray(*this);
 
         QScriptValueImpl v = engine()->toPrimitive(*this);
         if (!v.isObject())
diff --git a/src/script/qscriptvalueimplfwd_p.h b/src/script/qscriptvalueimplfwd_p.h
index 059842e..aa0c86f 100644
--- a/src/script/qscriptvalueimplfwd_p.h
+++ b/src/script/qscriptvalueimplfwd_p.h
@@ -77,7 +77,7 @@ class QScriptEnginePrivate;
 namespace QScript
 {
     class Member;
-};
+}
 
 class QScriptValueImpl
 {
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp
index 041f2db..af0df3e 100644
--- a/src/testlib/qtestcase.cpp
+++ b/src/testlib/qtestcase.cpp
@@ -1469,7 +1469,7 @@ int QTest::qExec(QObject *testObject, int argc, char **argv)
 #ifdef Q_OS_WIN
         chartLocation += QLatin1String("/../tools/qtestlib/chart/release/chart.exe");
 #else
-        chartLocation += QLatin1String("/../tools/qtestlib/chart/chart");        
+        chartLocation += QLatin1String("/../tools/qtestlib/chart/chart");
 #endif
         if (QFile::exists(chartLocation)) {
             QProcess p;
@@ -1801,8 +1801,8 @@ COMPARE_IMPL2(quint64, %llu)
 #endif
 COMPARE_IMPL2(bool, %d)
 COMPARE_IMPL2(char, %c)
-COMPARE_IMPL2(float, %g);
-COMPARE_IMPL2(double, %lg);
+COMPARE_IMPL2(float, %g)
+COMPARE_IMPL2(double, %lg)
 
 /*! \internal
  */
diff --git a/src/testlib/qtestresult.cpp b/src/testlib/qtestresult.cpp
index 39759b5..0f21378 100644
--- a/src/testlib/qtestresult.cpp
+++ b/src/testlib/qtestresult.cpp
@@ -68,7 +68,7 @@ namespace QTest
 
     static const char *expectFailComment = 0;
     static int expectFailMode = 0;
-};
+}
 
 void QTestResult::reset()
 {
diff --git a/src/tools/moc/generator.cpp b/src/tools/moc/generator.cpp
index e94bb77..e4ad068 100644
--- a/src/tools/moc/generator.cpp
+++ b/src/tools/moc/generator.cpp
@@ -109,6 +109,14 @@ bool isVariantType(const char* type)
     return qvariant_nameToType(type) != 0;
 }
 
+/*!
+  Returns true if the type is qreal.
+*/
+static bool isQRealType(const char *type)
+{
+    return strcmp(type, "qreal") == 0;
+}
+
 Generator::Generator(ClassDef *classDef, const QList<QByteArray> &metaTypes, FILE *outfile)
     : out(outfile), cdef(classDef), metaTypes(metaTypes)
 {
@@ -545,7 +553,7 @@ void Generator::generateProperties()
         uint flags = Invalid;
         if (!isVariantType(p.type)) {
             flags |= EnumOrFlag;
-        } else {
+        } else if (!isQRealType(p.type)) {
             flags |= qvariant_nameToType(p.type) << 24;
         }
         if (!p.read.isEmpty())
@@ -589,10 +597,12 @@ void Generator::generateProperties()
         if (p.notifyId != -1)
             flags |= Notify;
 
-        fprintf(out, "    %4d, %4d, 0x%.8x,\n",
-                 strreg(p.name),
-                 strreg(p.type),
-                 flags);
+        fprintf(out, "    %4d, %4d, ",
+                strreg(p.name),
+                strreg(p.type));
+        if (!(flags >> 24) && isQRealType(p.type))
+            fprintf(out, "(QMetaType::QReal << 24) | ");
+        fprintf(out, "0x%.8x,\n", flags);
     }
 
     if(cdef->notifyableProperties) {
diff --git a/src/tools/moc/outputrevision.h b/src/tools/moc/outputrevision.h
index 1e1d640..f577f6c 100644
--- a/src/tools/moc/outputrevision.h
+++ b/src/tools/moc/outputrevision.h
@@ -43,6 +43,6 @@
 #define OUTPUTREVISION_H
 
 // if the output revision changes, you MUST change it in qobjectdefs.h too
-enum { mocOutputRevision = 61 };          // moc format output revision
+enum { mocOutputRevision = 62 };          // moc format output revision
 
 #endif // OUTPUTREVISION_H