Bump Qt version to 4.8.2

Change-Id: Iecae324b1ae00c0d6fb6ed36a8f4a27f51a31d07
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Reviewed-by: Simo Fält <simo.falt@nokia.com>
Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

20 files changed, 120 insertions, 41 deletions

diff --git a/dist/changes-4.8.2 b/dist/changes-4.8.2
new file mode 100644
index 0000000000..efcfc4ba02
--- /dev/null
+++ b/dist/changes-4.8.2
@@ -0,0 +1,79 @@
+Qt 4.8.2 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 4.8.0.  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
+--------------------
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+QtGui
+-----
+
+QtNetwork
+---------
+
+QtCore
+------
+
+QtScript
+--------
+
+QtDBus
+------
+
+QtSql
+-----
+
+Declarative
+-----------
+
+OpenVG
+------
+
+OpenGL
+------
+
+3rdParty
+--------
+
+****************************************************************************
+*                      Platform Specific Changes                           *
+****************************************************************************
+
+Qt for Linux/X11
+----------------
+
+Qt for Windows
+--------------
+
+Qt for Mac OS X
+---------------
+
+Qt for Symbian
+--------------
+
+
+****************************************************************************
+*                          Tools                                           *
+****************************************************************************
+
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 3cbb1c7e80..ef6d46bba2 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.1"
+#define QT_VERSION_STR   "4.8.2"
 /*
    QT_VERSION is (major << 16) + (minor << 8) + patch.
 */
-#define QT_VERSION 0x040801
+#define QT_VERSION 0x040802
 /*
    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 e708690749..a63e9b1a2b 100644
--- a/src/plugins/qpluginbase.pri
+++ b/src/plugins/qpluginbase.pri
@@ -1,6 +1,6 @@
 TEMPLATE = lib
 isEmpty(QT_MAJOR_VERSION) {
-   VERSION=4.8.1
+   VERSION=4.8.2
 } else {
    VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
 }
diff --git a/src/qbase.pri b/src/qbase.pri
index f3709de11f..b83a37f0f9 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.1
+   VERSION=4.8.2
 } 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 0ff424987c..e792d5b6c5 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.1
+   VERSION=4.8.2
 } 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 7acf14561c..249de0d50b 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.1, Qt 4.8.1
+Config: Using QTest library 4.8.2, Qt 4.8.2
 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 03ec05119e..326d000e09 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.1, Qt 4.8.1
+Config: Using QTest library 4.8.2, Qt 4.8.2
 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 9092384755..927b84d28a 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.1, Qt 4.8.1
+Config: Using QTest library 4.8.2, Qt 4.8.2
 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 a95e114471..28cdfdc4c9 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.1, Qt 4.8.1
+Config: Using QTest library 4.8.2, Qt 4.8.2
 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 9a01771d3b..f9d1c7ea57 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.1, Qt 4.8.1
+Config: Using QTest library 4.8.2, Qt 4.8.2
 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 7d46819e21..3562be37de 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 Nokia Corporation 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.1</div></td>\n" \
+              "<td width=\"30%\" align=\"right\"><div align=\"right\">Qt 4.8.2</div></td>\n" \
               "</tr></table></div></address>"
diff --git a/tools/qdoc3/doc/files/qt.qdocconf b/tools/qdoc3/doc/files/qt.qdocconf
index 192cffad99..68ae0b6172 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.481
+qhp.Qt.namespace           = com.trolltech.qt.482
 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.1 qtrefdoc
-qhp.Qt.customFilters.Qt.name = Qt 4.8.1
-qhp.Qt.customFilters.Qt.filterAttributes = qt 4.8.1
+qhp.Qt.filterAttributes    = qt 4.8.2 qtrefdoc
+qhp.Qt.customFilters.Qt.name = Qt 4.8.2
+qhp.Qt.customFilters.Qt.filterAttributes = qt 4.8.2
 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 94ac7da804..13d72de6ae 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.481
+qhp.Assistant.namespace           = com.trolltech.assistant.482
 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.1 tools assistant
+qhp.Assistant.filterAttributes    = qt 4.8.2 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 89b78fe7f4..90841f4158 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.481
+qhp.Designer.namespace           = com.trolltech.designer.482
 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.1 tools designer
+qhp.Designer.filterAttributes    = qt 4.8.2 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 8b14d8ce4a..8ba7946671 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.481
+qhp.Linguist.namespace           = com.trolltech.linguist.482
 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.1 tools linguist
+qhp.Linguist.filterAttributes    = qt 4.8.2 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 5f307de12e..2b84d8de5d 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.481
+qhp.Qml.namespace           = com.trolltech.qml.482
 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.1 qtrefdoc
-qhp.Qml.customFilters.Qt.name = Qt 4.8.1
-qhp.Qml.customFilters.Qt.filterAttributes = qt 4.8.1
+qhp.Qml.filterAttributes    = qt 4.8.2 qtrefdoc
+qhp.Qml.customFilters.Qt.name = Qt 4.8.2
+qhp.Qml.customFilters.Qt.filterAttributes = qt 4.8.2
 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 d3bbc669a3..db7d0fd8e0 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.481
+qhp.qmake.namespace           = com.trolltech.qmake.482
 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.1 tools qmake
+qhp.qmake.filterAttributes    = qt 4.8.2 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 6dfe3440c5..1f14a8d27a 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.481
+qhp.Qt.namespace           = com.trolltech.qt.482
 qhp.Qt.virtualFolder       = qdoc
 qhp.Qt.title               = Qt
 qhp.Qt.indexTitle          = Qt
 qhp.Qt.selectors           = fake:example
 
-qhp.Qt.filterAttributes    = qt 4.8.1 qtrefdoc ja_JP
-qhp.Qt.customFilters.Qt.name = Qt 4.8.1
-qhp.Qt.customFilters.Qt.filterAttributes = qt 4.8.1
+qhp.Qt.filterAttributes    = qt 4.8.2 qtrefdoc ja_JP
+qhp.Qt.customFilters.Qt.name = Qt 4.8.2
+qhp.Qt.customFilters.Qt.filterAttributes = qt 4.8.2
 
 # 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 356560e2ca..17bafc3fb8 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.481
+qhp.Qt.namespace           = com.trolltech.qt.482
 qhp.Qt.virtualFolder       = qdoc
 qhp.Qt.title               = 教程
 qhp.Qt.indexTitle          = 教程
 qhp.Qt.selectors           = fake:example
 
-qhp.Qt.filterAttributes    = qt 4.8.1 qtrefdoc zh_CN
-qhp.Qt.customFilters.Qt.name = Qt 4.8.1
-qhp.Qt.customFilters.Qt.filterAttributes = qt 4.8.1
+qhp.Qt.filterAttributes    = qt 4.8.2 qtrefdoc zh_CN
+qhp.Qt.customFilters.Qt.name = Qt 4.8.2
+qhp.Qt.customFilters.Qt.filterAttributes = qt 4.8.2
 
 # 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 e31c2ef23b..0b83856406 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.1
+version                 = 4.8.2
 
 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.481
+qhp.Qt.namespace           = com.trolltech.qt.482
 qhp.Qt.virtualFolder       = qdoc
 qhp.Qt.indexTitle          = Qt Reference Documentation
 qhp.Qt.indexRoot           =
 
-qhp.Qt.filterAttributes    = qt 4.8.1 qtrefdoc
-qhp.Qt.customFilters.Qt.name = Qt 4.8.1
-qhp.Qt.customFilters.Qt.filterAttributes = qt 4.8.1
+qhp.Qt.filterAttributes    = qt 4.8.2 qtrefdoc
+qhp.Qt.customFilters.Qt.name = Qt 4.8.2
+qhp.Qt.customFilters.Qt.filterAttributes = qt 4.8.2
 qhp.Qt.subprojects         = classes overviews examples
 qhp.Qt.subprojects.classes.title = Classes
 qhp.Qt.subprojects.classes.indexTitle = Qt's Classes
@@ -38,7 +38,7 @@ qhp.Qt.subprojects.examples.selectors = fake:example
 dita.metadata.default.author      = Qt Development Frameworks
 dita.metadata.default.permissions = all
 dita.metadata.default.publisher   = Nokia
-dita.metadata.default.copyryear = 2011
+dita.metadata.default.copyryear = 2012
 dita.metadata.default.copyrholder = Nokia
 dita.metadata.default.audience = programmer