Changed Qt release version to 4.8.4

Change-Id: I45f7894f7e79617b6ccb8caa464bbbffaf9dd7b5
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

20 files changed, 198 insertions, 40 deletions

diff --git a/dist/changes-4.8.4 b/dist/changes-4.8.4
new file mode 100644
index 0000000..dd4f80e
--- /dev/null
+++ b/dist/changes-4.8.4
@@ -0,0 +1,158 @@
+Qt 4.8.4 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 4.8.0, 4.8.1, 4.8.2 and 4.8.3.
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+  http://qt-project.org/doc/4.8
+
+The Qt version 4.8 series is binary compatible with the 4.7.x series.
+Applications compiled for 4.7 will continue to run with 4.8.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker or the Merge Request queue
+of the public source repository.
+
+Qt Bug Tracker: http://bugreports.qt-project.org
+Merge Request:  http://codereview.qt-project.org
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+General Improvements
+--------------------
+- Copyrights changed to Digia Plc
+- Add msvc2012 support
+
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+QtGui
+-----
+- Fixed outline / fill inconsistencies in raster paint engine [QTBUG-26013]
+- Avoid crash caused by drag and drop and winId() [QTBUG-27263]
+- Cleanup CUPS tmp files [QTBUG-14724]
+- Fixed inconsistent rounding of square cap pens [QTBUG-26013]
+- Rotate non maximized windows
+- Fix crash when invalidating a QSortFilterProxyModel [QTBUG-27122]
+- Fix regression in QTextDocument::toHtml() with font pixel size [QTBUG-25778]
+- qpa: improve DirectFB performance
+- qpa: extend drawPixmap capabilities
+- qpa: add non-opaque fill support
+- Fix calculation of logical child index for row headers
+
+QtNetwork
+---------
+- Disable SSL compression by default
+- HTTP header may be damaged - fix, unit test [QTBUG-27161]
+- Bypass proxy for local connections
+
+QtCore
+------
+- Include the signal code in the argument of (dis)connectNotify()
+- QElapsedTimer: Fix typo in restart() documentation
+
+QtSql
+-----
+- Fix error when inserting to tables with datetime fields with QODBC [QTBUG-2192]
+
+Declarative
+-----------
+- EngineDebug: Updated and renamed service
+- Ensure child items are updated even if the parent item has no content [QTBUG-26846]
+
+OpenGL
+------
+- Fixed text drawing in OpenGL 2 paint engine [QTBUG-24453]
+- Fixed potential use of uninitialized variable in qgl.cpp [QTBUG-26952]
+
+****************************************************************************
+*                      Platform Specific Changes                           *
+****************************************************************************
+
+Qt for Linux/X11
+----------------
+- clear XSizeHints before use [QTBUG-15418]
+- Don't mouse-wheel-scroll QScrollBar when disabled [QTBUG-27308][QTBUG-21534]
+- Fix realpath() call to older POSIX platforms
+- When x-compiling on Linux the host tools doesn't have Windows' executable suffix
+
+Qt for Windows
+--------------
+- Add msvc2012 support
+- Fix g++/MinGW compiler warnings
+- fix examples/script/qscript for MSVC [QTBUG-13496]
+- Fix MinGW-w64 compilation
+- Partial Revert "Disable pkg-config, when x-compiling for mingw"
+- Never compile QPA with EGL support on Windows
+
+Qt for Mac OS X
+---------------
+- Update the state of native menus correctly on Mac [QTBUG-25544,QTBUG-26399,QTBUG-7538]
+- Enable HiDPI mode for retina displays
+- Fix issue with mispositioned family name i QFontComboBox [QTBUG-26691]
+- Load Mac specific resources in a static build [QTBUG-25391]
+- Fixed float->int error in OS X Mouse Event Handling [QTBUG-27273]
+- Refactor coreservices -> ios & QT_NO_CORESERVICES -> Q_OS_IOS
+- Ensure that QApplication is cleaned up after itself on Mac [QTBUG-24248]
+- Prevent a crash when a merged action is removed [QTBUG-24917]
+
+Qt for Symbian
+--------------
+- Move SRCDIR definition to .pro file
+- Fix symbian QtCore deffile (for QObjectPrivate)
+- Fix symbian QtCore deffiles (for QUrl::detach)
+- Handle Qt input hints for email and url editors
+
+Qt for QNX
+----------
+- Change suffix for separate debug files
+- Fix bug on window hierarchy list
+- Use assert on QBBWindow destructor
+- Don't show the virtual keyboard when focusing an item view
+- Enable support for hardware buttons in QPA plugin
+- Add some optional debug output to event dispatcher
+- Do not initially commit all memory used in RegisterFile
+
+Qt for Blackberry
+-----------------
+- Support input method hints
+- Fix hardware button detection on the BB Dev Alpha
+- Fixed crash in blackberry platform plugin shutdown
+
+Other
+-----
+- Fix build for platforms that use QPA other than IOS
+
+****************************************************************************
+*                          Tools                                           *
+****************************************************************************
+
+Assistant
+---------
+- Fixed window raise issue when handling remote commands [QTBUG-25407]
+
+Designer
+--------
+- Fix gcc 4.6 warnings about assigned/unused variables in Qt Designer
+
+Configure
+---------
+- Mac features don't belong on cross mingw target
+- Use qmake to get PKG_CONFIG in configure script
+- Postpone pkg-config detection until after qmake is built
+- Undo variable renaming in backport
+- Unscramble option help text
+- Smuggle QT_BUILD_TREE to device_config.prf even during tests
+- Find qdevice.pri even for installed qt builds
+
+qmake
+-----
+- Add -pipe option of win32-g++'s QMAKE_CFLAGS
+
+Other
+-----
+- Register Qt 4.7 import on-demand, instead of at startup
+- Update Traditional Chinese translation
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 7f4165f..8346e46 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -44,11 +44,11 @@
 
 #include <stddef.h>
 
-#define QT_VERSION_STR   "4.8.3"
+#define QT_VERSION_STR   "4.8.4"
 /*
    QT_VERSION is (major << 16) + (minor << 8) + patch.
 */
-#define QT_VERSION 0x040803
+#define QT_VERSION 0x040804
 /*
    can be used like #if (QT_VERSION >= QT_VERSION_CHECK(4, 4, 0))
 */
diff --git a/src/plugins/qpluginbase.pri b/src/plugins/qpluginbase.pri
index ddead4b..51986be 100644
--- a/src/plugins/qpluginbase.pri
+++ b/src/plugins/qpluginbase.pri
@@ -1,6 +1,6 @@
 TEMPLATE = lib
 isEmpty(QT_MAJOR_VERSION) {
-   VERSION=4.8.3
+   VERSION=4.8.4
 } else {
    VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
 }
diff --git a/src/qbase.pri b/src/qbase.pri
index 72a1825..283fc23 100644
--- a/src/qbase.pri
+++ b/src/qbase.pri
@@ -4,7 +4,7 @@ INCLUDEPATH *= $$QMAKE_INCDIR_QT/$$TARGET #just for today to have some compat
 isEmpty(QT_ARCH):!isEmpty(ARCH):QT_ARCH=$$ARCH #another compat that will rot for change #215700
 TEMPLATE	= lib
 isEmpty(QT_MAJOR_VERSION) {
-   VERSION=4.8.3
+   VERSION=4.8.4
 } else {
    VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
 }
diff --git a/tests/auto/mediaobject/dummy/dummy.pro b/tests/auto/mediaobject/dummy/dummy.pro
index e63bc5c..ba3e8e8 100644
--- a/tests/auto/mediaobject/dummy/dummy.pro
+++ b/tests/auto/mediaobject/dummy/dummy.pro
@@ -1,7 +1,7 @@
 TEMPLATE = lib
 
 isEmpty(QT_MAJOR_VERSION) {
-   VERSION=4.8.3
+   VERSION=4.8.4
 } else {
    VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
 }
diff --git a/tests/auto/selftests/expected_cmptest.txt b/tests/auto/selftests/expected_cmptest.txt
index 4498157..72036db 100644
--- a/tests/auto/selftests/expected_cmptest.txt
+++ b/tests/auto/selftests/expected_cmptest.txt
@@ -1,5 +1,5 @@
 ********* Start testing of tst_Cmptest *********
-Config: Using QTest library 4.8.3, Qt 4.8.3
+Config: Using QTest library 4.8.4, Qt 4.8.4
 PASS   : tst_Cmptest::initTestCase()
 PASS   : tst_Cmptest::compare_boolfuncs()
 PASS   : tst_Cmptest::compare_pointerfuncs()
diff --git a/tests/auto/selftests/expected_crashes_3.txt b/tests/auto/selftests/expected_crashes_3.txt
index c605e7d..2253a2c 100644
--- a/tests/auto/selftests/expected_crashes_3.txt
+++ b/tests/auto/selftests/expected_crashes_3.txt
@@ -1,5 +1,5 @@
 ********* Start testing of tst_Crashes *********
-Config: Using QTest library 4.8.3, Qt 4.8.3
+Config: Using QTest library 4.8.4, Qt 4.8.4
 PASS   : tst_Crashes::initTestCase()
 QFATAL : tst_Crashes::crash() Received signal 11
 FAIL!  : tst_Crashes::crash() Received a fatal error.
diff --git a/tests/auto/selftests/expected_longstring.txt b/tests/auto/selftests/expected_longstring.txt
index bf71e74..7cf8e37 100644
--- a/tests/auto/selftests/expected_longstring.txt
+++ b/tests/auto/selftests/expected_longstring.txt
@@ -1,5 +1,5 @@
 ********* Start testing of tst_LongString *********
-Config: Using QTest library 4.8.3, Qt 4.8.3
+Config: Using QTest library 4.8.4, Qt 4.8.4
 PASS   : tst_LongString::initTestCase()
 FAIL!  : tst_LongString::failWithLongString() Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium. Integer tincidunt. Cras dapibus. Vivamus elementum semper nisi. Aenean vulputate eleifend tellus. Aenean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim. Aliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus. Phasellus viverra nulla ut metus varius laoreet. Quisque rutrum. Aenean imperdiet. Etiam ultricies nisi vel augue. Curabitur ullamcorper ultricies nisi. Nam eget dui.
 
diff --git a/tests/auto/selftests/expected_maxwarnings.txt b/tests/auto/selftests/expected_maxwarnings.txt
index 547fcbd..2359cbc 100644
--- a/tests/auto/selftests/expected_maxwarnings.txt
+++ b/tests/auto/selftests/expected_maxwarnings.txt
@@ -1,5 +1,5 @@
 ********* Start testing of MaxWarnings *********
-Config: Using QTest library 4.8.3, Qt 4.8.3
+Config: Using QTest library 4.8.4, Qt 4.8.4
 PASS   : MaxWarnings::initTestCase()
 QWARN  : MaxWarnings::warn() 0
 QWARN  : MaxWarnings::warn() 1
diff --git a/tests/auto/selftests/expected_skip.txt b/tests/auto/selftests/expected_skip.txt
index 00f8232..6e746a6 100644
--- a/tests/auto/selftests/expected_skip.txt
+++ b/tests/auto/selftests/expected_skip.txt
@@ -1,5 +1,5 @@
 ********* Start testing of tst_Skip *********
-Config: Using QTest library 4.8.3, Qt 4.8.3
+Config: Using QTest library 4.8.4, Qt 4.8.4
 PASS   : tst_Skip::initTestCase()
 SKIP   : tst_Skip::test() skipping all
    Loc: [/home/user/depot/qt-git/mainline/tests/auto/selftests/skip/tst_skip.cpp(68)]
diff --git a/tools/assistant/tools/assistant/doc/assistant.qdocconf b/tools/assistant/tools/assistant/doc/assistant.qdocconf
index b2e7515..6921ace 100644
--- a/tools/assistant/tools/assistant/doc/assistant.qdocconf
+++ b/tools/assistant/tools/assistant/doc/assistant.qdocconf
@@ -12,5 +12,5 @@ HTML.footer = "<p /><address><hr /><div align=\"center\">\n" \
               "<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \
               "<td width=\"30%\" align=\"left\">Copyright &copy; 2012 Digia Plc and/or its subsidiary(-ies)</td>\n" \
               "<td width=\"40%\" align=\"center\">Trademarks</td>\n" \
-              "<td width=\"30%\" align=\"right\"><div align=\"right\">Qt 4.8.3</div></td>\n" \
+              "<td width=\"30%\" align=\"right\"><div align=\"right\">Qt 4.8.4</div></td>\n" \
               "</tr></table></div></address>"
diff --git a/tools/qdoc3/doc/files/qt.qdocconf b/tools/qdoc3/doc/files/qt.qdocconf
index ad733aa..12ca6d0 100644
--- a/tools/qdoc3/doc/files/qt.qdocconf
+++ b/tools/qdoc3/doc/files/qt.qdocconf
@@ -22,7 +22,7 @@ edition.DesktopLight.groups       = -graphicsview-api
 qhp.projects            = Qt
 
 qhp.Qt.file                = qt.qhp
-qhp.Qt.namespace           = com.trolltech.qt.483
+qhp.Qt.namespace           = com.trolltech.qt.484
 qhp.Qt.virtualFolder       = qdoc
 qhp.Qt.indexTitle          = Qt Reference Documentation
 qhp.Qt.indexRoot           =
@@ -36,9 +36,9 @@ qhp.Qt.extraFiles          = classic.css \
                              images/dynamiclayouts-example.png \
                              images/stylesheet-coffee-plastique.png
 
-qhp.Qt.filterAttributes    = qt 4.8.3 qtrefdoc
-qhp.Qt.customFilters.Qt.name = Qt 4.8.3
-qhp.Qt.customFilters.Qt.filterAttributes = qt 4.8.3
+qhp.Qt.filterAttributes    = qt 4.8.4 qtrefdoc
+qhp.Qt.customFilters.Qt.name = Qt 4.8.4
+qhp.Qt.customFilters.Qt.filterAttributes = qt 4.8.4
 qhp.Qt.subprojects         = classes overviews examples
 qhp.Qt.subprojects.classes.title = Classes
 qhp.Qt.subprojects.classes.indexTitle = Qt's Classes
diff --git a/tools/qdoc3/test/assistant.qdocconf b/tools/qdoc3/test/assistant.qdocconf
index 9f581b4..0471db8 100644
--- a/tools/qdoc3/test/assistant.qdocconf
+++ b/tools/qdoc3/test/assistant.qdocconf
@@ -13,7 +13,7 @@ indexes                 = $QT_BUILD_TREE/doc-build/html-qt/qt.index
 qhp.projects            = Assistant
 
 qhp.Assistant.file                = assistant.qhp
-qhp.Assistant.namespace           = com.trolltech.assistant.483
+qhp.Assistant.namespace           = com.trolltech.assistant.484
 qhp.Assistant.virtualFolder       = qdoc
 qhp.Assistant.indexTitle          = Qt Assistant Manual
 qhp.Assistant.extraFiles          = images/bg_l.png \
@@ -50,7 +50,7 @@ qhp.Assistant.extraFiles          = images/bg_l.png \
 			     	    style/style_ie8.css \
 			     	    style/style.css
 
-qhp.Assistant.filterAttributes    = qt 4.8.3 tools assistant
+qhp.Assistant.filterAttributes    = qt 4.8.4 tools assistant
 qhp.Assistant.customFilters.Assistant.name = Qt Assistant Manual
 qhp.Assistant.customFilters.Assistant.filterAttributes = qt tools assistant
 qhp.Assistant.subprojects         = manual examples
diff --git a/tools/qdoc3/test/designer.qdocconf b/tools/qdoc3/test/designer.qdocconf
index da1c025..fb7bd77 100644
--- a/tools/qdoc3/test/designer.qdocconf
+++ b/tools/qdoc3/test/designer.qdocconf
@@ -13,7 +13,7 @@ indexes                 = $QT_BUILD_TREE/doc-build/html-qt/qt.index
 qhp.projects            = Designer
 
 qhp.Designer.file                = designer.qhp
-qhp.Designer.namespace           = com.trolltech.designer.483
+qhp.Designer.namespace           = com.trolltech.designer.484
 qhp.Designer.virtualFolder       = qdoc
 qhp.Designer.indexTitle          = Qt Designer Manual
 qhp.Designer.extraFiles          = images/bg_l.png \
@@ -50,7 +50,7 @@ qhp.Designer.extraFiles          = images/bg_l.png \
 									style/style_ie8.css \
                              	    style/style.css
 
-qhp.Designer.filterAttributes    = qt 4.8.3 tools designer
+qhp.Designer.filterAttributes    = qt 4.8.4 tools designer
 qhp.Designer.customFilters.Designer.name = Qt Designer Manual
 qhp.Designer.customFilters.Designer.filterAttributes = qt tools designer
 qhp.Designer.subprojects         = manual examples
diff --git a/tools/qdoc3/test/linguist.qdocconf b/tools/qdoc3/test/linguist.qdocconf
index 519a94d..9cbeafc 100644
--- a/tools/qdoc3/test/linguist.qdocconf
+++ b/tools/qdoc3/test/linguist.qdocconf
@@ -13,7 +13,7 @@ indexes                 = $QT_BUILD_TREE/doc-build/html-qt/qt.index
 qhp.projects            = Linguist
 
 qhp.Linguist.file                = linguist.qhp
-qhp.Linguist.namespace           = com.trolltech.linguist.483
+qhp.Linguist.namespace           = com.trolltech.linguist.484
 qhp.Linguist.virtualFolder       = qdoc
 qhp.Linguist.indexTitle          = Qt Linguist Manual
 qhp.Linguist.extraFiles          = images/bg_l.png \
@@ -50,7 +50,7 @@ qhp.Linguist.extraFiles          = images/bg_l.png \
 									style/style_ie8.css \
                              	    style/style.css
 
-qhp.Linguist.filterAttributes    = qt 4.8.3 tools linguist
+qhp.Linguist.filterAttributes    = qt 4.8.4 tools linguist
 qhp.Linguist.customFilters.Linguist.name = Qt Linguist Manual
 qhp.Linguist.customFilters.Linguist.filterAttributes = qt tools linguist
 qhp.Linguist.subprojects         = manual examples
diff --git a/tools/qdoc3/test/qdeclarative.qdocconf b/tools/qdoc3/test/qdeclarative.qdocconf
index 891f41d..c6c10a1 100644
--- a/tools/qdoc3/test/qdeclarative.qdocconf
+++ b/tools/qdoc3/test/qdeclarative.qdocconf
@@ -21,7 +21,7 @@ edition.DesktopLight.groups       = -graphicsview-api
 qhp.projects            = Qml
 
 qhp.Qml.file                = qml.qhp
-qhp.Qml.namespace           = com.trolltech.qml.483
+qhp.Qml.namespace           = com.trolltech.qml.484
 qhp.Qml.virtualFolder       = qdoc
 qhp.Qml.indexTitle          = Qml Reference
 
@@ -61,9 +61,9 @@ qhp.Qml.extraFiles            = images/bg_l.png \
                              style/style_ie8.css \
                              style/style.css
 
-qhp.Qml.filterAttributes    = qt 4.8.3 qtrefdoc
-qhp.Qml.customFilters.Qt.name = Qt 4.8.3
-qhp.Qml.customFilters.Qt.filterAttributes = qt 4.8.3
+qhp.Qml.filterAttributes    = qt 4.8.4 qtrefdoc
+qhp.Qml.customFilters.Qt.name = Qt 4.8.4
+qhp.Qml.customFilters.Qt.filterAttributes = qt 4.8.4
 qhp.Qml.subprojects         = classes
 qhp.Qml.subprojects.classes.title = Elements
 qhp.Qml.subprojects.classes.indexTitle = Qml Elements
diff --git a/tools/qdoc3/test/qmake.qdocconf b/tools/qdoc3/test/qmake.qdocconf
index bcd9ec6..daa3596 100644
--- a/tools/qdoc3/test/qmake.qdocconf
+++ b/tools/qdoc3/test/qmake.qdocconf
@@ -13,7 +13,7 @@ indexes                 = $QT_BUILD_TREE/doc-build/html-qt/qt.index
 qhp.projects            = qmake
 
 qhp.qmake.file                = qmake.qhp
-qhp.qmake.namespace           = com.trolltech.qmake.483
+qhp.qmake.namespace           = com.trolltech.qmake.484
 qhp.qmake.virtualFolder       = qdoc
 qhp.qmake.indexTitle          = QMake Manual
 qhp.qmake.extraFiles          = images/bg_l.png \
@@ -50,7 +50,7 @@ qhp.qmake.extraFiles          = images/bg_l.png \
                              style/style_ie8.css \
                              style/style.css
 
-qhp.qmake.filterAttributes    = qt 4.8.3 tools qmake
+qhp.qmake.filterAttributes    = qt 4.8.4 tools qmake
 qhp.qmake.customFilters.qmake.name = qmake Manual
 qhp.qmake.customFilters.qmake.filterAttributes = qt tools qmake
 qhp.qmake.subprojects         = manual
diff --git a/tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf b/tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf
index 8f9055e..932fbaf 100644
--- a/tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf
+++ b/tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf
@@ -17,15 +17,15 @@ indexes                 = $QT_BUILD_TREE/doc-build/html-qt/qt.index
 qhp.projects            = Qt
 
 qhp.Qt.file                = qt.qhp
-qhp.Qt.namespace           = com.trolltech.qt.483
+qhp.Qt.namespace           = com.trolltech.qt.484
 qhp.Qt.virtualFolder       = qdoc
 qhp.Qt.title               = Qt
 qhp.Qt.indexTitle          = Qt
 qhp.Qt.selectors           = fake:example
 
-qhp.Qt.filterAttributes    = qt 4.8.3 qtrefdoc ja_JP
-qhp.Qt.customFilters.Qt.name = Qt 4.8.3
-qhp.Qt.customFilters.Qt.filterAttributes = qt 4.8.3
+qhp.Qt.filterAttributes    = qt 4.8.4 qtrefdoc ja_JP
+qhp.Qt.customFilters.Qt.name = Qt 4.8.4
+qhp.Qt.customFilters.Qt.filterAttributes = qt 4.8.4
 
 # Files not referenced in any qdoc file (last four are needed by qtdemo)
 # See also extraimages.HTML
diff --git a/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf b/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf
index 3268e07..cb95ffe 100644
--- a/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf
+++ b/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf
@@ -17,15 +17,15 @@ indexes                 = $QT_BUILD_TREE/doc-build/html-qt/qt.index
 qhp.projects            = Qt
 
 qhp.Qt.file                = qt.qhp
-qhp.Qt.namespace           = com.trolltech.qt.483
+qhp.Qt.namespace           = com.trolltech.qt.484
 qhp.Qt.virtualFolder       = qdoc
 qhp.Qt.title               = 教程
 qhp.Qt.indexTitle          = 教程
 qhp.Qt.selectors           = fake:example
 
-qhp.Qt.filterAttributes    = qt 4.8.3 qtrefdoc zh_CN
-qhp.Qt.customFilters.Qt.name = Qt 4.8.3
-qhp.Qt.customFilters.Qt.filterAttributes = qt 4.8.3
+qhp.Qt.filterAttributes    = qt 4.8.4 qtrefdoc zh_CN
+qhp.Qt.customFilters.Qt.name = Qt 4.8.4
+qhp.Qt.customFilters.Qt.filterAttributes = qt 4.8.4
 
 # Files not referenced in any qdoc file (last four are needed by qtdemo)
 # See also extraimages.HTML
diff --git a/tools/qdoc3/test/qt-project.qdocconf b/tools/qdoc3/test/qt-project.qdocconf
index d7a34ff..a7b763e 100644
--- a/tools/qdoc3/test/qt-project.qdocconf
+++ b/tools/qdoc3/test/qt-project.qdocconf
@@ -6,7 +6,7 @@ include(qt-defines.qdocconf)
 project                 = Qt
 description             = Qt Reference Documentation
 url                     = http://qt.nokia.com/doc/4.8
-version                 = 4.8.3
+version                 = 4.8.4
 
 sourceencoding          = UTF-8
 outputencoding          = UTF-8
@@ -15,14 +15,14 @@ naturallanguage         = en_US
 qhp.projects            = Qt
 
 qhp.Qt.file                = qt.qhp
-qhp.Qt.namespace           = com.trolltech.qt.483
+qhp.Qt.namespace           = com.trolltech.qt.484
 qhp.Qt.virtualFolder       = qdoc
 qhp.Qt.indexTitle          = Qt Reference Documentation
 qhp.Qt.indexRoot           =
 
-qhp.Qt.filterAttributes    = qt 4.8.3 qtrefdoc
-qhp.Qt.customFilters.Qt.name = Qt 4.8.3
-qhp.Qt.customFilters.Qt.filterAttributes = qt 4.8.3
+qhp.Qt.filterAttributes    = qt 4.8.4 qtrefdoc
+qhp.Qt.customFilters.Qt.name = Qt 4.8.4
+qhp.Qt.customFilters.Qt.filterAttributes = qt 4.8.4
 qhp.Qt.subprojects         = classes overviews examples
 qhp.Qt.subprojects.classes.title = Classes
 qhp.Qt.subprojects.classes.indexTitle = Qt's Classes