Merge remote branch 'staging/4.6' into 4.6

43 files changed, 407 insertions, 200 deletions

diff --git a/doc/src/examples/fademessage.qdoc b/doc/src/examples/fademessage.qdoc
index ecea095..6063fa7 100644
--- a/doc/src/examples/fademessage.qdoc
+++ b/doc/src/examples/fademessage.qdoc
@@ -43,5 +43,13 @@
     \example effects/fademessage
     \title Fade Message Effect Example
 
-    \image fademessageeffect-example.png
+    \raw HTML
+    <div style="text-align: center">
+    \endraw
+    \inlineimage fademessageeffect-example.png
+    \inlineimage fademessageeffect-example-faded.png
+    \raw HTML
+    </div>
+    \endraw
+
 */
diff --git a/doc/src/frameworks-technologies/dnd.qdoc b/doc/src/frameworks-technologies/dnd.qdoc
index a7b1622..65fddfb 100644
--- a/doc/src/frameworks-technologies/dnd.qdoc
+++ b/doc/src/frameworks-technologies/dnd.qdoc
@@ -426,6 +426,7 @@
 
     \legalese
     Copyright 1996 Daniel Dardailler.
+    Copyright 1999 Matt Koss
 
     Permission to use, copy, modify, distribute, and sell this software
     for any purpose is hereby granted without fee, provided that the above
@@ -436,13 +437,11 @@
     written prior permission. Daniel Dardailler makes no representations
     about the suitability of this software for any purpose. It is
     provided "as is" without express or implied warranty.
-
-    Modifications Copyright 1999 Matt Koss, under the same license as
-    above.
     \endlegalese
-    \omit NOTE: The copyright notice is from qmotifdnd_x11.cpp. \endomit
+    \omit NOTE: The original version of this copyright notice can be found
+    in qmotifdnd_x11.cpp. \endomit
 
-    Note: The Motif Drag \& Drop Protocol only allows receivers to
+    \note The Motif Drag \& Drop Protocol only allows receivers to
     request data in response to a QDropEvent. If you attempt to
     request data in response to e.g. a QDragMoveEvent, an empty
     QByteArray is returned.
diff --git a/doc/src/getting-started/examples.qdoc b/doc/src/getting-started/examples.qdoc
index f0a6799..2d4f5c9 100644
--- a/doc/src/getting-started/examples.qdoc
+++ b/doc/src/getting-started/examples.qdoc
@@ -546,6 +546,14 @@
     \o \l{graphicsview/portedcanvas}{Ported Canvas}
     \endlist
 
+    Some examples demonstrate the use of graphics effects with canvas items.
+
+    \list
+    \o \l{effects/blurpicker}{Blur Picker Effect}
+    \o \l{effects/fademessage}{Fade Message Effect}
+    \o \l{effects/lighting}{Lighting Effect}
+    \endlist
+
     Examples marked with an asterisk (*) are fully documented.
 */
 
@@ -851,11 +859,13 @@
 
     \section1 Multimedia
 
-    Qt provides low-level audio support on linux,windows and mac platforms by default and
-    an audio plugin API to allow developers to implement there own audio support for
+    Qt provides low-level audio support on Linux, Windows and Mac OS X by default and
+    an audio plugin API to allow developers to implement their own audio support for
     custom devices and platforms.
 
-    These examples demonstrate the basic techniques used to take advantage of
+    \section1 Audio Handling
+
+    These examples demonstrate the basic techniques used to take advantage of the
     Audio API in Qt applications.
 
     \list
diff --git a/doc/src/modules.qdoc b/doc/src/modules.qdoc
index 3058b84..5e759db 100644
--- a/doc/src/modules.qdoc
+++ b/doc/src/modules.qdoc
@@ -409,59 +409,58 @@
 */
 
 /*!
-	\module QtSvg
-	\title QtSvg Module
-	\since 4.1
-	\contentspage All Qt Modules
-	\previouspage QtSql
-	\nextpage QtWebKit
-	\ingroup modules
+        \module QtSvg
+        \title QtSvg Module
+        \since 4.1
+        \contentspage All Qt Modules
+        \previouspage QtSql
+        \nextpage QtWebKit
+        \ingroup modules
 
-	\brief The QtSvg module provides classes for displaying the contents of SVG
-	files.
+        \brief The QtSvg module provides classes for displaying and creating SVG files.
 
-	To include the definitions of the module's classes, use the
-	following directive:
+        To include the definitions of the module's classes, use the
+        following directive:
 
-	\snippet doc/src/snippets/code/doc_src_qtsvg.qdoc 0
+        \snippet doc/src/snippets/code/doc_src_qtsvg.qdoc 0
 
-	To link against the module, add this line to your \l qmake \c
-	.pro file:
+        To link against the module, add this line to your \l qmake \c
+        .pro file:
 
-	\snippet doc/src/snippets/code/doc_src_qtsvg.qdoc 1
+        \snippet doc/src/snippets/code/doc_src_qtsvg.qdoc 1
 
-	The QtSvg module is part of the \l{Qt Full Framework Edition} and the
-	\l{Open Source Versions of Qt}.
+        The QtSvg module is part of the \l{Qt Full Framework Edition} and the
+        \l{Open Source Versions of Qt}.
 
-	\section1 License Information
-
-	Some code for arc handling in this module is derived from code with
-	the following license:
-
-	\legalese
-	Copyright  2002 USC/Information Sciences Institute
-
-	Permission to use, copy, modify, distribute, and sell this software
-	and its documentation for any purpose is hereby granted without
-	fee, provided that the above copyright notice appear in all copies
-	and that both that copyright notice and this permission notice
-	appear in supporting documentation, and that the name of
-	Information Sciences Institute not be used in advertising or
-	publicity pertaining to distribution of the software without
-	specific, written prior permission.  Information Sciences Institute
-	makes no representations about the suitability of this software for
-	any purpose.  It is provided "as is" without express or implied
-	warranty.
-
-	INFORMATION SCIENCES INSTITUTE DISCLAIMS ALL WARRANTIES WITH REGARD
-	TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF
-	MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL INFORMATION SCIENCES
-	INSTITUTE BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
-	DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA
-	OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-	TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-	PERFORMANCE OF THIS SOFTWARE.
-	\endlegalese
+        \section1 License Information
+
+        Some code for arc handling in this module is derived from code with
+        the following license:
+
+        \legalese
+        Copyright  2002 USC/Information Sciences Institute
+
+        Permission to use, copy, modify, distribute, and sell this software
+        and its documentation for any purpose is hereby granted without
+        fee, provided that the above copyright notice appear in all copies
+        and that both that copyright notice and this permission notice
+        appear in supporting documentation, and that the name of
+        Information Sciences Institute not be used in advertising or
+        publicity pertaining to distribution of the software without
+        specific, written prior permission.  Information Sciences Institute
+        makes no representations about the suitability of this software for
+        any purpose.  It is provided "as is" without express or implied
+        warranty.
+
+        INFORMATION SCIENCES INSTITUTE DISCLAIMS ALL WARRANTIES WITH REGARD
+        TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF
+        MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL INFORMATION SCIENCES
+        INSTITUTE BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+        DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA
+        OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+        TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+        PERFORMANCE OF THIS SOFTWARE.
+        \endlegalese
 */
 
 /*!
diff --git a/examples/multimedia/audiodevices/audiodevices.cpp b/examples/multimedia/audiodevices/audiodevices.cpp
index e205e03..45c7a53 100644
--- a/examples/multimedia/audiodevices/audiodevices.cpp
+++ b/examples/multimedia/audiodevices/audiodevices.cpp
@@ -40,45 +40,33 @@
 ****************************************************************************/
 
 
-#include <QDebug>
 #include <QAudioDeviceInfo>
 
 #include "audiodevices.h"
 
-AudioDevicesBase::AudioDevicesBase( QMainWindow *parent, Qt::WFlags f )
+AudioDevicesBase::AudioDevicesBase(QWidget *parent, Qt::WFlags f)
+    : QMainWindow(parent, f)
 {
-    Q_UNUSED(parent)
-    Q_UNUSED(f)
-    setupUi( this );
+    setupUi(this);
 }
 
 AudioDevicesBase::~AudioDevicesBase() {}
 
 
-AudioTest::AudioTest( QMainWindow *parent, Qt::WFlags f )
-    : AudioDevicesBase( parent, f )
+AudioTest::AudioTest(QWidget *parent, Qt::WFlags f)
+    : AudioDevicesBase(parent, f)
 {
-    nearestFreq->setDisabled(true);
-    nearestChannel->setDisabled(true);
-    nearestCodec->setDisabled(true);
-    nearestSampleSize->setDisabled(true);
-    nearestSampleType->setDisabled(true);
-    nearestEndian->setDisabled(true);
-    logOutput->setDisabled(true);
-
     mode = QAudio::AudioOutput;
-    modeBox->addItem("Input");
-    modeBox->addItem("Output");
 
-    connect(testButton,SIGNAL(clicked()),SLOT(test()));
-    connect(modeBox,SIGNAL(activated(int)),SLOT(modeChanged(int)));
-    connect(deviceBox,SIGNAL(activated(int)),SLOT(deviceChanged(int)));
-    connect(frequencyBox,SIGNAL(activated(int)),SLOT(freqChanged(int)));
-    connect(channelsBox,SIGNAL(activated(int)),SLOT(channelChanged(int)));
-    connect(codecsBox,SIGNAL(activated(int)),SLOT(codecChanged(int)));
-    connect(sampleSizesBox,SIGNAL(activated(int)),SLOT(sampleSizeChanged(int)));
-    connect(sampleTypesBox,SIGNAL(activated(int)),SLOT(sampleTypeChanged(int)));
-    connect(endianBox,SIGNAL(activated(int)),SLOT(endianChanged(int)));
+    connect(testButton, SIGNAL(clicked()), SLOT(test()));
+    connect(modeBox, SIGNAL(activated(int)), SLOT(modeChanged(int)));
+    connect(deviceBox, SIGNAL(activated(int)), SLOT(deviceChanged(int)));
+    connect(frequencyBox, SIGNAL(activated(int)), SLOT(freqChanged(int)));
+    connect(channelsBox, SIGNAL(activated(int)), SLOT(channelChanged(int)));
+    connect(codecsBox, SIGNAL(activated(int)), SLOT(codecChanged(int)));
+    connect(sampleSizesBox, SIGNAL(activated(int)), SLOT(sampleSizeChanged(int)));
+    connect(sampleTypesBox, SIGNAL(activated(int)), SLOT(sampleTypeChanged(int)));
+    connect(endianBox, SIGNAL(activated(int)), SLOT(endianChanged(int)));
 
     modeBox->setCurrentIndex(0);
     modeChanged(0);
@@ -98,7 +86,7 @@ void AudioTest::test()
 
     if (!deviceInfo.isNull()) {
         if (deviceInfo.isFormatSupported(settings)) {
-            logOutput->append("Success");
+            logOutput->append(tr("Success"));
             nearestFreq->setText("");
             nearestChannel->setText("");
             nearestCodec->setText("");
@@ -136,16 +124,16 @@ void AudioTest::test()
         }
     }
     else
-        logOutput->append("No Device");
+        logOutput->append(tr("No Device"));
 }
 
 void AudioTest::modeChanged(int idx)
 {
     // mode has changed
-    if(idx == 0)
-        mode=QAudio::AudioInput;
+    if (idx == 0)
+        mode = QAudio::AudioInput;
     else
-        mode=QAudio::AudioOutput;
+        mode = QAudio::AudioOutput;
 
     deviceBox->clear();
     foreach (const QAudioDeviceInfo &deviceInfo, QAudioDeviceInfo::availableDevices(mode))
@@ -162,37 +150,37 @@ void AudioTest::deviceChanged(int idx)
 
     frequencyBox->clear();
     QList<int> freqz = deviceInfo.supportedFrequencies();
-    for(int i = 0; i < freqz.size(); ++i)
+    for (int i = 0; i < freqz.size(); ++i)
         frequencyBox->addItem(QString("%1").arg(freqz.at(i)));
-    if(freqz.size())
+    if (freqz.size())
         settings.setFrequency(freqz.at(0));
 
     channelsBox->clear();
     QList<int> chz = deviceInfo.supportedChannels();
-    for(int i = 0; i < chz.size(); ++i)
+    for (int i = 0; i < chz.size(); ++i)
         channelsBox->addItem(QString("%1").arg(chz.at(i)));
-    if(chz.size())
+    if (chz.size())
         settings.setChannels(chz.at(0));
 
     codecsBox->clear();
     QStringList codecz = deviceInfo.supportedCodecs();
-    for(int i = 0; i < codecz.size(); ++i)
+    for (int i = 0; i < codecz.size(); ++i)
         codecsBox->addItem(QString("%1").arg(codecz.at(i)));
-    if(codecz.size())
+    if (codecz.size())
         settings.setCodec(codecz.at(0));
     // Add false to create failed condition!
     codecsBox->addItem("audio/test");
 
     sampleSizesBox->clear();
     QList<int> sampleSizez = deviceInfo.supportedSampleSizes();
-    for(int i = 0; i < sampleSizez.size(); ++i)
+    for (int i = 0; i < sampleSizez.size(); ++i)
         sampleSizesBox->addItem(QString("%1").arg(sampleSizez.at(i)));
-    if(sampleSizez.size())
+    if (sampleSizez.size())
         settings.setSampleSize(sampleSizez.at(0));
 
     sampleTypesBox->clear();
     QList<QAudioFormat::SampleType> sampleTypez = deviceInfo.supportedSampleTypes();
-    for(int i = 0; i < sampleTypez.size(); ++i) {
+    for (int i = 0; i < sampleTypez.size(); ++i) {
         switch(sampleTypez.at(i)) {
             case QAudioFormat::SignedInt:
                 sampleTypesBox->addItem("SignedInt");
@@ -206,14 +194,14 @@ void AudioTest::deviceChanged(int idx)
             case QAudioFormat::Unknown:
                 sampleTypesBox->addItem("Unknown");
         }
-	if(sampleTypez.size())
+	if (sampleTypez.size())
             settings.setSampleType(sampleTypez.at(0));
     }
 
     endianBox->clear();
     QList<QAudioFormat::Endian> endianz = deviceInfo.supportedByteOrders();
-    for(int i = 0; i < endianz.size(); ++i) {
-        switch(endianz.at(i)) {
+    for (int i = 0; i < endianz.size(); ++i) {
+        switch (endianz.at(i)) {
             case QAudioFormat::LittleEndian:
                 endianBox->addItem("Little Endian");
                 break;
@@ -222,7 +210,7 @@ void AudioTest::deviceChanged(int idx)
                 break;
         }
     }
-    if(endianz.size())
+    if (endianz.size())
         settings.setByteOrder(endianz.at(0));
 }
 
@@ -249,7 +237,7 @@ void AudioTest::sampleSizeChanged(int idx)
 
 void AudioTest::sampleTypeChanged(int idx)
 {
-    switch(sampleTypesBox->itemText(idx).toInt()) {
+    switch (sampleTypesBox->itemText(idx).toInt()) {
         case QAudioFormat::SignedInt:
             settings.setSampleType(QAudioFormat::SignedInt);
             break;
@@ -263,7 +251,7 @@ void AudioTest::sampleTypeChanged(int idx)
 
 void AudioTest::endianChanged(int idx)
 {
-    switch(endianBox->itemText(idx).toInt()) {
+    switch (endianBox->itemText(idx).toInt()) {
         case QAudioFormat::LittleEndian:
             settings.setByteOrder(QAudioFormat::LittleEndian);
             break;
@@ -271,4 +259,3 @@ void AudioTest::endianChanged(int idx)
             settings.setByteOrder(QAudioFormat::BigEndian);
     }
 }
-
diff --git a/examples/multimedia/audiodevices/audiodevices.h b/examples/multimedia/audiodevices/audiodevices.h
index 5fe5547..bd4b7c4 100644
--- a/examples/multimedia/audiodevices/audiodevices.h
+++ b/examples/multimedia/audiodevices/audiodevices.h
@@ -49,7 +49,7 @@
 class AudioDevicesBase : public QMainWindow, public Ui::AudioDevicesBase
 {
 public:
-    AudioDevicesBase( QMainWindow *parent = 0, Qt::WFlags f = 0 );
+    AudioDevicesBase(QWidget *parent = 0, Qt::WFlags f = 0);
     virtual ~AudioDevicesBase();
 };
 
@@ -57,10 +57,10 @@ class AudioTest : public AudioDevicesBase
 {
     Q_OBJECT
 public:
-    AudioTest( QMainWindow *parent = 0, Qt::WFlags f = 0 );
+    AudioTest(QWidget *parent = 0, Qt::WFlags f = 0);
     virtual ~AudioTest();
 
-    QAudioDeviceInfo  deviceInfo;
+    QAudioDeviceInfo deviceInfo;
     QAudioFormat settings;
     QAudio::Mode mode;
 
diff --git a/examples/multimedia/audiodevices/audiodevices.pro b/examples/multimedia/audiodevices/audiodevices.pro
index 232da09..1cb4679 100644
--- a/examples/multimedia/audiodevices/audiodevices.pro
+++ b/examples/multimedia/audiodevices/audiodevices.pro
@@ -1,7 +1,7 @@
 HEADERS       = audiodevices.h
 SOURCES       = audiodevices.cpp \
                 main.cpp
-FORMS         += audiodevicesbase.ui
+FORMS        += audiodevicesbase.ui
 
 QT           += multimedia
 
diff --git a/examples/multimedia/audiodevices/audiodevicesbase.ui b/examples/multimedia/audiodevices/audiodevicesbase.ui
index 5207338..faa39dc 100644
--- a/examples/multimedia/audiodevices/audiodevicesbase.ui
+++ b/examples/multimedia/audiodevices/audiodevicesbase.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>AudioDevicesBase</string>
+   <string>Audio Devices</string>
   </property>
   <widget class="QWidget" name="centralwidget">
    <layout class="QVBoxLayout" name="verticalLayout">
@@ -41,7 +41,18 @@
        <widget class="QComboBox" name="deviceBox"/>
       </item>
       <item row="1" column="1">
-       <widget class="QComboBox" name="modeBox"/>
+       <widget class="QComboBox" name="modeBox">
+        <item>
+         <property name="text">
+          <string>Input</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Output</string>
+         </property>
+        </item>
+       </widget>
       </item>
       <item row="2" column="0">
        <widget class="QLabel" name="actualLabel">
@@ -93,7 +104,11 @@
        <widget class="QComboBox" name="frequencyBox"/>
       </item>
       <item row="4" column="1">
-       <widget class="QLineEdit" name="nearestFreq"/>
+       <widget class="QLineEdit" name="nearestFreq">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+       </widget>
       </item>
       <item row="5" column="0">
        <widget class="QLabel" name="actualChannelsLabel">
@@ -113,7 +128,11 @@
        <widget class="QComboBox" name="channelsBox"/>
       </item>
       <item row="6" column="1">
-       <widget class="QLineEdit" name="nearestChannel"/>
+       <widget class="QLineEdit" name="nearestChannel">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+       </widget>
       </item>
       <item row="7" column="0">
        <widget class="QLabel" name="actualCodecLabel">
@@ -133,7 +152,11 @@
        <widget class="QComboBox" name="codecsBox"/>
       </item>
       <item row="8" column="1">
-       <widget class="QLineEdit" name="nearestCodec"/>
+       <widget class="QLineEdit" name="nearestCodec">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+       </widget>
       </item>
       <item row="9" column="0">
        <widget class="QLabel" name="actualSampleSizeLabel">
@@ -153,7 +176,11 @@
        <widget class="QComboBox" name="sampleSizesBox"/>
       </item>
       <item row="10" column="1">
-       <widget class="QLineEdit" name="nearestSampleSize"/>
+       <widget class="QLineEdit" name="nearestSampleSize">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+       </widget>
       </item>
       <item row="11" column="0">
        <widget class="QLabel" name="actualSampleTypeLabel">
@@ -173,7 +200,11 @@
        <widget class="QComboBox" name="sampleTypesBox"/>
       </item>
       <item row="12" column="1">
-       <widget class="QLineEdit" name="nearestSampleType"/>
+       <widget class="QLineEdit" name="nearestSampleType">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+       </widget>
       </item>
       <item row="13" column="0">
        <widget class="QLabel" name="actualEndianLabel">
@@ -193,10 +224,17 @@
        <widget class="QComboBox" name="endianBox"/>
       </item>
       <item row="14" column="1">
-       <widget class="QLineEdit" name="nearestEndian"/>
+       <widget class="QLineEdit" name="nearestEndian">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+       </widget>
       </item>
       <item row="15" column="0" colspan="2">
        <widget class="QTextEdit" name="logOutput">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
         <property name="minimumSize">
          <size>
           <width>0</width>
@@ -216,16 +254,6 @@
     </item>
    </layout>
   </widget>
-  <widget class="QMenuBar" name="menubar">
-   <property name="geometry">
-    <rect>
-     <x>0</x>
-     <y>0</y>
-     <width>504</width>
-     <height>19</height>
-    </rect>
-   </property>
-  </widget>
   <widget class="QStatusBar" name="statusbar"/>
  </widget>
  <resources/>
diff --git a/examples/webkit/fancybrowser/main.cpp b/examples/webkit/fancybrowser/main.cpp
index 7f3c983..7ca862d 100644
--- a/examples/webkit/fancybrowser/main.cpp
+++ b/examples/webkit/fancybrowser/main.cpp
@@ -45,7 +45,7 @@
 int main(int argc, char * argv[])
 {
     QApplication app(argc, argv);
-    MainWindow *browser = new MainWindow;
-    browser->show();
+    MainWindow browser;
+    browser.show();
     return app.exec();
 }
diff --git a/examples/webkit/googlechat/main.cpp b/examples/webkit/googlechat/main.cpp
index 6b5e11f..ca94131 100644
--- a/examples/webkit/googlechat/main.cpp
+++ b/examples/webkit/googlechat/main.cpp
@@ -49,7 +49,7 @@ int main(int argc, char * argv[])
 
     QNetworkProxyFactory::setUseSystemConfiguration(true);
 
-    GoogleChat *chat = new GoogleChat;
-    chat->show();
+    GoogleChat chat;
+    chat.show();
     return app.exec();
 }
diff --git a/examples/webkit/previewer/main.cpp b/examples/webkit/previewer/main.cpp
index 183b03f..1c80c19 100644
--- a/examples/webkit/previewer/main.cpp
+++ b/examples/webkit/previewer/main.cpp
@@ -46,8 +46,8 @@
 int main(int argc, char * argv[])
 {
     QApplication app(argc, argv);
-    MainWindow *mainWindow = new MainWindow;
-    mainWindow->show();
+    MainWindow mainWindow;
+    mainWindow.show();
     return app.exec();
 }
 //! [0]
diff --git a/mkspecs/hpux-g++-64/qmake.conf b/mkspecs/hpux-g++-64/qmake.conf
index 38595c9..f76bd4e 100644
--- a/mkspecs/hpux-g++-64/qmake.conf
+++ b/mkspecs/hpux-g++-64/qmake.conf
@@ -15,7 +15,7 @@ QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		=
 QMAKE_YACC		= yacc
 QMAKE_YACCFLAGS		= -d
-QMAKE_CFLAGS		= +DA2.0W
+QMAKE_CFLAGS		= 
 QMAKE_CFLAGS_DEPS	= -M
 QMAKE_CFLAGS_WARN_ON	= -Wall -W
 QMAKE_CFLAGS_WARN_OFF	= -w
@@ -51,7 +51,7 @@ QMAKE_LINK		= g++
 QMAKE_LINK_SHLIB	= g++
 QMAKE_LINK_C		= gcc
 QMAKE_LINK_C_SHLIB	= gcc
-QMAKE_LFLAGS		= +DA2.0W -Wl,+s -lpthread
+QMAKE_LFLAGS		= -Wl,+s -lpthread
 QMAKE_LFLAGS_RELEASE	=
 QMAKE_LFLAGS_DEBUG	=
 QMAKE_LFLAGS_SHLIB	= -fPIC -shared
diff --git a/mkspecs/hpux-g++-64/qplatformdefs.h b/mkspecs/hpux-g++-64/qplatformdefs.h
index a8d06d8..ac13799 100644
--- a/mkspecs/hpux-g++-64/qplatformdefs.h
+++ b/mkspecs/hpux-g++-64/qplatformdefs.h
@@ -145,7 +145,7 @@
 #define QT_SIGNAL_ARGS		int
 #define QT_SIGNAL_IGNORE	SIG_IGN
 
-#define QT_SOCKLEN_T		int
+#define QT_SOCKLEN_T		socklen_t
 
 
 #endif // QPLATFORMDEFS_H
diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp
index 7dc456e..593a075 100644
--- a/qmake/generators/win32/msvc_objectmodel.cpp
+++ b/qmake/generators/win32/msvc_objectmodel.cpp
@@ -1394,8 +1394,10 @@ bool VCLinkerTool::parseOption(const char* option)
         case 0x0005bb6: // X86
             TargetMachine = machineX86;
             break;
-        // so we put the others in AdditionalOptions...
         case 0x0005b94: // X64
+            TargetMachine = machineX64;
+            break;
+        // so we put the others in AdditionalOptions...
         case 0x0046063: // AM33
         case 0x000466d: // ARM
         case 0x0004795: // CEE
diff --git a/qmake/generators/win32/msvc_objectmodel.h b/qmake/generators/win32/msvc_objectmodel.h
index d178d30..f7fdf3a 100644
--- a/qmake/generators/win32/msvc_objectmodel.h
+++ b/qmake/generators/win32/msvc_objectmodel.h
@@ -298,7 +298,8 @@ enum linkProgressOption {
 };
 enum machineTypeOption {
     machineNotSet,
-    machineX86
+    machineX86,
+    machineX64 = 17
 };
 enum midlCharOption {
     midlCharUnsigned,
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
index 1bdc3ed..88b7271 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
@@ -3407,9 +3407,9 @@ quint64 QWebPage::bytesReceived() const
 /*!
     \fn void QWebPage::unsupportedContent(QNetworkReply *reply)
 
-    This signals is emitted when webkit cannot handle a link the user navigated to.
+    This signal is emitted when WebKit cannot handle a link the user navigated to.
 
-    At signal emissions time the meta data of the QNetworkReply \a reply is available.
+    At signal emission time the meta-data of the QNetworkReply \a reply is available.
 
     \note This signal is only emitted if the forwardUnsupportedContent property is set to true.
 
diff --git a/src/corelib/io/qtextstream.cpp b/src/corelib/io/qtextstream.cpp
index 594718e..47f340c 100644
--- a/src/corelib/io/qtextstream.cpp
+++ b/src/corelib/io/qtextstream.cpp
@@ -440,7 +440,7 @@ QTextStreamPrivate::QTextStreamPrivate(QTextStream *q_ptr)
     readConverterSavedState(0),
 #endif
     readConverterSavedStateOffset(0),
-    locale(QLocale::C)
+    locale(QLocale::c())
 {
     this->q_ptr = q_ptr;
     reset();
@@ -1806,8 +1806,7 @@ QTextStreamPrivate::NumberParsingStatus QTextStreamPrivate::getNumber(qulonglong
             if (ch.isDigit()) {
                 val *= 10;
                 val += ch.digitValue();
-            } else if (locale.language() != QLocale::C
-                       && ch == locale.groupSeparator()) {
+            } else if (locale != QLocale::c() && ch == locale.groupSeparator()) {
                 continue;
             } else {
                 ungetChar(ch);
@@ -1958,7 +1957,7 @@ bool QTextStreamPrivate::getReal(double *f)
             else if (lc == locale.negativeSign().toLower()
                      || lc == locale.positiveSign().toLower())
                 input = InputSign;
-            else if (locale.language() != QLocale::C // backward-compatibility
+            else if (locale != QLocale::c() // backward-compatibility
                      && lc == locale.groupSeparator().toLower())
                 input = InputDigit; // well, it isn't a digit, but no one cares.
             else
@@ -2283,7 +2282,7 @@ bool QTextStreamPrivate::putNumber(qulonglong number, bool negative)
 
     // add thousands group separators. For backward compatibility we
     // don't add a group separator for C locale.
-    if (locale.language() != QLocale::C)
+    if (locale != QLocale::c())
         flags |= QLocalePrivate::ThousandsGroup;
 
     const QLocalePrivate *dd = locale.d();
diff --git a/src/corelib/kernel/qeventdispatcher_glib.cpp b/src/corelib/kernel/qeventdispatcher_glib.cpp
index 665b73e..16871c3 100644
--- a/src/corelib/kernel/qeventdispatcher_glib.cpp
+++ b/src/corelib/kernel/qeventdispatcher_glib.cpp
@@ -341,6 +341,11 @@ QEventDispatcherGlibPrivate::QEventDispatcherGlibPrivate(GMainContext *context)
     g_source_attach(&idleTimerSource->source, mainContext);
 }
 
+void QEventDispatcherGlibPrivate::runTimersOnceWithNormalPriority()
+{
+    timerSource->runWithIdlePriority = false;
+}
+
 QEventDispatcherGlib::QEventDispatcherGlib(QObject *parent)
     : QAbstractEventDispatcher(*(new QEventDispatcherGlibPrivate), parent)
 {
diff --git a/src/corelib/kernel/qeventdispatcher_glib_p.h b/src/corelib/kernel/qeventdispatcher_glib_p.h
index 6a4e726..57cbf94 100644
--- a/src/corelib/kernel/qeventdispatcher_glib_p.h
+++ b/src/corelib/kernel/qeventdispatcher_glib_p.h
@@ -110,6 +110,8 @@ public:
     GSocketNotifierSource *socketNotifierSource;
     GTimerSource *timerSource;
     GIdleTimerSource *idleTimerSource;
+
+    void runTimersOnceWithNormalPriority();
 };
 
 QT_END_NAMESPACE
diff --git a/src/corelib/thread/qthread_unix.cpp b/src/corelib/thread/qthread_unix.cpp
index 21b5e65..0309c67 100644
--- a/src/corelib/thread/qthread_unix.cpp
+++ b/src/corelib/thread/qthread_unix.cpp
@@ -74,6 +74,10 @@
 #  endif
 #endif
 
+#ifdef Q_OS_HPUX
+#include <sys/pstat.h>
+#endif
+
 #if defined(Q_OS_MAC)
 # ifdef qDebug
 #   define old_qDebug qDebug
diff --git a/src/corelib/tools/qlocale.cpp b/src/corelib/tools/qlocale.cpp
index 4a66b92..8645f17 100644
--- a/src/corelib/tools/qlocale.cpp
+++ b/src/corelib/tools/qlocale.cpp
@@ -1187,14 +1187,14 @@ QVariant QSystemLocale::query(QueryType type, QVariant in = QVariant()) const
     }
     case DateFormatLong:
     case DateFormatShort:
-        return macToQtFormat(getMacDateFormat(type == DateFormatShort
+        return getMacDateFormat(type == DateFormatShort
                                 ? kCFDateFormatterShortStyle
-                                : kCFDateFormatterLongStyle));
+                                : kCFDateFormatterLongStyle);
     case TimeFormatLong:
     case TimeFormatShort:
-        return macToQtFormat(getMacTimeFormat(type == TimeFormatShort
+        return getMacTimeFormat(type == TimeFormatShort
                                 ? kCFDateFormatterShortStyle
-                                : kCFDateFormatterLongStyle));
+                                : kCFDateFormatterLongStyle);
     case DayNameLong:
     case DayNameShort:
         return macDayName(in.toInt(), (type == DayNameShort));
diff --git a/src/dbus/qdbuspendingcall.cpp b/src/dbus/qdbuspendingcall.cpp
index ef50b04..9c768ed 100644
--- a/src/dbus/qdbuspendingcall.cpp
+++ b/src/dbus/qdbuspendingcall.cpp
@@ -310,7 +310,7 @@ QDBusPendingCall &QDBusPendingCall::operator=(const QDBusPendingCall &other)
 
 bool QDBusPendingCall::isFinished() const
 {
-    return d && (d->replyMessage.type() != QDBusMessage::InvalidMessage);
+    return !d || (d->replyMessage.type() != QDBusMessage::InvalidMessage);
 }
 
 void QDBusPendingCall::waitForFinished()
diff --git a/src/dbus/qdbuspendingreply.h b/src/dbus/qdbuspendingreply.h
index b7f54e4..4f90c98 100644
--- a/src/dbus/qdbuspendingreply.h
+++ b/src/dbus/qdbuspendingreply.h
@@ -188,6 +188,7 @@ public:
 private:
     inline void calculateMetaTypes()
     {
+        if (!d) return;
         int typeIds[Count > 0 ? Count : 1]; // use at least one since zero-sized arrays aren't valid
         ForEach::fillMetaTypes(typeIds);
         setMetaTypes(Count, typeIds);
diff --git a/src/gui/dialogs/qfontdialog_mac.mm b/src/gui/dialogs/qfontdialog_mac.mm
index 0c467cd..31bab2b 100644
--- a/src/gui/dialogs/qfontdialog_mac.mm
+++ b/src/gui/dialogs/qfontdialog_mac.mm
@@ -394,7 +394,9 @@ static QFont qfontForCocoaFont(NSFont *cocoaFont, const QFont &resolveFont)
     }
     [mFontPanel setDelegate:nil];
     [[NSFontManager sharedFontManager] setDelegate:nil];
+#ifdef QT_MAC_USE_COCOA
     [[NSFontManager sharedFontManager] setTarget:nil];
+#endif
 }
 @end
 
@@ -518,7 +520,9 @@ void *QFontDialogPrivate::openCocoaFontPanel(const QFont &initial,
                                                    extraHeight:dialogExtraHeight];
     [ourPanel setDelegate:delegate];
     [[NSFontManager sharedFontManager] setDelegate:delegate];
+#ifdef QT_MAC_USE_COCOA
     [[NSFontManager sharedFontManager] setTarget:delegate];
+#endif
     setFont(delegate, initial);
 
     // hack to get correct initial layout
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
index 8c63968..bd13423 100644
--- a/src/gui/kernel/qapplication.cpp
+++ b/src/gui/kernel/qapplication.cpp
@@ -3629,12 +3629,46 @@ bool QApplication::notify(QObject *receiver, QEvent *e)
 
     // walk through parents and check for gestures
     if (qt_gestureManager) {
-        if (receiver->isWidgetType()) {
-            if (qt_gestureManager->filterEvent(static_cast<QWidget *>(receiver), e))
-                return true;
-        } else if (QGesture *gesture = qobject_cast<QGesture *>(receiver)) {
-            if (qt_gestureManager->filterEvent(gesture, e))
-                return true;
+        switch (e->type()) {
+        case QEvent::Paint:
+        case QEvent::MetaCall:
+        case QEvent::DeferredDelete:
+        case QEvent::DragEnter: case QEvent::DragMove: case QEvent::DragLeave:
+        case QEvent::Drop: case QEvent::DragResponse:
+        case QEvent::ChildAdded: case QEvent::ChildPolished:
+#ifdef QT3_SUPPORT
+        case QEvent::ChildInsertedRequest:
+        case QEvent::ChildInserted:
+        case QEvent::LayoutHint:
+#endif
+        case QEvent::ChildRemoved:
+        case QEvent::UpdateRequest:
+        case QEvent::UpdateLater:
+        case QEvent::AccessibilityPrepare:
+        case QEvent::LocaleChange:
+        case QEvent::Style:
+        case QEvent::IconDrag:
+        case QEvent::StyleChange:
+        case QEvent::AccessibilityHelp:
+        case QEvent::AccessibilityDescription:
+        case QEvent::GraphicsSceneDragEnter:
+        case QEvent::GraphicsSceneDragMove:
+        case QEvent::GraphicsSceneDragLeave:
+        case QEvent::GraphicsSceneDrop:
+        case QEvent::DynamicPropertyChange:
+        case QEvent::NetworkReplyUpdated:
+            break;
+        default:
+            if (receiver->isWidgetType()) {
+                if (qt_gestureManager->filterEvent(static_cast<QWidget *>(receiver), e))
+                    return true;
+            } else {
+                // a special case for events that go to QGesture objects.
+                // We pass the object to the gesture manager and it'll figure
+                // out if it's QGesture or not.
+                if (qt_gestureManager->filterEvent(receiver, e))
+                    return true;
+            }
         }
     }
 
diff --git a/src/gui/kernel/qcocoaview_mac.mm b/src/gui/kernel/qcocoaview_mac.mm
index ddd8ca6..6c06746 100644
--- a/src/gui/kernel/qcocoaview_mac.mm
+++ b/src/gui/kernel/qcocoaview_mac.mm
@@ -777,7 +777,7 @@ extern "C" {
     NSPoint windowPoint = [theEvent locationInWindow];
     NSPoint globalPoint = [[theEvent window] convertBaseToScreen:windowPoint];
     NSPoint localPoint = [self convertPoint:windowPoint fromView:nil];
-    QPoint qlocal = QPoint(localPoint.x, flipYCoordinate(localPoint.y));
+    QPoint qlocal = QPoint(localPoint.x, localPoint.y);
     QPoint qglobal = QPoint(globalPoint.x, flipYCoordinate(globalPoint.y));
     Qt::MouseButtons buttons = QApplication::mouseButtons();
     bool wheelOK = false;
diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp
index c4a25e1..eedf0a7 100644
--- a/src/gui/kernel/qevent.cpp
+++ b/src/gui/kernel/qevent.cpp
@@ -409,7 +409,7 @@ QMouseEventEx::~QMouseEventEx()
     consider a top-level window A containing a child B which in turn contains a
     child C (all with mouse tracking enabled):
 
-    \image hoverEvents.png
+    \image hoverevents.png
 
     Now, if you move the cursor from the top to the bottom in the middle of A,
     you will get the following QEvent::MouseMove events:
@@ -432,7 +432,7 @@ QMouseEventEx::~QMouseEventEx()
         \o A::HoverMove, B::HoverMove
         \o A::HoverMove, B::HoverMove, C::HoverMove
     \endlist
-    
+
 */
 
 /*!
@@ -3023,7 +3023,7 @@ QShowEvent::~QShowEvent()
     This event is only used to notify the application of a request.
     It may be safely ignored.
 
-    \note This class is currently supported for Mac Os X only.
+    \note This class is currently supported for Mac OS X only.
 */
 
 /*!
@@ -3066,6 +3066,8 @@ QFileOpenEvent::~QFileOpenEvent()
     \fn QUrl QFileOpenEvent::url() const
 
     Returns the url that is being opened.
+
+    \since 4.6
 */
 QUrl QFileOpenEvent::url() const
 {
diff --git a/src/gui/kernel/qgesturemanager.cpp b/src/gui/kernel/qgesturemanager.cpp
index 192f9ac..d7cbebd 100644
--- a/src/gui/kernel/qgesturemanager.cpp
+++ b/src/gui/kernel/qgesturemanager.cpp
@@ -187,10 +187,8 @@ QGesture *QGestureManager::getState(QObject *object, QGestureRecognizer *recogni
 #endif
     }
 
-    QList<QGesture *> states =
-            m_objectGestures.value(QGestureManager::ObjectGesture(object, type));
     // check if the QGesture for this recognizer has already been created
-    foreach (QGesture *state, states) {
+    foreach (QGesture *state, m_objectGestures.value(QGestureManager::ObjectGesture(object, type))) {
         if (m_gestureToRecognizer.value(state) == recognizer)
             return state;
     }
@@ -215,14 +213,13 @@ QGesture *QGestureManager::getState(QObject *object, QGestureRecognizer *recogni
     return state;
 }
 
-bool QGestureManager::filterEventThroughContexts(const QMultiHash<QObject *,
+bool QGestureManager::filterEventThroughContexts(const QMultiMap<QObject *,
                                                  Qt::GestureType> &contexts,
                                                  QEvent *event)
 {
     QSet<QGesture *> triggeredGestures;
     QSet<QGesture *> finishedGestures;
     QSet<QGesture *> newMaybeGestures;
-    QSet<QGesture *> canceledGestures;
     QSet<QGesture *> notGestures;
 
     // TODO: sort contexts by the gesture type and check if one of the contexts
@@ -231,7 +228,7 @@ bool QGestureManager::filterEventThroughContexts(const QMultiHash<QObject *,
     bool ret = false;
 
     // filter the event through recognizers
-    typedef QHash<QObject *, Qt::GestureType>::const_iterator ContextIterator;
+    typedef QMultiMap<QObject *, Qt::GestureType>::const_iterator ContextIterator;
     for (ContextIterator cit = contexts.begin(), ce = contexts.end(); cit != ce; ++cit) {
         Qt::GestureType gestureType = cit.value();
         QMap<Qt::GestureType, QGestureRecognizer *>::const_iterator
@@ -271,6 +268,9 @@ bool QGestureManager::filterEventThroughContexts(const QMultiHash<QObject *,
             }
         }
     }
+    if (triggeredGestures.isEmpty() && finishedGestures.isEmpty()
+        && newMaybeGestures.isEmpty() && notGestures.isEmpty())
+        return ret;
 
     QSet<QGesture *> startedGestures = triggeredGestures - m_activeGestures;
     triggeredGestures &= m_activeGestures;
@@ -280,8 +280,7 @@ bool QGestureManager::filterEventThroughContexts(const QMultiHash<QObject *,
 
     // check if a running gesture switched back to not gesture state,
     // i.e. were canceled
-    QSet<QGesture *> activeToCancelGestures = m_activeGestures & notGestures;
-    canceledGestures += activeToCancelGestures;
+    QSet<QGesture *> canceledGestures = m_activeGestures & notGestures;
 
     // start timers for new gestures in maybe state
     foreach (QGesture *state, newMaybeGestures) {
@@ -449,14 +448,14 @@ void QGestureManager::cleanupGesturesForRemovedRecognizer(QGesture *gesture)
 // return true if accepted (consumed)
 bool QGestureManager::filterEvent(QWidget *receiver, QEvent *event)
 {
-    QSet<Qt::GestureType> types;
-    QMultiHash<QObject *, Qt::GestureType> contexts;
+    QMap<Qt::GestureType, int> types;
+    QMultiMap<QObject *, Qt::GestureType> contexts;
     QWidget *w = receiver;
     typedef QMap<Qt::GestureType, Qt::GestureFlags>::const_iterator ContextIterator;
     if (!w->d_func()->gestureContext.isEmpty()) {
         for(ContextIterator it = w->d_func()->gestureContext.begin(),
             e = w->d_func()->gestureContext.end(); it != e; ++it) {
-            types.insert(it.key());
+            types.insert(it.key(), 0);
             contexts.insertMulti(w, it.key());
         }
     }
@@ -468,7 +467,7 @@ bool QGestureManager::filterEvent(QWidget *receiver, QEvent *event)
              e = w->d_func()->gestureContext.end(); it != e; ++it) {
             if (!(it.value() & Qt::DontStartGestureOnChildren)) {
                 if (!types.contains(it.key())) {
-                    types.insert(it.key());
+                    types.insert(it.key(), 0);
                     contexts.insertMulti(w, it.key());
                 }
             }
@@ -477,20 +476,20 @@ bool QGestureManager::filterEvent(QWidget *receiver, QEvent *event)
             break;
         w = w->parentWidget();
     }
-    return filterEventThroughContexts(contexts, event);
+    return contexts.isEmpty() ? false : filterEventThroughContexts(contexts, event);
 }
 
 #ifndef QT_NO_GRAPHICSVIEW
 bool QGestureManager::filterEvent(QGraphicsObject *receiver, QEvent *event)
 {
-    QSet<Qt::GestureType> types;
-    QMultiHash<QObject *, Qt::GestureType> contexts;
+    QMap<Qt::GestureType, int> types;
+    QMultiMap<QObject *, Qt::GestureType> contexts;
     QGraphicsObject *item = receiver;
     if (!item->QGraphicsItem::d_func()->gestureContext.isEmpty()) {
         typedef QMap<Qt::GestureType, Qt::GestureFlags>::const_iterator ContextIterator;
         for(ContextIterator it = item->QGraphicsItem::d_func()->gestureContext.begin(),
             e = item->QGraphicsItem::d_func()->gestureContext.end(); it != e; ++it) {
-            types.insert(it.key());
+            types.insert(it.key(), 0);
             contexts.insertMulti(item, it.key());
         }
     }
@@ -503,20 +502,23 @@ bool QGestureManager::filterEvent(QGraphicsObject *receiver, QEvent *event)
              e = item->QGraphicsItem::d_func()->gestureContext.end(); it != e; ++it) {
             if (!(it.value() & Qt::DontStartGestureOnChildren)) {
                 if (!types.contains(it.key())) {
-                    types.insert(it.key());
+                    types.insert(it.key(), 0);
                     contexts.insertMulti(item, it.key());
                 }
             }
         }
         item = item->parentObject();
     }
-    return filterEventThroughContexts(contexts, event);
+    return contexts.isEmpty() ? false : filterEventThroughContexts(contexts, event);
 }
 #endif
 
-bool QGestureManager::filterEvent(QGesture *state, QEvent *event)
+bool QGestureManager::filterEvent(QObject *receiver, QEvent *event)
 {
-    QMultiHash<QObject *, Qt::GestureType> contexts;
+    if (!m_gestureToRecognizer.contains(static_cast<QGesture *>(receiver)))
+        return false;
+    QGesture *state = static_cast<QGesture *>(receiver);
+    QMultiMap<QObject *, Qt::GestureType> contexts;
     contexts.insert(state, state->gestureType());
     return filterEventThroughContexts(contexts, event);
 }
diff --git a/src/gui/kernel/qgesturemanager_p.h b/src/gui/kernel/qgesturemanager_p.h
index 4efa10b..5329d1d 100644
--- a/src/gui/kernel/qgesturemanager_p.h
+++ b/src/gui/kernel/qgesturemanager_p.h
@@ -73,7 +73,7 @@ public:
     void unregisterGestureRecognizer(Qt::GestureType type);
 
     bool filterEvent(QWidget *receiver, QEvent *event);
-    bool filterEvent(QGesture *receiver, QEvent *event);
+    bool filterEvent(QObject *receiver, QEvent *event);
 #ifndef QT_NO_GRAPHICSVIEW
     bool filterEvent(QGraphicsObject *receiver, QEvent *event);
 #endif //QT_NO_GRAPHICSVIEW
@@ -86,7 +86,7 @@ public:
 
 protected:
     void timerEvent(QTimerEvent *event);
-    bool filterEventThroughContexts(const QMultiHash<QObject *, Qt::GestureType> &contexts,
+    bool filterEventThroughContexts(const QMultiMap<QObject *, Qt::GestureType> &contexts,
                                     QEvent *event);
 
 private:
diff --git a/src/gui/kernel/qguieventdispatcher_glib.cpp b/src/gui/kernel/qguieventdispatcher_glib.cpp
index f8a638c..a252499 100644
--- a/src/gui/kernel/qguieventdispatcher_glib.cpp
+++ b/src/gui/kernel/qguieventdispatcher_glib.cpp
@@ -152,6 +152,8 @@ static gboolean x11EventSourceDispatch(GSource *s, GSourceFunc callback, gpointe
 
  out:
 
+    source->d->runTimersOnceWithNormalPriority();
+
     if (callback)
         callback(user_data);
     return true;
diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp
index 7e93aa0..e9c7b89 100644
--- a/src/gui/text/qfontdatabase.cpp
+++ b/src/gui/text/qfontdatabase.cpp
@@ -1482,13 +1482,13 @@ QString QFontDatabase::styleString(const QFontInfo &fontInfo)
     and style will look attractive.
 
     If the font family is available from two or more foundries the
-    foundry name is included in the family name, e.g. "Helvetica
-    [Adobe]" and "Helvetica [Cronyx]". When you specify a family you
-    can either use the old hyphenated Qt 2.x "foundry-family" format,
-    e.g. "Cronyx-Helvetica", or the new bracketed Qt 3.x "family
-    [foundry]" format e.g. "Helvetica [Cronyx]". If the family has a
-    foundry it is always returned, e.g. by families(), using the
-    bracketed format.
+    foundry name is included in the family name; for example:
+    "Helvetica [Adobe]" and "Helvetica [Cronyx]". When you specify a
+    family, you can either use the old hyphenated "foundry-family"
+    format or the bracketed "family [foundry]" format; for example:
+    "Cronyx-Helvetica" or "Helvetica [Cronyx]". If the family has a
+    foundry it is always returned using the bracketed format, as is
+    the case with the value returned by families().
 
     The font() function returns a QFont given a family, style and
     point size.
diff --git a/src/gui/util/qsystemtrayicon_win.cpp b/src/gui/util/qsystemtrayicon_win.cpp
index 362be5b..474555b 100644
--- a/src/gui/util/qsystemtrayicon_win.cpp
+++ b/src/gui/util/qsystemtrayicon_win.cpp
@@ -83,7 +83,11 @@ struct Q_NOTIFYICONIDENTIFIER {
     GUID guidItem;
 };
 
+#define Q_MSGFLT_ALLOW 1
+
 typedef HRESULT (WINAPI *PtrShell_NotifyIconGetRect)(const Q_NOTIFYICONIDENTIFIER* identifier, RECT* iconLocation);
+typedef BOOL (WINAPI *PtrChangeWindowMessageFilter)(UINT message, DWORD dwFlag);
+typedef BOOL (WINAPI *PtrChangeWindowMessageFilterEx)(HWND hWnd, UINT message, DWORD action, void* pChangeFilterStruct);
 
 class QSystemTrayIconSys : QWidget
 {
@@ -143,6 +147,23 @@ QSystemTrayIconSys::QSystemTrayIconSys(QSystemTrayIcon *object)
     if (!MYWM_TASKBARCREATED) {
         MYWM_TASKBARCREATED = RegisterWindowMessage(L"TaskbarCreated");
     }
+
+    // Allow the WM_TASKBARCREATED message through the UIPI filter on Windows Vista and higher
+    static PtrChangeWindowMessageFilterEx pChangeWindowMessageFilterEx =
+        (PtrChangeWindowMessageFilterEx)QLibrary::resolve(QLatin1String("user32"), "ChangeWindowMessageFilterEx");
+
+    if (pChangeWindowMessageFilterEx) {
+        // Call the safer ChangeWindowMessageFilterEx API if available
+        pChangeWindowMessageFilterEx(winId(), MYWM_TASKBARCREATED, Q_MSGFLT_ALLOW, 0);
+    } else {
+        static PtrChangeWindowMessageFilter pChangeWindowMessageFilter =
+            (PtrChangeWindowMessageFilter)QLibrary::resolve(QLatin1String("user32"), "ChangeWindowMessageFilter");
+
+        if (pChangeWindowMessageFilter) {
+            // Call the deprecated ChangeWindowMessageFilter API otherwise
+            pChangeWindowMessageFilter(MYWM_TASKBARCREATED, Q_MSGFLT_ALLOW);
+        }
+    }
 }
 
 QSystemTrayIconSys::~QSystemTrayIconSys()
diff --git a/src/gui/widgets/qlineedit.h b/src/gui/widgets/qlineedit.h
index 594e488..3f159f6 100644
--- a/src/gui/widgets/qlineedit.h
+++ b/src/gui/widgets/qlineedit.h
@@ -288,6 +288,7 @@ private:
 #ifdef QT_KEYPAD_NAVIGATION
     Q_PRIVATE_SLOT(d_func(), void _q_editFocusChange(bool))
 #endif
+    Q_PRIVATE_SLOT(d_func(), void _q_selectionChanged())
 };
 
 #endif // QT_NO_LINEEDIT
diff --git a/src/gui/widgets/qlineedit_p.cpp b/src/gui/widgets/qlineedit_p.cpp
index 4122bc4..c18ca25 100644
--- a/src/gui/widgets/qlineedit_p.cpp
+++ b/src/gui/widgets/qlineedit_p.cpp
@@ -126,6 +126,21 @@ void QLineEditPrivate::_q_editFocusChange(bool e)
 }
 #endif
 
+void QLineEditPrivate::_q_selectionChanged()
+{
+    Q_Q(QLineEdit);
+    if (control->preeditAreaText().isEmpty()) {
+        QStyleOptionFrameV2 opt;
+        q->initStyleOption(&opt);
+        bool showCursor = control->hasSelectedText() ?
+                          q->style()->styleHint(QStyle::SH_BlinkCursorWhenTextSelected, &opt, q):
+                          true;
+        setCursorVisible(showCursor);
+    }
+
+    emit q->selectionChanged();
+}
+
 void QLineEditPrivate::init(const QString& txt)
 {
     Q_Q(QLineEdit);
@@ -138,7 +153,7 @@ void QLineEditPrivate::init(const QString& txt)
     QObject::connect(control, SIGNAL(cursorPositionChanged(int,int)),
             q, SLOT(_q_cursorPositionChanged(int,int)));
     QObject::connect(control, SIGNAL(selectionChanged()),
-            q, SIGNAL(selectionChanged()));
+            q, SLOT(_q_selectionChanged()));
     QObject::connect(control, SIGNAL(accepted()),
             q, SIGNAL(returnPressed()));
     QObject::connect(control, SIGNAL(editingFinished()),
diff --git a/src/gui/widgets/qlineedit_p.h b/src/gui/widgets/qlineedit_p.h
index dc648e8..f13dce2 100644
--- a/src/gui/widgets/qlineedit_p.h
+++ b/src/gui/widgets/qlineedit_p.h
@@ -128,7 +128,7 @@ public:
 #ifdef QT_KEYPAD_NAVIGATION
     void _q_editFocusChange(bool);
 #endif
-
+    void _q_selectionChanged();
 #ifndef QT_NO_COMPLETER
     void _q_completionHighlighted(QString);
 #endif
diff --git a/src/gui/widgets/qmainwindowlayout_mac.mm b/src/gui/widgets/qmainwindowlayout_mac.mm
index 8d8ffa7..6d50678 100644
--- a/src/gui/widgets/qmainwindowlayout_mac.mm
+++ b/src/gui/widgets/qmainwindowlayout_mac.mm
@@ -463,9 +463,6 @@ void QMainWindowLayout::removeFromMacToolbar(QToolBar *toolbar)
             NSToolbarItem *item = static_cast<NSToolbarItem *>(it.key());
             [[qt_mac_window_for(layoutState.mainWindow->window()) toolbar]
                 removeItemAtIndex:toolbarItemsCopy.indexOf(item)];
-            // In Carbon this hash and list gets emptied via events. In Cocoa, we have to do it ourselves here.
-            it = unifiedToolbarHash.erase(it);
-            qtoolbarsInUnifiedToolbarList.removeAll(toolbar);
 #endif
             break;
         }
diff --git a/src/network/access/qnetworkreplyimpl.cpp b/src/network/access/qnetworkreplyimpl.cpp
index c20812e..1667c10 100644
--- a/src/network/access/qnetworkreplyimpl.cpp
+++ b/src/network/access/qnetworkreplyimpl.cpp
@@ -273,7 +273,7 @@ void QNetworkReplyImplPrivate::handleNotifications()
     if (state != Working)
         return;
 
-    while (!current.isEmpty()) {
+    while (state == Working && !current.isEmpty()) {
         InternalNotifications notification = current.dequeue();
         switch (notification) {
         case NotifyDownstreamReadyWrite:
@@ -580,7 +580,7 @@ QNetworkReplyImpl::~QNetworkReplyImpl()
 void QNetworkReplyImpl::abort()
 {
     Q_D(QNetworkReplyImpl);
-    if (d->state == QNetworkReplyImplPrivate::Aborted)
+    if (d->state == QNetworkReplyImplPrivate::Finished || d->state == QNetworkReplyImplPrivate::Aborted)
         return;
 
     // stop both upload and download
diff --git a/tests/auto/qdbuspendingreply/tst_qdbuspendingreply.cpp b/tests/auto/qdbuspendingreply/tst_qdbuspendingreply.cpp
index 6398d9c..82e6389 100644
--- a/tests/auto/qdbuspendingreply/tst_qdbuspendingreply.cpp
+++ b/tests/auto/qdbuspendingreply/tst_qdbuspendingreply.cpp
@@ -93,6 +93,7 @@ private slots:
     }
 
     void init();
+    void unconnected();
     void simpleTypes();
     void complexTypes();
     void wrongTypes();
@@ -252,6 +253,30 @@ void tst_QDBusPendingReply::init()
     QVERIFY(iface->isValid());
 }
 
+void tst_QDBusPendingReply::unconnected()
+{
+    QDBusConnection con("invalid stored connection");
+    QVERIFY(!con.isConnected());
+    QDBusInterface iface("doesnt.matter", "/", "doesnt.matter", con);
+    QVERIFY(!iface.isValid());
+
+    QDBusPendingReply<> rvoid = iface.asyncCall("ReloadConfig");
+    QVERIFY(rvoid.isFinished());
+    QVERIFY(!rvoid.isValid());
+    QVERIFY(rvoid.isError());
+    rvoid.waitForFinished();
+    QVERIFY(!rvoid.isValid());
+    QVERIFY(rvoid.isError());
+
+    QDBusPendingReply<QString> rstring = iface.asyncCall("GetId");
+    QVERIFY(rstring.isFinished());
+    QVERIFY(!rstring.isValid());
+    QVERIFY(rstring.isError());
+    rstring.waitForFinished();
+    QVERIFY(!rstring.isValid());
+    QVERIFY(rstring.isError());
+}
+
 void tst_QDBusPendingReply::simpleTypes()
 {
     QDBusPendingReply<> rvoid = iface->asyncCall("retrieveVoid");
diff --git a/tests/auto/qdbusreply/tst_qdbusreply.cpp b/tests/auto/qdbusreply/tst_qdbusreply.cpp
index 9866302..e36d288 100644
--- a/tests/auto/qdbusreply/tst_qdbusreply.cpp
+++ b/tests/auto/qdbusreply/tst_qdbusreply.cpp
@@ -93,6 +93,7 @@ private slots:
     }
 
     void init();
+    void unconnected();
     void simpleTypes();
     void complexTypes();
     void wrongTypes();
@@ -236,6 +237,21 @@ void tst_QDBusReply::init()
     QVERIFY(iface->isValid());
 }
 
+void tst_QDBusReply::unconnected()
+{
+    QDBusConnection con("invalid stored connection");
+    QVERIFY(!con.isConnected());
+    QDBusInterface iface("doesnt.matter", "/", "doesnt.matter", con);
+    QVERIFY(!iface.isValid());
+
+    QDBusReply<void> rvoid = iface.asyncCall("ReloadConfig");
+    QVERIFY(!rvoid.isValid());
+
+    QDBusReply<QString> rstring = iface.asyncCall("GetId");
+    QVERIFY(!rstring.isValid());
+    QVERIFY(rstring.value().isEmpty());
+}
+
 void tst_QDBusReply::simpleTypes()
 {
     QDBusReply<bool> rbool = iface->call(QDBus::BlockWithGui, "retrieveBool");
diff --git a/tests/auto/selftests/tst_selftests.cpp b/tests/auto/selftests/tst_selftests.cpp
index 579f4eb..ed3b08e 100644
--- a/tests/auto/selftests/tst_selftests.cpp
+++ b/tests/auto/selftests/tst_selftests.cpp
@@ -182,12 +182,12 @@ void tst_Selftests::runSubTest_data()
 #endif
     QTest::newRow("benchlibeventcounter") << "benchlibeventcounter" << QStringList("-eventcounter");
     QTest::newRow("benchliboptions") << "benchliboptions" << QStringList("-eventcounter");
-    QTest::newRow("benchlibwalltime") << "benchlibwalltime" << QStringList();
 
-    //### This test is affected by the speed of the CPU and whether the tick counter is
-    //### monotonically increasing. It won't work on some machines so leave it off by default.
+    //### These tests are affected by timing and whether the CPU tick counter is
+    //### monotonically increasing. They won't work on some machines so leave them off by default.
     //### Feel free to uncomment for your own testing.
 #if 0
+    QTest::newRow("benchlibwalltime") << "benchlibwalltime" << QStringList();
     QTest::newRow("benchlibtickcounter") << "benchlibtickcounter" << QStringList("-tickcounter");
 #endif
 
diff --git a/tools/qdoc3/generator.cpp b/tools/qdoc3/generator.cpp
index 9389268..56fca06 100644
--- a/tools/qdoc3/generator.cpp
+++ b/tools/qdoc3/generator.cpp
@@ -65,6 +65,8 @@ QMap<QString, QStringList> Generator::imgFileExts;
 QSet<QString> Generator::outputFormats;
 QStringList Generator::imageFiles;
 QStringList Generator::imageDirs;
+QStringList Generator::exampleDirs;
+QStringList Generator::exampleImgExts;
 QString Generator::outDir;
 QString Generator::project;
 
@@ -120,12 +122,19 @@ void Generator::initialize(const Config &config)
         if (!dirInfo.mkdir(outDir + "/images"))
             config.lastLocation().fatal(tr("Cannot create output directory '%1'")
                                         .arg(outDir + "/images"));
+        if (!dirInfo.mkdir(outDir + "/images/used-in-examples"))
+            config.lastLocation().fatal(tr("Cannot create output directory '%1'")
+                                        .arg(outDir + "/images/used-in-examples"));
     }
 
     imageFiles = config.getStringList(CONFIG_IMAGES);
     imageDirs = config.getStringList(CONFIG_IMAGEDIRS);
+    exampleDirs = config.getStringList(CONFIG_EXAMPLEDIRS);
+    exampleImgExts = config.getStringList(CONFIG_EXAMPLES + Config::dot +
+                                          CONFIG_IMAGEEXTENSIONS);
 
-    QString imagesDotFileExtensions = CONFIG_IMAGES + Config::dot + CONFIG_FILEEXTENSIONS;
+    QString imagesDotFileExtensions =
+        CONFIG_IMAGES + Config::dot + CONFIG_FILEEXTENSIONS;
     QSet<QString> formats = config.subVars(imagesDotFileExtensions);
     QSet<QString>::ConstIterator f = formats.begin();
     while (f != formats.end()) {
@@ -323,7 +332,7 @@ void Generator::generateBody(const Node *node, CodeMarker *marker)
         const FakeNode *fake = static_cast<const FakeNode *>(node);
         if (fake->subType() == Node::Example)
             generateExampleFiles(fake, marker);
-        else if (fake->subType() == Node::File)
+        else if ((fake->subType() == Node::File) || (fake->subType() == Node::Image))
             quiet = true;
     }
 
@@ -530,6 +539,13 @@ void Generator::generateInheritedBy(const ClassNode *classe,
     }
 }
 
+/*!
+  This function is called when the documentation for an
+  example is being formatted. It outputs the list of source
+  files comprising the example, and the list of images used
+  by the example. The images are copied into a subtree of
+  \c{...doc/html/images/used-in-examples/...} 
+ */
 void Generator::generateFileList(const FakeNode* fake,
                                  CodeMarker* marker,
                                  Node::SubType subtype,
@@ -546,9 +562,30 @@ void Generator::generateFileList(const FakeNode* fake,
         if (child->subType() == subtype) {
             ++count;
             QString file = child->name();
+            if (subtype == Node::Image) {
+                if (!file.isEmpty()) {
+                    QDir dirInfo;
+                    QString userFriendlyFilePath;
+                    QString srcPath = Config::findFile(fake->location(),
+                                                       QStringList(),
+                                                       exampleDirs,
+                                                       file,
+                                                       exampleImgExts,
+                                                       userFriendlyFilePath);
+                    userFriendlyFilePath.truncate(userFriendlyFilePath.lastIndexOf('/'));
+
+                    QString imgOutDir = outDir + "/images/used-in-examples/" + userFriendlyFilePath;
+                    if (!dirInfo.mkpath(imgOutDir))
+                        fake->location().fatal(tr("Cannot create output directory '%1'")
+                                               .arg(imgOutDir));
+
+                    QString imgOutName = Config::copyFile(fake->location(),
+                                                          srcPath,
+                                                          file,
+                                                          imgOutDir);
+                }
 
-            if (file == "network/qftp/images/dir.png")
-                qDebug() << "FILE:" << file;
+            }
 
             openedList.next();
             text << Atom(Atom::ListItemNumber, openedList.numberString())
diff --git a/tools/qdoc3/generator.h b/tools/qdoc3/generator.h
index 7667789..cc1ea25 100644
--- a/tools/qdoc3/generator.h
+++ b/tools/qdoc3/generator.h
@@ -183,6 +183,8 @@ class Generator
     static QSet<QString> outputFormats;
     static QStringList imageFiles;
     static QStringList imageDirs;
+    static QStringList exampleDirs;
+    static QStringList exampleImgExts;
     static QString outDir;
     static QString project;
 };
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index 8711c6b..ae7bd81 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -3429,6 +3429,8 @@ QString HtmlGenerator::fileName(const Node *node)
     if (node->type() == Node::Fake) {
         if (static_cast<const FakeNode *>(node)->subType() == Node::ExternalPage)
             return node->name();
+        if (static_cast<const FakeNode *>(node)->subType() == Node::Image)
+            return node->name();
     }
     return PageGenerator::fileName(node);
 }
@@ -4000,6 +4002,8 @@ QString HtmlGenerator::getLink(const Atom *atom,
 
         if (path.isEmpty()) {
             link = linkForNode(*node, relative);
+            if (*node && (*node)->subType() == Node::Image)
+                link = "images/used-in-examples/" + link;
             if (targetAtom)
                 link += "#" + refForAtom(targetAtom, *node);
         }