Merge commit 'origin/4.5'

31 files changed, 303 insertions, 96 deletions

diff --git a/demos/qtdemo/colors.cpp b/demos/qtdemo/colors.cpp
index 733b285..b82de2f 100644
--- a/demos/qtdemo/colors.cpp
+++ b/demos/qtdemo/colors.cpp
@@ -95,7 +95,7 @@ bool Colors::noTickerMorph = false;
 bool Colors::adapted = false;
 bool Colors::verbose = false;
 bool Colors::pause = true;
-int Colors::fps = 100;
+int Colors::fps = 60;
 int Colors::menuCount = 18;
 float Colors::animSpeed = 1.0;
 float Colors::animSpeedButtons = 1.0;
diff --git a/demos/qtdemo/mainwindow.cpp b/demos/qtdemo/mainwindow.cpp
index 0da69b2..858d389 100644
--- a/demos/qtdemo/mainwindow.cpp
+++ b/demos/qtdemo/mainwindow.cpp
@@ -185,7 +185,6 @@ void MainWindow::switchTimerOnOff(bool on)
 
     if (on && !Colors::noTimerUpdate){
         this->useTimer = true;
-        this->setViewportUpdateMode(QGraphicsView::NoViewportUpdate);
         this->fpsTime = QTime::currentTime();
         this->updateTimer.start(int(1000 / Colors::fps));
     }
@@ -257,10 +256,6 @@ void MainWindow::tick()
     if (MenuManager::instance()->ticker)
         MenuManager::instance()->ticker->tick();
 
-    this->viewport()->update();
-    if (Colors::softwareRendering)
-        QApplication::syncX();
-
     if (this->useTimer)
         this->updateTimer.start(int(1000 / Colors::fps));
 }
@@ -428,9 +423,7 @@ void MainWindow::focusInEvent(QFocusEvent *)
     if (MenuManager::instance()->ticker)
         MenuManager::instance()->ticker->pause(false);
 
-    int code = MenuManager::instance()->currentMenuCode;
-    if (code == MenuManager::ROOT || code == MenuManager::MENU1)
-        this->switchTimerOnOff(true);
+    this->switchTimerOnOff(true);
 
     this->pausedLabel->setRecursiveVisible(false);
 }
@@ -443,9 +436,7 @@ void MainWindow::focusOutEvent(QFocusEvent *)
     if (MenuManager::instance()->ticker)
         MenuManager::instance()->ticker->pause(true);
 
-    int code = MenuManager::instance()->currentMenuCode;
-    if (code == MenuManager::ROOT || code == MenuManager::MENU1)
-        this->switchTimerOnOff(false);
+    this->switchTimerOnOff(false);
 
     this->pausedLabel->setRecursiveVisible(true);
 }
diff --git a/dist/changes-4.5.2 b/dist/changes-4.5.2
index c87ad92..04a29ba 100644
--- a/dist/changes-4.5.2
+++ b/dist/changes-4.5.2
@@ -46,16 +46,40 @@ Third party components
        Plugins (r41346, r43550, r43915, r43917, r43923)
        Clipboard (r41360)
 
+- QtDBus
+   * [236955] Fixed an issue that would cause QtDBus to crash when
+     relaying a signal emitted from a class under certain conditions
+
+- QAbstractItemView
+    * [250754] Changing the font of the view would not update the size of the
+      items if there is an application stylesheet.
+    * [252532] Pressing enter in a QPlainTextEdit embedded on a itemview now
+      insert a newline
+
 - QAbstractNetworkCache
    * Only cache responses to HTTP GET by default, not HTTP PUT or POST
 
+- QComboBox
+   * [253944] Changing the style doesn't reset custom item delegate anymore.
+   * [254589] Fixed the frame appearing if setting a stylesheet with a border
+     on the embedded itemview while there is a stylesheet on the application
+
+- QDir
+   * Fix reentrency (listing directories in different threads)
+
 - QMacStyle
     * [253339] Don't draw arrows on toolbuttons that have a menu and text only.
     * [252301] Ensure that small and mini spin boxes are drawn correctly.
 
+- QMotifStyle
+    * Fix crash when changing style and destroying progressbar.
+
 - QFontDialog
     * [252000] Ensure that QFontDialog::getFont() works on Mac OS X.
 
+- QLocalSocket
+   * [247144] correctly handle remote disconnects
+
 - QNetworkCookie
    * [251959] fix parsing of multiple cookies separated by a newline
 
@@ -63,11 +87,19 @@ Third party components
    * [251467] do not allow cookies for domains like ".com"
    * [228974] allow cookies whose domain attribute is missing a leading dot
 
+- QNetworkAccessManager
+   * [248838] Make QNetworkAccessManager reject invalid HTTP input
+     earlier
+
 - QWidget
     * [250668] Don't send extra wheel events when using the scroll wheel in Cocoa.
     * [253448] Prevent a crash when using the Qt::WA_MacBrushedMetal attribute
       in conjunction with style sheets.
 
+- QObject
+    * Fixed possible race condition if two QObject connected together with
+      signals and slot are destroyed in different threads
+
 - QPainter
     * [253783] Fixed text shaping bugs when using ligatures and different
       scripts in a single text item.
@@ -78,16 +110,54 @@ Third party components
     * [251534] Fixed issue where text with non-opaque color from widget
       palette would be blitted instead of blended.
 
+- QSelectionModel
+   * [252069] fix QSelectionModel::rowIntersectsSelection or QSelectionModel::columnsIntersectsSelection not reporting right result if some items are disabled.
+
+- QSortFilterProxyModel
+    * [250023]  Fixes QSortFilterProxyModel not reporting child if the model
+      need to fetchMore
+    * [251296] In dynamic filter model, childs of temporarly filtered items
+      where not correctly updated.
+    * [252507] Show a warning instead of crashing if invalid indexes are passed.
+    * [254234] Fixed setDynamicSortFilter not working when setting the model initially
+
+- QString
+    * Fixed reentrency of QString::squeeze()
+
 - QTransform
     * Fixed issue in QTransform::type() causing a projective transform to be
     treated as a scaling transform.
 
+- QVector
+    * Fixed reentrency of QVector::reserve()
+
 - QtOpenGL
     * [247083] Re-enabled antialiasing for large font sizes in OpenGL paint
       engine.
     * [251485] Fixed crash that could occur with projective transforms and
       high quality antialiasing.
 
+- QCssParser
+    * [252311] "font-family:" now handle fallback font specified with a comas
+      separated list.
+
+- QFile and QTemporaryFile
+    * Fixed a leak of file descriptors in QTemporaryFile::rename, introduced in 4.5.1
+    * [165920] QFile::copy leaves the source file open after the file has been copied
+    * [191467] & [252293] QFile::copy of resource files to the filesystem fails on Windows
+    * [197857] QFile::copy of resource files leaves temporary files on filesystem
+    * [248223] QTemporaryFile: Access denied error when (re-)opening through QFile interface
+    * [252659] QTemporaryFile::rename may leave source file behind
+
+- QByteArrayMatcher
+    * [251958] Assignment operator and copy constructor miss data
+
+- QCompleter
+    * [253125] QCompleter doesn't expand entries with UnfilteredPopupCompletion
+
+- QPrintDialog
+    * [253135] Crash in QPrintDialog when editing output filename
+
 ****************************************************************************
 *                          Database Drivers                                *
 ****************************************************************************
@@ -107,6 +177,7 @@ legacy freetype headers.
 [250326] Titlebar wasn't shown on X11 with Qt::CustomizeWindowHint for
 	 fixed-size windows.
 [251925] Improved showing QMessageBox on small screens.
+[252042] Fixed the loading of the OpenSSL libraries on OpenBSD.
 
 Qt for Windows
 --------------
@@ -128,6 +199,7 @@ Qt for Embedded Linux
 
 Qt for Windows CE
 -----------------
+[248846] handle the back soft key on Windows mobile.
 
 
 ****************************************************************************
@@ -140,6 +212,7 @@ Qt for Windows CE
 ****************************************************************************
 
 - Build System
+    * [253053] Linker in macx-g++42 spec is gcc instead of gcc-4.2
 
 - Assistant
 
diff --git a/doc/src/tutorials/addressbook.qdoc b/doc/src/tutorials/addressbook.qdoc
index 38200b0..e2f12f4 100644
--- a/doc/src/tutorials/addressbook.qdoc
+++ b/doc/src/tutorials/addressbook.qdoc
@@ -299,14 +299,14 @@
 
     We also declare two private QString objects, \c oldName and \c oldAddress.
     These objects are needed to hold the name and address of the contact that
-    was last displayed, before the user clicked "Add". So, when the user clicks
-    "Cancel", we can revert to displaying the details of the last contact.
+    was last displayed, before the user clicked \gui Add. So, when the user clicks
+    \gui Cancel, we can revert to displaying the details of the last contact.
 
     \section1 Implementing the AddressBook Class
 
     Within the constructor of \c AddressBook, we set the \c nameLine and
     \c addressText to read-only, so that we can only display but not edit
-    existing cotact details.
+    existing contact details.
 
     \dots
     \snippet tutorials/addressbook/part2/addressbook.cpp setting readonly 1
@@ -321,7 +321,7 @@
     The \c addButton is displayed by invoking the \l{QPushButton::show()}
     {show()} function, while the \c submitButton and \c cancelButton are
     hidden by invoking \l{QPushButton::hide()}{hide()}. These two push
-    buttons will only be displayed when the user clicks "Add" and this is
+    buttons will only be displayed when the user clicks \gui Add and this is
     handled by the \c addContact() function discussed below.
 
     \snippet tutorials/addressbook/part2/addressbook.cpp connecting signals and slots
@@ -365,7 +365,7 @@
     \list 1
     \o We extract the contact's details from \c nameLine and \c addressText
     and store them in QString objects. We also validate to make sure that the
-    user did not click "Submit" with empty input fields; otherwise, a
+    user did not click \gui Submit with empty input fields; otherwise, a
     QMessageBox is displayed to remind the user for a name and address.
 
     \snippet tutorials/addressbook/part2/addressbook.cpp submitContact part1
@@ -377,8 +377,8 @@
     \snippet tutorials/addressbook/part2/addressbook.cpp submitContact part2
 
     If the contact already exists, again, we display a QMessageBox to inform
-    the user about this, to prevent the user from adding duplicate contacts.
-    Our \c contacts object is based on key-value pairs of name and addresses,
+    the user about this, preventing the user from adding duplicate contacts.
+    Our \c contacts object is based on key-value pairs of name and address,
     hence, we want to ensure that \e key is unique.
 
     \o Once we have handled both cases mentioned above, we restore the push
@@ -399,9 +399,9 @@
 
     \snippet tutorials/addressbook/part2/addressbook.cpp cancel
 
-    The general idea to add a contact is to give the user the flexibility to
-    click "Submit" or "Cancel" at any time. The flowchart below further
-    explains this concept:
+    The general idea behind adding a contact is to give the user the
+    flexibility to click \gui Submit or \gui Cancel at any time. The flowchart below
+    further explains this concept:
 
     \image addressbook-tutorial-part2-add-flowchart.png
 */
diff --git a/examples/network/http/httpwindow.cpp b/examples/network/http/httpwindow.cpp
index ebde770..7aded07 100644
--- a/examples/network/http/httpwindow.cpp
+++ b/examples/network/http/httpwindow.cpp
@@ -116,8 +116,8 @@ void HttpWindow::downloadFile()
         if (QMessageBox::question(this, tr("HTTP"), 
                                   tr("There already exists a file called %1 in "
                                      "the current directory. Overwrite?").arg(fileName),
-                                  QMessageBox::Ok|QMessageBox::Cancel, QMessageBox::Cancel)
-            == QMessageBox::Cancel)
+                                  QMessageBox::Yes|QMessageBox::No, QMessageBox::No)
+            == QMessageBox::No)
             return;
         QFile::remove(fileName);
     }
diff --git a/examples/richtext/textobject/textobject.pro b/examples/richtext/textobject/textobject.pro
index fbb809c..4fa9cb0 100644
--- a/examples/richtext/textobject/textobject.pro
+++ b/examples/richtext/textobject/textobject.pro
@@ -12,3 +12,7 @@ sources.files = $$SOURCES $$HEADERS *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/richtext/textobject
 INSTALLS += target sources
 
+filesToDeploy.sources = files/*.svg
+filesToDeploy.path = files
+DEPLOYMENT += filesToDeploy
+
diff --git a/qmake/qmake_pch.h b/qmake/qmake_pch.h
index 1fec856..676c806 100644
--- a/qmake/qmake_pch.h
+++ b/qmake/qmake_pch.h
@@ -53,7 +53,7 @@
 //#include "meta.h"
 #include <qfile.h>
 //#include "winmakefile.h"
-#include <qtextstream.h>
+//#include <qtextstream.h>
 //#include "project.h"
 #include <qstring.h>
 #include <qstringlist.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/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/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/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/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/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/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/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/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/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/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/tests/auto/_networkselftest/tst_networkselftest.cpp b/tests/auto/_networkselftest/tst_networkselftest.cpp
index dab4433..0fa001a 100644
--- a/tests/auto/_networkselftest/tst_networkselftest.cpp
+++ b/tests/auto/_networkselftest/tst_networkselftest.cpp
@@ -463,7 +463,7 @@ void tst_NetworkSelfTest::httpsServer()
             << Chat::expect("200 ")
             << Chat::DiscardUntilDisconnect);
 #else
-    QSKIP("SSL not enabled, cannot test");
+    QSKIP("SSL not enabled, cannot test", SkipAll);
 #endif
 }
 
diff --git a/tests/auto/qdbusmarshall/tst_qdbusmarshall.cpp b/tests/auto/qdbusmarshall/tst_qdbusmarshall.cpp
index ad1a1b8..58bfabc 100644
--- a/tests/auto/qdbusmarshall/tst_qdbusmarshall.cpp
+++ b/tests/auto/qdbusmarshall/tst_qdbusmarshall.cpp
@@ -84,6 +84,8 @@ private slots:
     void sendArgument_data();
     void sendArgument();
 
+    void sendErrors();
+
 private:
     QProcess proc;
 };
@@ -782,5 +784,28 @@ void tst_QDBusMarshall::sendArgument()
         QCOMPARE(extracted, value);
 }
 
+void tst_QDBusMarshall::sendErrors()
+{
+    QDBusConnection con = QDBusConnection::sessionBus();
+
+    QVERIFY(con.isConnected());
+    QDBusMessage msg = QDBusMessage::createSignal("/foo", "local.interfaceName",
+                                                  "signalName");
+    msg << qVariantFromValue(QDBusObjectPath());
+
+    QTest::ignoreMessage(QtWarningMsg, "QDBusConnection: error: could not send signal path \"/foo\" interface \"local.interfaceName\" member \"signalName\"");
+    QVERIFY(!con.send(msg));
+
+    msg.setArguments(QVariantList());
+    QDBusObjectPath path;
+
+    QTest::ignoreMessage(QtWarningMsg, "QDBusObjectPath: invalid path \"abc\"");
+    path.setPath("abc");
+    msg << qVariantFromValue(path);
+
+    QTest::ignoreMessage(QtWarningMsg, "QDBusConnection: error: could not send signal path \"/foo\" interface \"local.interfaceName\" member \"signalName\"");
+    QVERIFY(!con.send(msg));
+}
+
 QTEST_MAIN(tst_QDBusMarshall)
 #include "tst_qdbusmarshall.moc"
diff --git a/tests/auto/qlocalsocket/tst_qlocalsocket.cpp b/tests/auto/qlocalsocket/tst_qlocalsocket.cpp
index 785eab0..ac26075 100644
--- a/tests/auto/qlocalsocket/tst_qlocalsocket.cpp
+++ b/tests/auto/qlocalsocket/tst_qlocalsocket.cpp
@@ -115,8 +115,6 @@ tst_QLocalSocket::tst_QLocalSocket()
 #endif
                 ))
         qWarning() << "lackey executable doesn't exists!";
-
-    QLocalServer::removeServer("tst_localsocket");
 }
 
 tst_QLocalSocket::~tst_QLocalSocket()
@@ -141,7 +139,13 @@ public:
     LocalServer() : QLocalServer()
     {
         connect(this, SIGNAL(newConnection()), this, SLOT(slotNewConnection()));
-    };
+    }
+
+    bool listen(const QString &name)
+    {
+        removeServer(name);
+        return QLocalServer::listen(name);
+    }
 
     QList<int> hits;
 
@@ -530,7 +534,7 @@ void tst_QLocalSocket::sendData()
 // QLocalSocket/Server can take a name or path, check that it works as expected
 void tst_QLocalSocket::fullPath()
 {
-    QLocalServer server;
+    LocalServer server;
     QString name = "qlocalsocket_pathtest";
 #if defined(QT_LOCALSOCKET_TCP)
     QString path = "QLocalServer";
@@ -824,7 +828,7 @@ void tst_QLocalSocket::removeServer()
 
 void tst_QLocalSocket::recycleServer()
 {
-    QLocalServer server;
+    LocalServer server;
     QLocalSocket client;
 
     QVERIFY(server.listen("recycletest1"));
diff --git a/tests/auto/qnetworkdiskcache/tst_qnetworkdiskcache.cpp b/tests/auto/qnetworkdiskcache/tst_qnetworkdiskcache.cpp
index 2383767..2f6180f 100644
--- a/tests/auto/qnetworkdiskcache/tst_qnetworkdiskcache.cpp
+++ b/tests/auto/qnetworkdiskcache/tst_qnetworkdiskcache.cpp
@@ -76,7 +76,7 @@ private slots:
 
     void oldCacheVersionFile_data();
     void oldCacheVersionFile();
-
+    
     void sync();
 };
 
@@ -486,7 +486,7 @@ public:
     void run()
     {
         QByteArray longString = "Hello World, this is some long string, well not really that long";
-        for (int i = 0; i < 10; ++i)
+        for (int j = 0; j < 10; ++j)
             longString += longString;
         QByteArray longString2 = "Help, I am stuck in an autotest!";
         QUrl url(EXAMPLE_URL);
diff --git a/tests/auto/qpainter/tst_qpainter.cpp b/tests/auto/qpainter/tst_qpainter.cpp
index af0f6cf..c0f9935 100644
--- a/tests/auto/qpainter/tst_qpainter.cpp
+++ b/tests/auto/qpainter/tst_qpainter.cpp
@@ -215,6 +215,7 @@ private slots:
     void imageCoordinateLimit();
     void imageBlending_data();
     void imageBlending();
+    void imageBlending_clipped();
 
     void paintOnNullPixmap();
     void checkCompositionMode();
@@ -3793,6 +3794,31 @@ void tst_QPainter::imageBlending()
     }
 }
 
+void tst_QPainter::imageBlending_clipped()
+{
+    QImage src(20, 20, QImage::Format_RGB16);
+    QPainter p(&src);
+    p.fillRect(src.rect(), Qt::red);
+    p.end();
+
+    QImage dst(40, 20, QImage::Format_RGB16);
+    p.begin(&dst);
+    p.fillRect(dst.rect(), Qt::white);
+    p.end();
+
+    QImage expected = dst;
+
+    p.begin(&dst);
+    p.setClipRect(QRect(23, 0, 20, 20));
+
+    // should be completely clipped
+    p.drawImage(QRectF(3, 0, 20, 20), src);
+    p.end();
+
+    // dst should be left unchanged
+    QCOMPARE(dst, expected);
+}
+
 void tst_QPainter::paintOnNullPixmap()
 {
     QPixmap pix(16, 16);
diff --git a/tests/auto/qprogressbar/tst_qprogressbar.cpp b/tests/auto/qprogressbar/tst_qprogressbar.cpp
index d6379d3..cb037e0 100644
--- a/tests/auto/qprogressbar/tst_qprogressbar.cpp
+++ b/tests/auto/qprogressbar/tst_qprogressbar.cpp
@@ -63,6 +63,7 @@ private slots:
     void setValueRepaint();
     void sizeHint();
 
+    void task245201_testChangeStyleAndDelete_data();
     void task245201_testChangeStyleAndDelete();
 };
 
@@ -224,15 +225,30 @@ void tst_QProgressBar::sizeHint()
     QCOMPARE(barSize.height(), size.height());
 }
 
+void tst_QProgressBar::task245201_testChangeStyleAndDelete_data()
+{
+    QTest::addColumn<QString>("style1_str");
+    QTest::addColumn<QString>("style2_str");
+
+    QTest::newRow("plastique-windows") << QString::fromLatin1("plastique") << QString::fromLatin1("windows");
+    QTest::newRow("mlotif-windows") << QString::fromLatin1("motif") << QString::fromLatin1("windows");
+    QTest::newRow("cleanlooks-cde") << QString::fromLatin1("cleanlooks") << QString::fromLatin1("cde");
+    QTest::newRow("gtk-plastique") << QString::fromLatin1("gtk") << QString::fromLatin1("plastique");
+}
+
 void tst_QProgressBar::task245201_testChangeStyleAndDelete()
 {
+    QFETCH(QString, style1_str);
+    QFETCH(QString, style2_str);
+
     QProgressBar *bar = new QProgressBar;
 
-    QStyle *style = QStyleFactory::create("plastique");
+    QStyle *style = QStyleFactory::create(style1_str);
     bar->setStyle(style);
     bar->show();
-    QStyle *style2 = QStyleFactory::create("windows");
+    QStyle *style2 = QStyleFactory::create(style2_str);
     bar->setStyle(style2);
+    QTest::qWait(10);
 
     delete bar;
     QTest::qWait(100); //should not crash
diff --git a/tests/auto/qtextcodec/tst_qtextcodec.cpp b/tests/auto/qtextcodec/tst_qtextcodec.cpp
index 22f9557..97c409b 100644
--- a/tests/auto/qtextcodec/tst_qtextcodec.cpp
+++ b/tests/auto/qtextcodec/tst_qtextcodec.cpp
@@ -1540,7 +1540,7 @@ void tst_QTextCodec::utfHeaders_data()
         << QByteArray("\xef\xbb\xbfhello")
         << (QString(QChar(0xfeff)) + QString::fromLatin1("hello"))
         << true;
-    QTest::newRow("utf8 nobom")
+    QTest::newRow("utf8 nobom ignore header")
         << QByteArray("UTF-8")
         << (int)QTextCodec::IgnoreHeader
         << QByteArray("hello")
@@ -1721,14 +1721,23 @@ void tst_QTextCodec::utfHeaders()
 
     QFETCH(bool, toUnicode);
 
+    QLatin1String ignoreReverseTestOn = (QSysInfo::ByteOrder == QSysInfo::BigEndian) ? QLatin1String(" le") : QLatin1String(" be");
+    QString rowName(QTest::currentDataTag());
+
     for (int i = 0; i < encoded.length(); ++i)
         qDebug() << hex << "    " << (uint)(uchar)encoded.at(i);
     if (toUnicode) {
         QString result = codec->toUnicode(encoded.constData(), encoded.length(), &state);
-    for (int i = 0; i < result.length(); ++i)
-        qDebug() << hex << "    " << (uint)result.at(i).unicode();
+        for (int i = 0; i < result.length(); ++i)
+            qDebug() << hex << "    " << (uint)result.at(i).unicode();
         QCOMPARE(result.length(), unicode.length());
         QCOMPARE(result, unicode);
+
+        if (!rowName.endsWith("nobom") && !rowName.contains(ignoreReverseTestOn)) {
+            QTextCodec::ConverterState state2(cFlags);
+            QByteArray reencoded = codec->fromUnicode(unicode.unicode(), unicode.length(), &state2);
+            QCOMPARE(reencoded, encoded);
+        }
     } else {
         QByteArray result = codec->fromUnicode(unicode.unicode(), unicode.length(), &state);
         QCOMPARE(result, encoded);
diff --git a/tools/linguist/shared/numerus.cpp b/tools/linguist/shared/numerus.cpp
index f3a29cc..50e85cb 100644
--- a/tools/linguist/shared/numerus.cpp
+++ b/tools/linguist/shared/numerus.cpp
@@ -60,12 +60,11 @@ static const uchar frenchStyleRules[] =
 static const uchar latvianRules[] =
     { Q_MOD_10 | Q_EQ, 1, Q_AND, Q_MOD_100 | Q_NEQ, 11, Q_NEWRULE,
       Q_NEQ, 0 };
+static const uchar icelandicRules[] =
+    { Q_MOD_10 | Q_EQ, 1, Q_AND, Q_MOD_100 | Q_NEQ, 11 };
 static const uchar irishStyleRules[] =
     { Q_EQ, 1, Q_NEWRULE,
       Q_EQ, 2 };
-static const uchar czechRules[] =
-    { Q_MOD_100 | Q_EQ, 1, Q_NEWRULE,
-      Q_MOD_100 | Q_BETWEEN, 2, 4 };
 static const uchar slovakRules[] =
     { Q_EQ, 1, Q_NEWRULE,
       Q_BETWEEN, 2, 4 };
@@ -74,7 +73,7 @@ static const uchar macedonianRules[] =
       Q_MOD_10 | Q_EQ, 2 };
 static const uchar lithuanianRules[] =
     { Q_MOD_10 | Q_EQ, 1, Q_AND, Q_MOD_100 | Q_NEQ, 11, Q_NEWRULE,
-      Q_MOD_10 | Q_EQ, 2, Q_AND, Q_MOD_100 | Q_NOT_BETWEEN, 10, 19 };
+      Q_MOD_10 | Q_NEQ, 0, Q_AND, Q_MOD_100 | Q_NOT_BETWEEN, 10, 19 };
 static const uchar russianStyleRules[] =
     { Q_MOD_10 | Q_EQ, 1, Q_AND, Q_MOD_100 | Q_NEQ, 11, Q_NEWRULE,
       Q_MOD_10 | Q_BETWEEN, 2, 4, Q_AND, Q_MOD_100 | Q_NOT_BETWEEN, 10, 19 };
@@ -103,27 +102,35 @@ static const uchar arabicRules[] =
       Q_EQ, 2, Q_NEWRULE,
       Q_MOD_100 | Q_BETWEEN, 3, 10, Q_NEWRULE,
       Q_MOD_100 | Q_NEQ, 0 };
+static const uchar tagalogRules[] =
+    { Q_LEQ, 1, Q_NEWRULE,
+      Q_MOD_10 | Q_EQ, 4, Q_OR, Q_MOD_10 | Q_EQ, 6, Q_OR, Q_MOD_10 | Q_EQ, 9 };
+static const uchar catalanRules[] =
+    { Q_EQ, 1, Q_NEWRULE,
+      Q_LEAD_1000 | Q_EQ, 11 };
 
 static const char * const japaneseStyleForms[] = { "Universal Form", 0 };
 static const char * const englishStyleForms[] = { "Singular", "Plural", 0 };
 static const char * const frenchStyleForms[] = { "Singular", "Plural", 0 };
+static const char * const icelandicForms[] = { "Singular", "Plural", 0 };
 static const char * const latvianForms[] = { "Singular", "Plural", "Nullar", 0 };
 static const char * const irishStyleForms[] = { "Singular", "Dual", "Plural", 0 };
-static const char * const czechForms[] = { "Singular", "Dual", "Plural", 0 };
-static const char * const slovakForms[] = { "Singular", "Dual", "Plural", 0 };
+static const char * const slovakForms[] = { "Singular", "Paucal", "Plural", 0 };
 static const char * const macedonianForms[] = { "Singular", "Dual", "Plural", 0 };
-static const char * const lithuanianForms[] = { "Singular", "Dual", "Plural", 0 };
+static const char * const lithuanianForms[] = { "Singular", "Paucal", "Plural", 0 };
 static const char * const russianStyleForms[] = { "Singular", "Dual", "Plural", 0 };
 static const char * const polishForms[] = { "Singular", "Paucal", "Plural", 0 };
-static const char * const romanianForms[] =
-    { "Singular", "Plural Form for 2 to 19", "Plural", 0 };
+static const char * const romanianForms[] = { "Singular", "Paucal", "Plural", 0 };
 static const char * const slovenianForms[] = { "Singular", "Dual", "Trial", "Plural", 0 };
 static const char * const malteseForms[] =
-    { "Singular", "Plural Form for 2 to 10", "Plural Form for 11 to 19", "Plural", 0 };
+    { "Singular", "Paucal", "Greater Paucal", "Plural", 0 };
 static const char * const welshForms[] =
     { "Nullar", "Singular", "Dual", "Sexal", "Plural", 0 };
 static const char * const arabicForms[] =
     { "Nullar", "Singular", "Dual", "Minority Plural", "Plural", "Plural Form for 100, 200, ...", 0 };
+static const char * const tagalogForms[] =
+    { "Singular", "Plural (consonant-ended)", "Plural (vowel-ended)", 0 };
+static const char * const catalanForms[] = { "Singular", "Undecal (11)", "Plural", 0 };
 
 #define EOL QLocale::C
 
@@ -147,6 +154,7 @@ static const QLocale::Language japaneseStyleLanguages[] = {
     QLocale::Sundanese,
     QLocale::Thai,
     QLocale::Tibetan,
+    QLocale::Turkish,
     QLocale::Vietnamese,
     QLocale::Yoruba,
     QLocale::Zhuang,
@@ -169,7 +177,6 @@ static const QLocale::Language englishStyleLanguages[] = {
     // Missing: Bokmal,
     QLocale::Bulgarian,
     QLocale::Cambodian,
-    QLocale::Catalan,
     QLocale::Cornish,
     QLocale::Corsican,
     QLocale::Danish,
@@ -190,7 +197,6 @@ static const QLocale::Language englishStyleLanguages[] = {
     QLocale::Hausa,
     QLocale::Hebrew,
     QLocale::Hindi,
-    QLocale::Icelandic,
     QLocale::Interlingua,
     QLocale::Interlingue,
     QLocale::Italian,
@@ -231,14 +237,12 @@ static const QLocale::Language englishStyleLanguages[] = {
     QLocale::Spanish,
     QLocale::Swahili,
     QLocale::Swedish,
-    QLocale::Tagalog,
     QLocale::Tajik,
     QLocale::Tamil,
     QLocale::Tatar,
     QLocale::Telugu,
     QLocale::TongaLanguage,
     QLocale::Tsonga,
-    QLocale::Turkish,
     QLocale::Turkmen,
     QLocale::Twi,
     QLocale::Uigur,
@@ -261,6 +265,7 @@ static const QLocale::Language frenchStyleLanguages[] = {
     EOL
 };
 static const QLocale::Language latvianLanguage[] = { QLocale::Latvian, EOL };
+static const QLocale::Language icelandicLanguage[] = { QLocale::Icelandic, EOL };
 static const QLocale::Language irishStyleLanguages[] = {
     QLocale::Divehi,
     QLocale::Gaelic,
@@ -274,8 +279,7 @@ static const QLocale::Language irishStyleLanguages[] = {
     QLocale::Sanskrit,
     EOL
 };
-static const QLocale::Language czechLanguage[] = { QLocale::Czech, EOL };
-static const QLocale::Language slovakLanguage[] = { QLocale::Slovak, EOL };
+static const QLocale::Language slovakLanguages[] = { QLocale::Slovak, QLocale::Czech, EOL };
 static const QLocale::Language macedonianLanguage[] = { QLocale::Macedonian, EOL };
 static const QLocale::Language lithuanianLanguage[] = { QLocale::Lithuanian, EOL };
 static const QLocale::Language russianStyleLanguages[] = {
@@ -298,6 +302,8 @@ static const QLocale::Language slovenianLanguage[] = { QLocale::Slovenian, EOL }
 static const QLocale::Language malteseLanguage[] = { QLocale::Maltese, EOL };
 static const QLocale::Language welshLanguage[] = { QLocale::Welsh, EOL };
 static const QLocale::Language arabicLanguage[] = { QLocale::Arabic, EOL };
+static const QLocale::Language tagalogLanguage[] = { QLocale::Tagalog, EOL };
+static const QLocale::Language catalanLanguage[] = { QLocale::Catalan, EOL };
 
 static const QLocale::Country frenchStyleCountries[] = {
     // keep synchronized with frenchStyleLanguages
@@ -320,9 +326,9 @@ static const NumerusTableEntry numerusTable[] = {
     { frenchStyleRules, sizeof(frenchStyleRules), frenchStyleForms, frenchStyleLanguages,
       frenchStyleCountries },
     { latvianRules, sizeof(latvianRules), latvianForms, latvianLanguage, 0 },
+    { icelandicRules, sizeof(icelandicRules), icelandicForms, icelandicLanguage, 0 },
     { irishStyleRules, sizeof(irishStyleRules), irishStyleForms, irishStyleLanguages, 0 },
-    { czechRules, sizeof(czechRules), czechForms, czechLanguage, 0 },
-    { slovakRules, sizeof(slovakRules), slovakForms, slovakLanguage, 0 },
+    { slovakRules, sizeof(slovakRules), slovakForms, slovakLanguages, 0 },
     { macedonianRules, sizeof(macedonianRules), macedonianForms, macedonianLanguage, 0 },
     { lithuanianRules, sizeof(lithuanianRules), lithuanianForms, lithuanianLanguage, 0 },
     { russianStyleRules, sizeof(russianStyleRules), russianStyleForms, russianStyleLanguages, 0 },
@@ -331,7 +337,9 @@ static const NumerusTableEntry numerusTable[] = {
     { slovenianRules, sizeof(slovenianRules), slovenianForms, slovenianLanguage, 0 },
     { malteseRules, sizeof(malteseRules), malteseForms, malteseLanguage, 0 },
     { welshRules, sizeof(welshRules), welshForms, welshLanguage, 0 },
-    { arabicRules, sizeof(arabicRules), arabicForms, arabicLanguage, 0 }
+    { arabicRules, sizeof(arabicRules), arabicForms, arabicLanguage, 0 },
+    { tagalogRules, sizeof(tagalogRules), tagalogForms, tagalogLanguage, 0 },
+    { catalanRules, sizeof(catalanRules), catalanForms, catalanLanguage, 0 }
 };
 
 static const int NumerusTableSize = sizeof(numerusTable) / sizeof(numerusTable[0]);