qt 4.8.2-1 màj port

7 files changed, 317 insertions, 482 deletions

diff --git a/qt/.footprint.i686 b/qt/.footprint.i686
index 7e768ac30..f5cfd177b 100644
--- a/qt/.footprint.i686
+++ b/qt/.footprint.i686
@@ -514,6 +514,7 @@ drwxr-xr-x	root/root	usr/include/Qt/
 -rw-r--r--	root/root	usr/include/Qt/qnetworkcookie.h
 -rw-r--r--	root/root	usr/include/Qt/qnetworkcookiejar.h
 -rw-r--r--	root/root	usr/include/Qt/qnetworkdiskcache.h
+-rw-r--r--	root/root	usr/include/Qt/qnetworkfunctions_wince.h
 -rw-r--r--	root/root	usr/include/Qt/qnetworkinterface.h
 -rw-r--r--	root/root	usr/include/Qt/qnetworkproxy.h
 -rw-r--r--	root/root	usr/include/Qt/qnetworkreply.h
@@ -2698,6 +2699,7 @@ drwxr-xr-x	root/root	usr/include/QtNetwork/
 -rw-r--r--	root/root	usr/include/QtNetwork/qnetworkcookie.h
 -rw-r--r--	root/root	usr/include/QtNetwork/qnetworkcookiejar.h
 -rw-r--r--	root/root	usr/include/QtNetwork/qnetworkdiskcache.h
+-rw-r--r--	root/root	usr/include/QtNetwork/qnetworkfunctions_wince.h
 -rw-r--r--	root/root	usr/include/QtNetwork/qnetworkinterface.h
 -rw-r--r--	root/root	usr/include/QtNetwork/qnetworkproxy.h
 -rw-r--r--	root/root	usr/include/QtNetwork/qnetworkreply.h
@@ -2992,124 +2994,124 @@ drwxr-xr-x	root/root	usr/include/QtXmlPatterns/
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libQt3Support.la
 -rw-r--r--	root/root	usr/lib/libQt3Support.prl
-lrwxrwxrwx	root/root	usr/lib/libQt3Support.so -> libQt3Support.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQt3Support.so.4 -> libQt3Support.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQt3Support.so.4.8 -> libQt3Support.so.4.8.0
--rwxr-xr-x	root/root	usr/lib/libQt3Support.so.4.8.0
+lrwxrwxrwx	root/root	usr/lib/libQt3Support.so -> libQt3Support.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQt3Support.so.4 -> libQt3Support.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQt3Support.so.4.8 -> libQt3Support.so.4.8.2
+-rwxr-xr-x	root/root	usr/lib/libQt3Support.so.4.8.2
 -rw-r--r--	root/root	usr/lib/libQtCLucene.la
 -rw-r--r--	root/root	usr/lib/libQtCLucene.prl
-lrwxrwxrwx	root/root	usr/lib/libQtCLucene.so -> libQtCLucene.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtCLucene.so.4 -> libQtCLucene.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtCLucene.so.4.8 -> libQtCLucene.so.4.8.0
--rwxr-xr-x	root/root	usr/lib/libQtCLucene.so.4.8.0
+lrwxrwxrwx	root/root	usr/lib/libQtCLucene.so -> libQtCLucene.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtCLucene.so.4 -> libQtCLucene.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtCLucene.so.4.8 -> libQtCLucene.so.4.8.2
+-rwxr-xr-x	root/root	usr/lib/libQtCLucene.so.4.8.2
 -rw-r--r--	root/root	usr/lib/libQtCore.la
 -rw-r--r--	root/root	usr/lib/libQtCore.prl
-lrwxrwxrwx	root/root	usr/lib/libQtCore.so -> libQtCore.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtCore.so.4 -> libQtCore.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtCore.so.4.8 -> libQtCore.so.4.8.0
--rwxr-xr-x	root/root	usr/lib/libQtCore.so.4.8.0
+lrwxrwxrwx	root/root	usr/lib/libQtCore.so -> libQtCore.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtCore.so.4 -> libQtCore.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtCore.so.4.8 -> libQtCore.so.4.8.2
+-rwxr-xr-x	root/root	usr/lib/libQtCore.so.4.8.2
 -rw-r--r--	root/root	usr/lib/libQtDBus.la
 -rw-r--r--	root/root	usr/lib/libQtDBus.prl
-lrwxrwxrwx	root/root	usr/lib/libQtDBus.so -> libQtDBus.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtDBus.so.4 -> libQtDBus.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtDBus.so.4.8 -> libQtDBus.so.4.8.0
--rwxr-xr-x	root/root	usr/lib/libQtDBus.so.4.8.0
+lrwxrwxrwx	root/root	usr/lib/libQtDBus.so -> libQtDBus.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtDBus.so.4 -> libQtDBus.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtDBus.so.4.8 -> libQtDBus.so.4.8.2
+-rwxr-xr-x	root/root	usr/lib/libQtDBus.so.4.8.2
 -rw-r--r--	root/root	usr/lib/libQtDeclarative.la
 -rw-r--r--	root/root	usr/lib/libQtDeclarative.prl
-lrwxrwxrwx	root/root	usr/lib/libQtDeclarative.so -> libQtDeclarative.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtDeclarative.so.4 -> libQtDeclarative.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtDeclarative.so.4.8 -> libQtDeclarative.so.4.8.0
--rwxr-xr-x	root/root	usr/lib/libQtDeclarative.so.4.8.0
+lrwxrwxrwx	root/root	usr/lib/libQtDeclarative.so -> libQtDeclarative.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtDeclarative.so.4 -> libQtDeclarative.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtDeclarative.so.4.8 -> libQtDeclarative.so.4.8.2
+-rwxr-xr-x	root/root	usr/lib/libQtDeclarative.so.4.8.2
 -rw-r--r--	root/root	usr/lib/libQtDesigner.prl
-lrwxrwxrwx	root/root	usr/lib/libQtDesigner.so -> libQtDesigner.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtDesigner.so.4 -> libQtDesigner.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtDesigner.so.4.8 -> libQtDesigner.so.4.8.0
--rwxr-xr-x	root/root	usr/lib/libQtDesigner.so.4.8.0
+lrwxrwxrwx	root/root	usr/lib/libQtDesigner.so -> libQtDesigner.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtDesigner.so.4 -> libQtDesigner.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtDesigner.so.4.8 -> libQtDesigner.so.4.8.2
+-rwxr-xr-x	root/root	usr/lib/libQtDesigner.so.4.8.2
 -rw-r--r--	root/root	usr/lib/libQtDesignerComponents.prl
-lrwxrwxrwx	root/root	usr/lib/libQtDesignerComponents.so -> libQtDesignerComponents.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtDesignerComponents.so.4 -> libQtDesignerComponents.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtDesignerComponents.so.4.8 -> libQtDesignerComponents.so.4.8.0
--rwxr-xr-x	root/root	usr/lib/libQtDesignerComponents.so.4.8.0
+lrwxrwxrwx	root/root	usr/lib/libQtDesignerComponents.so -> libQtDesignerComponents.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtDesignerComponents.so.4 -> libQtDesignerComponents.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtDesignerComponents.so.4.8 -> libQtDesignerComponents.so.4.8.2
+-rwxr-xr-x	root/root	usr/lib/libQtDesignerComponents.so.4.8.2
 -rw-r--r--	root/root	usr/lib/libQtGui.la
 -rw-r--r--	root/root	usr/lib/libQtGui.prl
-lrwxrwxrwx	root/root	usr/lib/libQtGui.so -> libQtGui.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtGui.so.4 -> libQtGui.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtGui.so.4.8 -> libQtGui.so.4.8.0
--rwxr-xr-x	root/root	usr/lib/libQtGui.so.4.8.0
+lrwxrwxrwx	root/root	usr/lib/libQtGui.so -> libQtGui.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtGui.so.4 -> libQtGui.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtGui.so.4.8 -> libQtGui.so.4.8.2
+-rwxr-xr-x	root/root	usr/lib/libQtGui.so.4.8.2
 -rw-r--r--	root/root	usr/lib/libQtHelp.la
 -rw-r--r--	root/root	usr/lib/libQtHelp.prl
-lrwxrwxrwx	root/root	usr/lib/libQtHelp.so -> libQtHelp.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtHelp.so.4 -> libQtHelp.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtHelp.so.4.8 -> libQtHelp.so.4.8.0
--rwxr-xr-x	root/root	usr/lib/libQtHelp.so.4.8.0
+lrwxrwxrwx	root/root	usr/lib/libQtHelp.so -> libQtHelp.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtHelp.so.4 -> libQtHelp.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtHelp.so.4.8 -> libQtHelp.so.4.8.2
+-rwxr-xr-x	root/root	usr/lib/libQtHelp.so.4.8.2
 -rw-r--r--	root/root	usr/lib/libQtMultimedia.la
 -rw-r--r--	root/root	usr/lib/libQtMultimedia.prl
-lrwxrwxrwx	root/root	usr/lib/libQtMultimedia.so -> libQtMultimedia.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtMultimedia.so.4 -> libQtMultimedia.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtMultimedia.so.4.8 -> libQtMultimedia.so.4.8.0
--rwxr-xr-x	root/root	usr/lib/libQtMultimedia.so.4.8.0
+lrwxrwxrwx	root/root	usr/lib/libQtMultimedia.so -> libQtMultimedia.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtMultimedia.so.4 -> libQtMultimedia.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtMultimedia.so.4.8 -> libQtMultimedia.so.4.8.2
+-rwxr-xr-x	root/root	usr/lib/libQtMultimedia.so.4.8.2
 -rw-r--r--	root/root	usr/lib/libQtNetwork.la
 -rw-r--r--	root/root	usr/lib/libQtNetwork.prl
-lrwxrwxrwx	root/root	usr/lib/libQtNetwork.so -> libQtNetwork.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtNetwork.so.4 -> libQtNetwork.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtNetwork.so.4.8 -> libQtNetwork.so.4.8.0
--rwxr-xr-x	root/root	usr/lib/libQtNetwork.so.4.8.0
+lrwxrwxrwx	root/root	usr/lib/libQtNetwork.so -> libQtNetwork.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtNetwork.so.4 -> libQtNetwork.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtNetwork.so.4.8 -> libQtNetwork.so.4.8.2
+-rwxr-xr-x	root/root	usr/lib/libQtNetwork.so.4.8.2
 -rw-r--r--	root/root	usr/lib/libQtOpenGL.la
 -rw-r--r--	root/root	usr/lib/libQtOpenGL.prl
-lrwxrwxrwx	root/root	usr/lib/libQtOpenGL.so -> libQtOpenGL.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtOpenGL.so.4 -> libQtOpenGL.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtOpenGL.so.4.8 -> libQtOpenGL.so.4.8.0
--rwxr-xr-x	root/root	usr/lib/libQtOpenGL.so.4.8.0
+lrwxrwxrwx	root/root	usr/lib/libQtOpenGL.so -> libQtOpenGL.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtOpenGL.so.4 -> libQtOpenGL.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtOpenGL.so.4.8 -> libQtOpenGL.so.4.8.2
+-rwxr-xr-x	root/root	usr/lib/libQtOpenGL.so.4.8.2
 -rw-r--r--	root/root	usr/lib/libQtOpenVG.la
 -rw-r--r--	root/root	usr/lib/libQtOpenVG.prl
-lrwxrwxrwx	root/root	usr/lib/libQtOpenVG.so -> libQtOpenVG.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtOpenVG.so.4 -> libQtOpenVG.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtOpenVG.so.4.8 -> libQtOpenVG.so.4.8.0
--rwxr-xr-x	root/root	usr/lib/libQtOpenVG.so.4.8.0
+lrwxrwxrwx	root/root	usr/lib/libQtOpenVG.so -> libQtOpenVG.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtOpenVG.so.4 -> libQtOpenVG.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtOpenVG.so.4.8 -> libQtOpenVG.so.4.8.2
+-rwxr-xr-x	root/root	usr/lib/libQtOpenVG.so.4.8.2
 -rw-r--r--	root/root	usr/lib/libQtScript.la
 -rw-r--r--	root/root	usr/lib/libQtScript.prl
-lrwxrwxrwx	root/root	usr/lib/libQtScript.so -> libQtScript.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtScript.so.4 -> libQtScript.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtScript.so.4.8 -> libQtScript.so.4.8.0
--rwxr-xr-x	root/root	usr/lib/libQtScript.so.4.8.0
+lrwxrwxrwx	root/root	usr/lib/libQtScript.so -> libQtScript.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtScript.so.4 -> libQtScript.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtScript.so.4.8 -> libQtScript.so.4.8.2
+-rwxr-xr-x	root/root	usr/lib/libQtScript.so.4.8.2
 -rw-r--r--	root/root	usr/lib/libQtScriptTools.la
 -rw-r--r--	root/root	usr/lib/libQtScriptTools.prl
-lrwxrwxrwx	root/root	usr/lib/libQtScriptTools.so -> libQtScriptTools.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtScriptTools.so.4 -> libQtScriptTools.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtScriptTools.so.4.8 -> libQtScriptTools.so.4.8.0
--rwxr-xr-x	root/root	usr/lib/libQtScriptTools.so.4.8.0
+lrwxrwxrwx	root/root	usr/lib/libQtScriptTools.so -> libQtScriptTools.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtScriptTools.so.4 -> libQtScriptTools.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtScriptTools.so.4.8 -> libQtScriptTools.so.4.8.2
+-rwxr-xr-x	root/root	usr/lib/libQtScriptTools.so.4.8.2
 -rw-r--r--	root/root	usr/lib/libQtSql.la
 -rw-r--r--	root/root	usr/lib/libQtSql.prl
-lrwxrwxrwx	root/root	usr/lib/libQtSql.so -> libQtSql.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtSql.so.4 -> libQtSql.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtSql.so.4.8 -> libQtSql.so.4.8.0
--rwxr-xr-x	root/root	usr/lib/libQtSql.so.4.8.0
+lrwxrwxrwx	root/root	usr/lib/libQtSql.so -> libQtSql.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtSql.so.4 -> libQtSql.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtSql.so.4.8 -> libQtSql.so.4.8.2
+-rwxr-xr-x	root/root	usr/lib/libQtSql.so.4.8.2
 -rw-r--r--	root/root	usr/lib/libQtSvg.la
 -rw-r--r--	root/root	usr/lib/libQtSvg.prl
-lrwxrwxrwx	root/root	usr/lib/libQtSvg.so -> libQtSvg.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtSvg.so.4 -> libQtSvg.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtSvg.so.4.8 -> libQtSvg.so.4.8.0
--rwxr-xr-x	root/root	usr/lib/libQtSvg.so.4.8.0
+lrwxrwxrwx	root/root	usr/lib/libQtSvg.so -> libQtSvg.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtSvg.so.4 -> libQtSvg.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtSvg.so.4.8 -> libQtSvg.so.4.8.2
+-rwxr-xr-x	root/root	usr/lib/libQtSvg.so.4.8.2
 -rw-r--r--	root/root	usr/lib/libQtTest.la
 -rw-r--r--	root/root	usr/lib/libQtTest.prl
-lrwxrwxrwx	root/root	usr/lib/libQtTest.so -> libQtTest.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtTest.so.4 -> libQtTest.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtTest.so.4.8 -> libQtTest.so.4.8.0
--rwxr-xr-x	root/root	usr/lib/libQtTest.so.4.8.0
+lrwxrwxrwx	root/root	usr/lib/libQtTest.so -> libQtTest.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtTest.so.4 -> libQtTest.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtTest.so.4.8 -> libQtTest.so.4.8.2
+-rwxr-xr-x	root/root	usr/lib/libQtTest.so.4.8.2
 -rw-r--r--	root/root	usr/lib/libQtUiTools.a
 -rw-r--r--	root/root	usr/lib/libQtUiTools.prl
 -rw-r--r--	root/root	usr/lib/libQtXml.la
 -rw-r--r--	root/root	usr/lib/libQtXml.prl
-lrwxrwxrwx	root/root	usr/lib/libQtXml.so -> libQtXml.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtXml.so.4 -> libQtXml.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtXml.so.4.8 -> libQtXml.so.4.8.0
--rwxr-xr-x	root/root	usr/lib/libQtXml.so.4.8.0
+lrwxrwxrwx	root/root	usr/lib/libQtXml.so -> libQtXml.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtXml.so.4 -> libQtXml.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtXml.so.4.8 -> libQtXml.so.4.8.2
+-rwxr-xr-x	root/root	usr/lib/libQtXml.so.4.8.2
 -rw-r--r--	root/root	usr/lib/libQtXmlPatterns.la
 -rw-r--r--	root/root	usr/lib/libQtXmlPatterns.prl
-lrwxrwxrwx	root/root	usr/lib/libQtXmlPatterns.so -> libQtXmlPatterns.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtXmlPatterns.so.4 -> libQtXmlPatterns.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtXmlPatterns.so.4.8 -> libQtXmlPatterns.so.4.8.0
--rwxr-xr-x	root/root	usr/lib/libQtXmlPatterns.so.4.8.0
+lrwxrwxrwx	root/root	usr/lib/libQtXmlPatterns.so -> libQtXmlPatterns.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtXmlPatterns.so.4 -> libQtXmlPatterns.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtXmlPatterns.so.4.8 -> libQtXmlPatterns.so.4.8.2
+-rwxr-xr-x	root/root	usr/lib/libQtXmlPatterns.so.4.8.2
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/Qt3Support.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/QtCLucene.pc
@@ -3203,6 +3205,9 @@ drwxr-xr-x	root/root	usr/share/qt/mkspecs/common/c89/
 -rw-r--r--	root/root	usr/share/qt/mkspecs/common/gcc-base-macx.conf
 -rw-r--r--	root/root	usr/share/qt/mkspecs/common/gcc-base-unix.conf
 -rw-r--r--	root/root	usr/share/qt/mkspecs/common/gcc-base.conf
+-rw-r--r--	root/root	usr/share/qt/mkspecs/common/ghs-base-integrity.conf
+drwxr-xr-x	root/root	usr/share/qt/mkspecs/common/integrity/
+-rw-r--r--	root/root	usr/share/qt/mkspecs/common/integrity/qplatformdefs.h
 -rw-r--r--	root/root	usr/share/qt/mkspecs/common/linux.conf
 -rw-r--r--	root/root	usr/share/qt/mkspecs/common/llvm.conf
 -rw-r--r--	root/root	usr/share/qt/mkspecs/common/mac.conf
@@ -3210,6 +3215,8 @@ drwxr-xr-x	root/root	usr/share/qt/mkspecs/common/mac/
 -rw-r--r--	root/root	usr/share/qt/mkspecs/common/mac/qplatformdefs.h
 drwxr-xr-x	root/root	usr/share/qt/mkspecs/common/posix/
 -rw-r--r--	root/root	usr/share/qt/mkspecs/common/posix/qplatformdefs.h
+-rw-r--r--	root/root	usr/share/qt/mkspecs/common/qcc-base-qnx.conf
+-rw-r--r--	root/root	usr/share/qt/mkspecs/common/qcc-base.conf
 drwxr-xr-x	root/root	usr/share/qt/mkspecs/common/qnx/
 -rw-r--r--	root/root	usr/share/qt/mkspecs/common/qnx/qmake.conf
 -rw-r--r--	root/root	usr/share/qt/mkspecs/common/qnx/qplatformdefs.h
@@ -3256,7 +3263,7 @@ drwxr-xr-x	root/root	usr/share/qt/mkspecs/cygwin-g++/
 drwxr-xr-x	root/root	usr/share/qt/mkspecs/darwin-g++/
 -rw-r--r--	root/root	usr/share/qt/mkspecs/darwin-g++/qmake.conf
 -rw-r--r--	root/root	usr/share/qt/mkspecs/darwin-g++/qplatformdefs.h
-lrwxrwxrwx	root/root	usr/share/qt/mkspecs/default -> linux-g++
+lrwxrwxrwx	root/root	usr/share/qt/mkspecs/default -> linux-g++-64
 drwxr-xr-x	root/root	usr/share/qt/mkspecs/features/
 -rw-r--r--	root/root	usr/share/qt/mkspecs/features/build_pass.prf
 -rw-r--r--	root/root	usr/share/qt/mkspecs/features/dbusadaptors.prf
@@ -3381,12 +3388,9 @@ drwxr-xr-x	root/root	usr/share/qt/mkspecs/features/win32/
 drwxr-xr-x	root/root	usr/share/qt/mkspecs/freebsd-g++/
 -rw-r--r--	root/root	usr/share/qt/mkspecs/freebsd-g++/qmake.conf
 -rw-r--r--	root/root	usr/share/qt/mkspecs/freebsd-g++/qplatformdefs.h
-drwxr-xr-x	root/root	usr/share/qt/mkspecs/freebsd-g++34/
--rw-r--r--	root/root	usr/share/qt/mkspecs/freebsd-g++34/qmake.conf
--rw-r--r--	root/root	usr/share/qt/mkspecs/freebsd-g++34/qplatformdefs.h
-drwxr-xr-x	root/root	usr/share/qt/mkspecs/freebsd-g++40/
--rw-r--r--	root/root	usr/share/qt/mkspecs/freebsd-g++40/qmake.conf
--rw-r--r--	root/root	usr/share/qt/mkspecs/freebsd-g++40/qplatformdefs.h
+drwxr-xr-x	root/root	usr/share/qt/mkspecs/freebsd-g++46/
+-rw-r--r--	root/root	usr/share/qt/mkspecs/freebsd-g++46/qmake.conf
+-rw-r--r--	root/root	usr/share/qt/mkspecs/freebsd-g++46/qplatformdefs.h
 drwxr-xr-x	root/root	usr/share/qt/mkspecs/freebsd-icc/
 -rw-r--r--	root/root	usr/share/qt/mkspecs/freebsd-icc/qmake.conf
 -rw-r--r--	root/root	usr/share/qt/mkspecs/freebsd-icc/qplatformdefs.h
@@ -3429,6 +3433,9 @@ drwxr-xr-x	root/root	usr/share/qt/mkspecs/irix-g++-64/
 drwxr-xr-x	root/root	usr/share/qt/mkspecs/irix-g++/
 -rw-r--r--	root/root	usr/share/qt/mkspecs/irix-g++/qmake.conf
 -rw-r--r--	root/root	usr/share/qt/mkspecs/irix-g++/qplatformdefs.h
+drwxr-xr-x	root/root	usr/share/qt/mkspecs/linux-arm-gnueabi-g++/
+-rw-r--r--	root/root	usr/share/qt/mkspecs/linux-arm-gnueabi-g++/qmake.conf
+-rw-r--r--	root/root	usr/share/qt/mkspecs/linux-arm-gnueabi-g++/qplatformdefs.h
 drwxr-xr-x	root/root	usr/share/qt/mkspecs/linux-cxx/
 -rw-r--r--	root/root	usr/share/qt/mkspecs/linux-cxx/qmake.conf
 -rw-r--r--	root/root	usr/share/qt/mkspecs/linux-cxx/qplatformdefs.h
@@ -3514,6 +3521,15 @@ drwxr-xr-x	root/root	usr/share/qt/mkspecs/openbsd-g++/
 -rw-r--r--	root/root	usr/share/qt/mkspecs/openbsd-g++/qplatformdefs.h
 -rw-r--r--	root/root	usr/share/qt/mkspecs/qconfig.pri
 drwxr-xr-x	root/root	usr/share/qt/mkspecs/qpa/
+drwxr-xr-x	root/root	usr/share/qt/mkspecs/qpa/common/
+-rw-r--r--	root/root	usr/share/qt/mkspecs/qpa/common/g++-base-macx-iphone.conf
+-rw-r--r--	root/root	usr/share/qt/mkspecs/qpa/common/g++-base-macx-iphonedevice.conf
+drwxr-xr-x	root/root	usr/share/qt/mkspecs/qpa/macx-iphonedevice-g++-armv6/
+-rw-r--r--	root/root	usr/share/qt/mkspecs/qpa/macx-iphonedevice-g++-armv6/qmake.conf
+-rw-r--r--	root/root	usr/share/qt/mkspecs/qpa/macx-iphonedevice-g++-armv6/qplatformdefs.h
+drwxr-xr-x	root/root	usr/share/qt/mkspecs/qpa/macx-iphonedevice-g++-armv7-nothumb/
+-rw-r--r--	root/root	usr/share/qt/mkspecs/qpa/macx-iphonedevice-g++-armv7-nothumb/qmake.conf
+-rw-r--r--	root/root	usr/share/qt/mkspecs/qpa/macx-iphonedevice-g++-armv7-nothumb/qplatformdefs.h
 drwxr-xr-x	root/root	usr/share/qt/mkspecs/qpa/macx-iphonedevice-g++/
 -rw-r--r--	root/root	usr/share/qt/mkspecs/qpa/macx-iphonedevice-g++/qmake.conf
 -rw-r--r--	root/root	usr/share/qt/mkspecs/qpa/macx-iphonedevice-g++/qplatformdefs.h
@@ -3524,6 +3540,15 @@ drwxr-xr-x	root/root	usr/share/qt/mkspecs/qws/
 drwxr-xr-x	root/root	usr/share/qt/mkspecs/qws/freebsd-generic-g++/
 -rw-r--r--	root/root	usr/share/qt/mkspecs/qws/freebsd-generic-g++/qmake.conf
 -rw-r--r--	root/root	usr/share/qt/mkspecs/qws/freebsd-generic-g++/qplatformdefs.h
+drwxr-xr-x	root/root	usr/share/qt/mkspecs/qws/integrity-arm-cxarm/
+-rw-r--r--	root/root	usr/share/qt/mkspecs/qws/integrity-arm-cxarm/qmake.conf
+-rw-r--r--	root/root	usr/share/qt/mkspecs/qws/integrity-arm-cxarm/qplatformdefs.h
+drwxr-xr-x	root/root	usr/share/qt/mkspecs/qws/integrity-ppc-cxppc/
+-rw-r--r--	root/root	usr/share/qt/mkspecs/qws/integrity-ppc-cxppc/qmake.conf
+-rw-r--r--	root/root	usr/share/qt/mkspecs/qws/integrity-ppc-cxppc/qplatformdefs.h
+drwxr-xr-x	root/root	usr/share/qt/mkspecs/qws/integrity-x86-cx86/
+-rw-r--r--	root/root	usr/share/qt/mkspecs/qws/integrity-x86-cx86/qmake.conf
+-rw-r--r--	root/root	usr/share/qt/mkspecs/qws/integrity-x86-cx86/qplatformdefs.h
 drwxr-xr-x	root/root	usr/share/qt/mkspecs/qws/linux-arm-g++/
 -rw-r--r--	root/root	usr/share/qt/mkspecs/qws/linux-arm-g++/qmake.conf
 -rw-r--r--	root/root	usr/share/qt/mkspecs/qws/linux-arm-g++/qplatformdefs.h
@@ -3590,6 +3615,21 @@ drwxr-xr-x	root/root	usr/share/qt/mkspecs/qws/macx-generic-g++/
 drwxr-xr-x	root/root	usr/share/qt/mkspecs/qws/macx-nacl-g++/
 -rw-r--r--	root/root	usr/share/qt/mkspecs/qws/macx-nacl-g++/qmake.conf
 -rw-r--r--	root/root	usr/share/qt/mkspecs/qws/macx-nacl-g++/qplatformdefs.h
+drwxr-xr-x	root/root	usr/share/qt/mkspecs/qws/qnx-arm-g++/
+-rw-r--r--	root/root	usr/share/qt/mkspecs/qws/qnx-arm-g++/qmake.conf
+-rw-r--r--	root/root	usr/share/qt/mkspecs/qws/qnx-arm-g++/qplatformdefs.h
+drwxr-xr-x	root/root	usr/share/qt/mkspecs/qws/qnx-armv7-g++/
+-rw-r--r--	root/root	usr/share/qt/mkspecs/qws/qnx-armv7-g++/qmake.conf
+-rw-r--r--	root/root	usr/share/qt/mkspecs/qws/qnx-armv7-g++/qplatformdefs.h
+drwxr-xr-x	root/root	usr/share/qt/mkspecs/qws/qnx-generic-g++/
+-rw-r--r--	root/root	usr/share/qt/mkspecs/qws/qnx-generic-g++/qmake.conf
+-rw-r--r--	root/root	usr/share/qt/mkspecs/qws/qnx-generic-g++/qplatformdefs.h
+drwxr-xr-x	root/root	usr/share/qt/mkspecs/qws/qnx-i386-g++/
+-rw-r--r--	root/root	usr/share/qt/mkspecs/qws/qnx-i386-g++/qmake.conf
+-rw-r--r--	root/root	usr/share/qt/mkspecs/qws/qnx-i386-g++/qplatformdefs.h
+drwxr-xr-x	root/root	usr/share/qt/mkspecs/qws/qnx-ppc-g++/
+-rw-r--r--	root/root	usr/share/qt/mkspecs/qws/qnx-ppc-g++/qmake.conf
+-rw-r--r--	root/root	usr/share/qt/mkspecs/qws/qnx-ppc-g++/qplatformdefs.h
 drwxr-xr-x	root/root	usr/share/qt/mkspecs/qws/solaris-generic-g++/
 -rw-r--r--	root/root	usr/share/qt/mkspecs/qws/solaris-generic-g++/qmake.conf
 -rw-r--r--	root/root	usr/share/qt/mkspecs/qws/solaris-generic-g++/qplatformdefs.h
@@ -3654,9 +3694,12 @@ drwxr-xr-x	root/root	usr/share/qt/mkspecs/unixware-g++/
 -rw-r--r--	root/root	usr/share/qt/mkspecs/unixware-g++/qmake.conf
 -rw-r--r--	root/root	usr/share/qt/mkspecs/unixware-g++/qplatformdefs.h
 drwxr-xr-x	root/root	usr/share/qt/mkspecs/unsupported/
-drwxr-xr-x	root/root	usr/share/qt/mkspecs/unsupported/integrity-ghs/
--rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/integrity-ghs/qmake.conf
--rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/integrity-ghs/qplatformdefs.h
+drwxr-xr-x	root/root	usr/share/qt/mkspecs/unsupported/blackberry-armv7le-qcc/
+-rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/blackberry-armv7le-qcc/qmake.conf
+-rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/blackberry-armv7le-qcc/qplatformdefs.h
+drwxr-xr-x	root/root	usr/share/qt/mkspecs/unsupported/blackberry-x86-qcc/
+-rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/blackberry-x86-qcc/qmake.conf
+-rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/blackberry-x86-qcc/qplatformdefs.h
 drwxr-xr-x	root/root	usr/share/qt/mkspecs/unsupported/linux-armcc/
 -rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/linux-armcc/qmake.conf
 -rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/linux-armcc/qplatformdefs.h
@@ -3674,37 +3717,25 @@ drwxr-xr-x	root/root	usr/share/qt/mkspecs/unsupported/macx-clang/
 -rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/macx-clang/Info.plist.lib
 -rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/macx-clang/qmake.conf
 -rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/macx-clang/qplatformdefs.h
-drwxr-xr-x	root/root	usr/share/qt/mkspecs/unsupported/qnx-g++/
--rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/qnx-g++/qmake.conf
--rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/qnx-g++/qplatformdefs.h
+drwxr-xr-x	root/root	usr/share/qt/mkspecs/unsupported/qnx-X11-g++/
+-rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/qnx-X11-g++/qmake.conf
+-rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/qnx-X11-g++/qplatformdefs.h
+drwxr-xr-x	root/root	usr/share/qt/mkspecs/unsupported/qnx-armv7le-qcc/
+-rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/qnx-armv7le-qcc/qmake.conf
+-rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/qnx-armv7le-qcc/qplatformdefs.h
+drwxr-xr-x	root/root	usr/share/qt/mkspecs/unsupported/qnx-x86-qcc/
+-rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/qnx-x86-qcc/qmake.conf
+-rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/qnx-x86-qcc/qplatformdefs.h
 drwxr-xr-x	root/root	usr/share/qt/mkspecs/unsupported/qws/
-drwxr-xr-x	root/root	usr/share/qt/mkspecs/unsupported/qws/integrity-arm-cxarm/
--rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/qws/integrity-arm-cxarm/qmake.conf
--rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/qws/integrity-arm-cxarm/qplatformdefs.h
-drwxr-xr-x	root/root	usr/share/qt/mkspecs/unsupported/qws/integrity-ppc-cxppc/
--rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/qws/integrity-ppc-cxppc/qmake.conf
--rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/qws/integrity-ppc-cxppc/qplatformdefs.h
+drwxr-xr-x	root/root	usr/share/qt/mkspecs/unsupported/qws/integrity-x86-cx86/
+-rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/qws/integrity-x86-cx86/qmake.conf
+-rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/qws/integrity-x86-cx86/qplatformdefs.h
 drwxr-xr-x	root/root	usr/share/qt/mkspecs/unsupported/qws/linux-x86-openkode-g++/
 -rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/qws/linux-x86-openkode-g++/qmake.conf
 -rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h
 drwxr-xr-x	root/root	usr/share/qt/mkspecs/unsupported/qws/qnx-641/
 -rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/qws/qnx-641/qmake.conf
 -rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/qws/qnx-641/qplatformdefs.h
-drwxr-xr-x	root/root	usr/share/qt/mkspecs/unsupported/qws/qnx-arm-g++/
--rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/qws/qnx-arm-g++/qmake.conf
--rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/qws/qnx-arm-g++/qplatformdefs.h
-drwxr-xr-x	root/root	usr/share/qt/mkspecs/unsupported/qws/qnx-armv7-g++/
--rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/qws/qnx-armv7-g++/qmake.conf
--rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/qws/qnx-armv7-g++/qplatformdefs.h
-drwxr-xr-x	root/root	usr/share/qt/mkspecs/unsupported/qws/qnx-generic-g++/
--rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf
--rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/qws/qnx-generic-g++/qplatformdefs.h
-drwxr-xr-x	root/root	usr/share/qt/mkspecs/unsupported/qws/qnx-i386-g++/
--rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/qws/qnx-i386-g++/qmake.conf
--rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/qws/qnx-i386-g++/qplatformdefs.h
-drwxr-xr-x	root/root	usr/share/qt/mkspecs/unsupported/qws/qnx-ppc-g++/
--rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/qws/qnx-ppc-g++/qmake.conf
--rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/qws/qnx-ppc-g++/qplatformdefs.h
 drwxr-xr-x	root/root	usr/share/qt/mkspecs/unsupported/vxworks-ppc-dcc/
 -rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf
 -rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/vxworks-ppc-dcc/qplatformdefs.h
@@ -3717,6 +3748,9 @@ drwxr-xr-x	root/root	usr/share/qt/mkspecs/unsupported/vxworks-simpentium-dcc/
 drwxr-xr-x	root/root	usr/share/qt/mkspecs/unsupported/vxworks-simpentium-g++/
 -rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/vxworks-simpentium-g++/qmake.conf
 -rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/vxworks-simpentium-g++/qplatformdefs.h
+drwxr-xr-x	root/root	usr/share/qt/mkspecs/unsupported/win32-g++-4.6-cross/
+-rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/win32-g++-4.6-cross/qmake.conf
+-rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/win32-g++-4.6-cross/qplatformdefs.h
 drwxr-xr-x	root/root	usr/share/qt/mkspecs/unsupported/win32-g++-cross/
 -rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/win32-g++-cross/qmake.conf
 -rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/win32-g++-cross/qplatformdefs.h
@@ -3786,6 +3820,14 @@ drwxr-xr-x	root/root	usr/share/qt/mkspecs/wince60standard-armv4i-msvc2005/
 drwxr-xr-x	root/root	usr/share/qt/mkspecs/wince60standard-x86-msvc2005/
 -rw-r--r--	root/root	usr/share/qt/mkspecs/wince60standard-x86-msvc2005/qmake.conf
 -rw-r--r--	root/root	usr/share/qt/mkspecs/wince60standard-x86-msvc2005/qplatformdefs.h
+drwxr-xr-x	root/root	usr/share/qt/mkspecs/wince70embedded-armv4i-msvc2008/
+-rw-r--r--	root/root	usr/share/qt/mkspecs/wince70embedded-armv4i-msvc2008/default_post.prf
+-rw-r--r--	root/root	usr/share/qt/mkspecs/wince70embedded-armv4i-msvc2008/qmake.conf
+-rw-r--r--	root/root	usr/share/qt/mkspecs/wince70embedded-armv4i-msvc2008/qplatformdefs.h
+drwxr-xr-x	root/root	usr/share/qt/mkspecs/wince70embedded-x86-msvc2008/
+-rw-r--r--	root/root	usr/share/qt/mkspecs/wince70embedded-x86-msvc2008/default_post.prf
+-rw-r--r--	root/root	usr/share/qt/mkspecs/wince70embedded-x86-msvc2008/qmake.conf
+-rw-r--r--	root/root	usr/share/qt/mkspecs/wince70embedded-x86-msvc2008/qplatformdefs.h
 drwxr-xr-x	root/root	usr/share/qt/mkspecs/wincewm50pocket-msvc2005/
 -rw-r--r--	root/root	usr/share/qt/mkspecs/wincewm50pocket-msvc2005/default_post.prf
 -rw-r--r--	root/root	usr/share/qt/mkspecs/wincewm50pocket-msvc2005/qmake.conf
diff --git a/qt/.footprint.x86_64 b/qt/.footprint.x86_64
index 7e768ac30..f5cfd177b 100644
--- a/qt/.footprint.x86_64
+++ b/qt/.footprint.x86_64
@@ -514,6 +514,7 @@ drwxr-xr-x	root/root	usr/include/Qt/
 -rw-r--r--	root/root	usr/include/Qt/qnetworkcookie.h
 -rw-r--r--	root/root	usr/include/Qt/qnetworkcookiejar.h
 -rw-r--r--	root/root	usr/include/Qt/qnetworkdiskcache.h
+-rw-r--r--	root/root	usr/include/Qt/qnetworkfunctions_wince.h
 -rw-r--r--	root/root	usr/include/Qt/qnetworkinterface.h
 -rw-r--r--	root/root	usr/include/Qt/qnetworkproxy.h
 -rw-r--r--	root/root	usr/include/Qt/qnetworkreply.h
@@ -2698,6 +2699,7 @@ drwxr-xr-x	root/root	usr/include/QtNetwork/
 -rw-r--r--	root/root	usr/include/QtNetwork/qnetworkcookie.h
 -rw-r--r--	root/root	usr/include/QtNetwork/qnetworkcookiejar.h
 -rw-r--r--	root/root	usr/include/QtNetwork/qnetworkdiskcache.h
+-rw-r--r--	root/root	usr/include/QtNetwork/qnetworkfunctions_wince.h
 -rw-r--r--	root/root	usr/include/QtNetwork/qnetworkinterface.h
 -rw-r--r--	root/root	usr/include/QtNetwork/qnetworkproxy.h
 -rw-r--r--	root/root	usr/include/QtNetwork/qnetworkreply.h
@@ -2992,124 +2994,124 @@ drwxr-xr-x	root/root	usr/include/QtXmlPatterns/
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libQt3Support.la
 -rw-r--r--	root/root	usr/lib/libQt3Support.prl
-lrwxrwxrwx	root/root	usr/lib/libQt3Support.so -> libQt3Support.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQt3Support.so.4 -> libQt3Support.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQt3Support.so.4.8 -> libQt3Support.so.4.8.0
--rwxr-xr-x	root/root	usr/lib/libQt3Support.so.4.8.0
+lrwxrwxrwx	root/root	usr/lib/libQt3Support.so -> libQt3Support.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQt3Support.so.4 -> libQt3Support.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQt3Support.so.4.8 -> libQt3Support.so.4.8.2
+-rwxr-xr-x	root/root	usr/lib/libQt3Support.so.4.8.2
 -rw-r--r--	root/root	usr/lib/libQtCLucene.la
 -rw-r--r--	root/root	usr/lib/libQtCLucene.prl
-lrwxrwxrwx	root/root	usr/lib/libQtCLucene.so -> libQtCLucene.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtCLucene.so.4 -> libQtCLucene.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtCLucene.so.4.8 -> libQtCLucene.so.4.8.0
--rwxr-xr-x	root/root	usr/lib/libQtCLucene.so.4.8.0
+lrwxrwxrwx	root/root	usr/lib/libQtCLucene.so -> libQtCLucene.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtCLucene.so.4 -> libQtCLucene.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtCLucene.so.4.8 -> libQtCLucene.so.4.8.2
+-rwxr-xr-x	root/root	usr/lib/libQtCLucene.so.4.8.2
 -rw-r--r--	root/root	usr/lib/libQtCore.la
 -rw-r--r--	root/root	usr/lib/libQtCore.prl
-lrwxrwxrwx	root/root	usr/lib/libQtCore.so -> libQtCore.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtCore.so.4 -> libQtCore.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtCore.so.4.8 -> libQtCore.so.4.8.0
--rwxr-xr-x	root/root	usr/lib/libQtCore.so.4.8.0
+lrwxrwxrwx	root/root	usr/lib/libQtCore.so -> libQtCore.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtCore.so.4 -> libQtCore.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtCore.so.4.8 -> libQtCore.so.4.8.2
+-rwxr-xr-x	root/root	usr/lib/libQtCore.so.4.8.2
 -rw-r--r--	root/root	usr/lib/libQtDBus.la
 -rw-r--r--	root/root	usr/lib/libQtDBus.prl
-lrwxrwxrwx	root/root	usr/lib/libQtDBus.so -> libQtDBus.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtDBus.so.4 -> libQtDBus.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtDBus.so.4.8 -> libQtDBus.so.4.8.0
--rwxr-xr-x	root/root	usr/lib/libQtDBus.so.4.8.0
+lrwxrwxrwx	root/root	usr/lib/libQtDBus.so -> libQtDBus.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtDBus.so.4 -> libQtDBus.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtDBus.so.4.8 -> libQtDBus.so.4.8.2
+-rwxr-xr-x	root/root	usr/lib/libQtDBus.so.4.8.2
 -rw-r--r--	root/root	usr/lib/libQtDeclarative.la
 -rw-r--r--	root/root	usr/lib/libQtDeclarative.prl
-lrwxrwxrwx	root/root	usr/lib/libQtDeclarative.so -> libQtDeclarative.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtDeclarative.so.4 -> libQtDeclarative.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtDeclarative.so.4.8 -> libQtDeclarative.so.4.8.0
--rwxr-xr-x	root/root	usr/lib/libQtDeclarative.so.4.8.0
+lrwxrwxrwx	root/root	usr/lib/libQtDeclarative.so -> libQtDeclarative.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtDeclarative.so.4 -> libQtDeclarative.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtDeclarative.so.4.8 -> libQtDeclarative.so.4.8.2
+-rwxr-xr-x	root/root	usr/lib/libQtDeclarative.so.4.8.2
 -rw-r--r--	root/root	usr/lib/libQtDesigner.prl
-lrwxrwxrwx	root/root	usr/lib/libQtDesigner.so -> libQtDesigner.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtDesigner.so.4 -> libQtDesigner.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtDesigner.so.4.8 -> libQtDesigner.so.4.8.0
--rwxr-xr-x	root/root	usr/lib/libQtDesigner.so.4.8.0
+lrwxrwxrwx	root/root	usr/lib/libQtDesigner.so -> libQtDesigner.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtDesigner.so.4 -> libQtDesigner.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtDesigner.so.4.8 -> libQtDesigner.so.4.8.2
+-rwxr-xr-x	root/root	usr/lib/libQtDesigner.so.4.8.2
 -rw-r--r--	root/root	usr/lib/libQtDesignerComponents.prl
-lrwxrwxrwx	root/root	usr/lib/libQtDesignerComponents.so -> libQtDesignerComponents.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtDesignerComponents.so.4 -> libQtDesignerComponents.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtDesignerComponents.so.4.8 -> libQtDesignerComponents.so.4.8.0
--rwxr-xr-x	root/root	usr/lib/libQtDesignerComponents.so.4.8.0
+lrwxrwxrwx	root/root	usr/lib/libQtDesignerComponents.so -> libQtDesignerComponents.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtDesignerComponents.so.4 -> libQtDesignerComponents.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtDesignerComponents.so.4.8 -> libQtDesignerComponents.so.4.8.2
+-rwxr-xr-x	root/root	usr/lib/libQtDesignerComponents.so.4.8.2
 -rw-r--r--	root/root	usr/lib/libQtGui.la
 -rw-r--r--	root/root	usr/lib/libQtGui.prl
-lrwxrwxrwx	root/root	usr/lib/libQtGui.so -> libQtGui.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtGui.so.4 -> libQtGui.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtGui.so.4.8 -> libQtGui.so.4.8.0
--rwxr-xr-x	root/root	usr/lib/libQtGui.so.4.8.0
+lrwxrwxrwx	root/root	usr/lib/libQtGui.so -> libQtGui.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtGui.so.4 -> libQtGui.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtGui.so.4.8 -> libQtGui.so.4.8.2
+-rwxr-xr-x	root/root	usr/lib/libQtGui.so.4.8.2
 -rw-r--r--	root/root	usr/lib/libQtHelp.la
 -rw-r--r--	root/root	usr/lib/libQtHelp.prl
-lrwxrwxrwx	root/root	usr/lib/libQtHelp.so -> libQtHelp.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtHelp.so.4 -> libQtHelp.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtHelp.so.4.8 -> libQtHelp.so.4.8.0
--rwxr-xr-x	root/root	usr/lib/libQtHelp.so.4.8.0
+lrwxrwxrwx	root/root	usr/lib/libQtHelp.so -> libQtHelp.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtHelp.so.4 -> libQtHelp.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtHelp.so.4.8 -> libQtHelp.so.4.8.2
+-rwxr-xr-x	root/root	usr/lib/libQtHelp.so.4.8.2
 -rw-r--r--	root/root	usr/lib/libQtMultimedia.la
 -rw-r--r--	root/root	usr/lib/libQtMultimedia.prl
-lrwxrwxrwx	root/root	usr/lib/libQtMultimedia.so -> libQtMultimedia.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtMultimedia.so.4 -> libQtMultimedia.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtMultimedia.so.4.8 -> libQtMultimedia.so.4.8.0
--rwxr-xr-x	root/root	usr/lib/libQtMultimedia.so.4.8.0
+lrwxrwxrwx	root/root	usr/lib/libQtMultimedia.so -> libQtMultimedia.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtMultimedia.so.4 -> libQtMultimedia.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtMultimedia.so.4.8 -> libQtMultimedia.so.4.8.2
+-rwxr-xr-x	root/root	usr/lib/libQtMultimedia.so.4.8.2
 -rw-r--r--	root/root	usr/lib/libQtNetwork.la
 -rw-r--r--	root/root	usr/lib/libQtNetwork.prl
-lrwxrwxrwx	root/root	usr/lib/libQtNetwork.so -> libQtNetwork.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtNetwork.so.4 -> libQtNetwork.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtNetwork.so.4.8 -> libQtNetwork.so.4.8.0
--rwxr-xr-x	root/root	usr/lib/libQtNetwork.so.4.8.0
+lrwxrwxrwx	root/root	usr/lib/libQtNetwork.so -> libQtNetwork.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtNetwork.so.4 -> libQtNetwork.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtNetwork.so.4.8 -> libQtNetwork.so.4.8.2
+-rwxr-xr-x	root/root	usr/lib/libQtNetwork.so.4.8.2
 -rw-r--r--	root/root	usr/lib/libQtOpenGL.la
 -rw-r--r--	root/root	usr/lib/libQtOpenGL.prl
-lrwxrwxrwx	root/root	usr/lib/libQtOpenGL.so -> libQtOpenGL.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtOpenGL.so.4 -> libQtOpenGL.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtOpenGL.so.4.8 -> libQtOpenGL.so.4.8.0
--rwxr-xr-x	root/root	usr/lib/libQtOpenGL.so.4.8.0
+lrwxrwxrwx	root/root	usr/lib/libQtOpenGL.so -> libQtOpenGL.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtOpenGL.so.4 -> libQtOpenGL.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtOpenGL.so.4.8 -> libQtOpenGL.so.4.8.2
+-rwxr-xr-x	root/root	usr/lib/libQtOpenGL.so.4.8.2
 -rw-r--r--	root/root	usr/lib/libQtOpenVG.la
 -rw-r--r--	root/root	usr/lib/libQtOpenVG.prl
-lrwxrwxrwx	root/root	usr/lib/libQtOpenVG.so -> libQtOpenVG.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtOpenVG.so.4 -> libQtOpenVG.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtOpenVG.so.4.8 -> libQtOpenVG.so.4.8.0
--rwxr-xr-x	root/root	usr/lib/libQtOpenVG.so.4.8.0
+lrwxrwxrwx	root/root	usr/lib/libQtOpenVG.so -> libQtOpenVG.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtOpenVG.so.4 -> libQtOpenVG.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtOpenVG.so.4.8 -> libQtOpenVG.so.4.8.2
+-rwxr-xr-x	root/root	usr/lib/libQtOpenVG.so.4.8.2
 -rw-r--r--	root/root	usr/lib/libQtScript.la
 -rw-r--r--	root/root	usr/lib/libQtScript.prl
-lrwxrwxrwx	root/root	usr/lib/libQtScript.so -> libQtScript.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtScript.so.4 -> libQtScript.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtScript.so.4.8 -> libQtScript.so.4.8.0
--rwxr-xr-x	root/root	usr/lib/libQtScript.so.4.8.0
+lrwxrwxrwx	root/root	usr/lib/libQtScript.so -> libQtScript.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtScript.so.4 -> libQtScript.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtScript.so.4.8 -> libQtScript.so.4.8.2
+-rwxr-xr-x	root/root	usr/lib/libQtScript.so.4.8.2
 -rw-r--r--	root/root	usr/lib/libQtScriptTools.la
 -rw-r--r--	root/root	usr/lib/libQtScriptTools.prl
-lrwxrwxrwx	root/root	usr/lib/libQtScriptTools.so -> libQtScriptTools.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtScriptTools.so.4 -> libQtScriptTools.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtScriptTools.so.4.8 -> libQtScriptTools.so.4.8.0
--rwxr-xr-x	root/root	usr/lib/libQtScriptTools.so.4.8.0
+lrwxrwxrwx	root/root	usr/lib/libQtScriptTools.so -> libQtScriptTools.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtScriptTools.so.4 -> libQtScriptTools.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtScriptTools.so.4.8 -> libQtScriptTools.so.4.8.2
+-rwxr-xr-x	root/root	usr/lib/libQtScriptTools.so.4.8.2
 -rw-r--r--	root/root	usr/lib/libQtSql.la
 -rw-r--r--	root/root	usr/lib/libQtSql.prl
-lrwxrwxrwx	root/root	usr/lib/libQtSql.so -> libQtSql.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtSql.so.4 -> libQtSql.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtSql.so.4.8 -> libQtSql.so.4.8.0
--rwxr-xr-x	root/root	usr/lib/libQtSql.so.4.8.0
+lrwxrwxrwx	root/root	usr/lib/libQtSql.so -> libQtSql.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtSql.so.4 -> libQtSql.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtSql.so.4.8 -> libQtSql.so.4.8.2
+-rwxr-xr-x	root/root	usr/lib/libQtSql.so.4.8.2
 -rw-r--r--	root/root	usr/lib/libQtSvg.la
 -rw-r--r--	root/root	usr/lib/libQtSvg.prl
-lrwxrwxrwx	root/root	usr/lib/libQtSvg.so -> libQtSvg.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtSvg.so.4 -> libQtSvg.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtSvg.so.4.8 -> libQtSvg.so.4.8.0
--rwxr-xr-x	root/root	usr/lib/libQtSvg.so.4.8.0
+lrwxrwxrwx	root/root	usr/lib/libQtSvg.so -> libQtSvg.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtSvg.so.4 -> libQtSvg.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtSvg.so.4.8 -> libQtSvg.so.4.8.2
+-rwxr-xr-x	root/root	usr/lib/libQtSvg.so.4.8.2
 -rw-r--r--	root/root	usr/lib/libQtTest.la
 -rw-r--r--	root/root	usr/lib/libQtTest.prl
-lrwxrwxrwx	root/root	usr/lib/libQtTest.so -> libQtTest.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtTest.so.4 -> libQtTest.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtTest.so.4.8 -> libQtTest.so.4.8.0
--rwxr-xr-x	root/root	usr/lib/libQtTest.so.4.8.0
+lrwxrwxrwx	root/root	usr/lib/libQtTest.so -> libQtTest.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtTest.so.4 -> libQtTest.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtTest.so.4.8 -> libQtTest.so.4.8.2
+-rwxr-xr-x	root/root	usr/lib/libQtTest.so.4.8.2
 -rw-r--r--	root/root	usr/lib/libQtUiTools.a
 -rw-r--r--	root/root	usr/lib/libQtUiTools.prl
 -rw-r--r--	root/root	usr/lib/libQtXml.la
 -rw-r--r--	root/root	usr/lib/libQtXml.prl
-lrwxrwxrwx	root/root	usr/lib/libQtXml.so -> libQtXml.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtXml.so.4 -> libQtXml.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtXml.so.4.8 -> libQtXml.so.4.8.0
--rwxr-xr-x	root/root	usr/lib/libQtXml.so.4.8.0
+lrwxrwxrwx	root/root	usr/lib/libQtXml.so -> libQtXml.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtXml.so.4 -> libQtXml.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtXml.so.4.8 -> libQtXml.so.4.8.2
+-rwxr-xr-x	root/root	usr/lib/libQtXml.so.4.8.2
 -rw-r--r--	root/root	usr/lib/libQtXmlPatterns.la
 -rw-r--r--	root/root	usr/lib/libQtXmlPatterns.prl
-lrwxrwxrwx	root/root	usr/lib/libQtXmlPatterns.so -> libQtXmlPatterns.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtXmlPatterns.so.4 -> libQtXmlPatterns.so.4.8.0
-lrwxrwxrwx	root/root	usr/lib/libQtXmlPatterns.so.4.8 -> libQtXmlPatterns.so.4.8.0
--rwxr-xr-x	root/root	usr/lib/libQtXmlPatterns.so.4.8.0
+lrwxrwxrwx	root/root	usr/lib/libQtXmlPatterns.so -> libQtXmlPatterns.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtXmlPatterns.so.4 -> libQtXmlPatterns.so.4.8.2
+lrwxrwxrwx	root/root	usr/lib/libQtXmlPatterns.so.4.8 -> libQtXmlPatterns.so.4.8.2
+-rwxr-xr-x	root/root	usr/lib/libQtXmlPatterns.so.4.8.2
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/Qt3Support.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/QtCLucene.pc
@@ -3203,6 +3205,9 @@ drwxr-xr-x	root/root	usr/share/qt/mkspecs/common/c89/
 -rw-r--r--	root/root	usr/share/qt/mkspecs/common/gcc-base-macx.conf
 -rw-r--r--	root/root	usr/share/qt/mkspecs/common/gcc-base-unix.conf
 -rw-r--r--	root/root	usr/share/qt/mkspecs/common/gcc-base.conf
+-rw-r--r--	root/root	usr/share/qt/mkspecs/common/ghs-base-integrity.conf
+drwxr-xr-x	root/root	usr/share/qt/mkspecs/common/integrity/
+-rw-r--r--	root/root	usr/share/qt/mkspecs/common/integrity/qplatformdefs.h
 -rw-r--r--	root/root	usr/share/qt/mkspecs/common/linux.conf
 -rw-r--r--	root/root	usr/share/qt/mkspecs/common/llvm.conf
 -rw-r--r--	root/root	usr/share/qt/mkspecs/common/mac.conf
@@ -3210,6 +3215,8 @@ drwxr-xr-x	root/root	usr/share/qt/mkspecs/common/mac/
 -rw-r--r--	root/root	usr/share/qt/mkspecs/common/mac/qplatformdefs.h
 drwxr-xr-x	root/root	usr/share/qt/mkspecs/common/posix/
 -rw-r--r--	root/root	usr/share/qt/mkspecs/common/posix/qplatformdefs.h
+-rw-r--r--	root/root	usr/share/qt/mkspecs/common/qcc-base-qnx.conf
+-rw-r--r--	root/root	usr/share/qt/mkspecs/common/qcc-base.conf
 drwxr-xr-x	root/root	usr/share/qt/mkspecs/common/qnx/
 -rw-r--r--	root/root	usr/share/qt/mkspecs/common/qnx/qmake.conf
 -rw-r--r--	root/root	usr/share/qt/mkspecs/common/qnx/qplatformdefs.h
@@ -3256,7 +3263,7 @@ drwxr-xr-x	root/root	usr/share/qt/mkspecs/cygwin-g++/
 drwxr-xr-x	root/root	usr/share/qt/mkspecs/darwin-g++/
 -rw-r--r--	root/root	usr/share/qt/mkspecs/darwin-g++/qmake.conf
 -rw-r--r--	root/root	usr/share/qt/mkspecs/darwin-g++/qplatformdefs.h
-lrwxrwxrwx	root/root	usr/share/qt/mkspecs/default -> linux-g++
+lrwxrwxrwx	root/root	usr/share/qt/mkspecs/default -> linux-g++-64
 drwxr-xr-x	root/root	usr/share/qt/mkspecs/features/
 -rw-r--r--	root/root	usr/share/qt/mkspecs/features/build_pass.prf
 -rw-r--r--	root/root	usr/share/qt/mkspecs/features/dbusadaptors.prf
@@ -3381,12 +3388,9 @@ drwxr-xr-x	root/root	usr/share/qt/mkspecs/features/win32/
 drwxr-xr-x	root/root	usr/share/qt/mkspecs/freebsd-g++/
 -rw-r--r--	root/root	usr/share/qt/mkspecs/freebsd-g++/qmake.conf
 -rw-r--r--	root/root	usr/share/qt/mkspecs/freebsd-g++/qplatformdefs.h
-drwxr-xr-x	root/root	usr/share/qt/mkspecs/freebsd-g++34/
--rw-r--r--	root/root	usr/share/qt/mkspecs/freebsd-g++34/qmake.conf
--rw-r--r--	root/root	usr/share/qt/mkspecs/freebsd-g++34/qplatformdefs.h
-drwxr-xr-x	root/root	usr/share/qt/mkspecs/freebsd-g++40/
--rw-r--r--	root/root	usr/share/qt/mkspecs/freebsd-g++40/qmake.conf
--rw-r--r--	root/root	usr/share/qt/mkspecs/freebsd-g++40/qplatformdefs.h
+drwxr-xr-x	root/root	usr/share/qt/mkspecs/freebsd-g++46/
+-rw-r--r--	root/root	usr/share/qt/mkspecs/freebsd-g++46/qmake.conf
+-rw-r--r--	root/root	usr/share/qt/mkspecs/freebsd-g++46/qplatformdefs.h
 drwxr-xr-x	root/root	usr/share/qt/mkspecs/freebsd-icc/
 -rw-r--r--	root/root	usr/share/qt/mkspecs/freebsd-icc/qmake.conf
 -rw-r--r--	root/root	usr/share/qt/mkspecs/freebsd-icc/qplatformdefs.h
@@ -3429,6 +3433,9 @@ drwxr-xr-x	root/root	usr/share/qt/mkspecs/irix-g++-64/
 drwxr-xr-x	root/root	usr/share/qt/mkspecs/irix-g++/
 -rw-r--r--	root/root	usr/share/qt/mkspecs/irix-g++/qmake.conf
 -rw-r--r--	root/root	usr/share/qt/mkspecs/irix-g++/qplatformdefs.h
+drwxr-xr-x	root/root	usr/share/qt/mkspecs/linux-arm-gnueabi-g++/
+-rw-r--r--	root/root	usr/share/qt/mkspecs/linux-arm-gnueabi-g++/qmake.conf
+-rw-r--r--	root/root	usr/share/qt/mkspecs/linux-arm-gnueabi-g++/qplatformdefs.h
 drwxr-xr-x	root/root	usr/share/qt/mkspecs/linux-cxx/
 -rw-r--r--	root/root	usr/share/qt/mkspecs/linux-cxx/qmake.conf
 -rw-r--r--	root/root	usr/share/qt/mkspecs/linux-cxx/qplatformdefs.h
@@ -3514,6 +3521,15 @@ drwxr-xr-x	root/root	usr/share/qt/mkspecs/openbsd-g++/
 -rw-r--r--	root/root	usr/share/qt/mkspecs/openbsd-g++/qplatformdefs.h
 -rw-r--r--	root/root	usr/share/qt/mkspecs/qconfig.pri
 drwxr-xr-x	root/root	usr/share/qt/mkspecs/qpa/
+drwxr-xr-x	root/root	usr/share/qt/mkspecs/qpa/common/
+-rw-r--r--	root/root	usr/share/qt/mkspecs/qpa/common/g++-base-macx-iphone.conf
+-rw-r--r--	root/root	usr/share/qt/mkspecs/qpa/common/g++-base-macx-iphonedevice.conf
+drwxr-xr-x	root/root	usr/share/qt/mkspecs/qpa/macx-iphonedevice-g++-armv6/
+-rw-r--r--	root/root	usr/share/qt/mkspecs/qpa/macx-iphonedevice-g++-armv6/qmake.conf
+-rw-r--r--	root/root	usr/share/qt/mkspecs/qpa/macx-iphonedevice-g++-armv6/qplatformdefs.h
+drwxr-xr-x	root/root	usr/share/qt/mkspecs/qpa/macx-iphonedevice-g++-armv7-nothumb/
+-rw-r--r--	root/root	usr/share/qt/mkspecs/qpa/macx-iphonedevice-g++-armv7-nothumb/qmake.conf
+-rw-r--r--	root/root	usr/share/qt/mkspecs/qpa/macx-iphonedevice-g++-armv7-nothumb/qplatformdefs.h
 drwxr-xr-x	root/root	usr/share/qt/mkspecs/qpa/macx-iphonedevice-g++/
 -rw-r--r--	root/root	usr/share/qt/mkspecs/qpa/macx-iphonedevice-g++/qmake.conf
 -rw-r--r--	root/root	usr/share/qt/mkspecs/qpa/macx-iphonedevice-g++/qplatformdefs.h
@@ -3524,6 +3540,15 @@ drwxr-xr-x	root/root	usr/share/qt/mkspecs/qws/
 drwxr-xr-x	root/root	usr/share/qt/mkspecs/qws/freebsd-generic-g++/
 -rw-r--r--	root/root	usr/share/qt/mkspecs/qws/freebsd-generic-g++/qmake.conf
 -rw-r--r--	root/root	usr/share/qt/mkspecs/qws/freebsd-generic-g++/qplatformdefs.h
+drwxr-xr-x	root/root	usr/share/qt/mkspecs/qws/integrity-arm-cxarm/
+-rw-r--r--	root/root	usr/share/qt/mkspecs/qws/integrity-arm-cxarm/qmake.conf
+-rw-r--r--	root/root	usr/share/qt/mkspecs/qws/integrity-arm-cxarm/qplatformdefs.h
+drwxr-xr-x	root/root	usr/share/qt/mkspecs/qws/integrity-ppc-cxppc/
+-rw-r--r--	root/root	usr/share/qt/mkspecs/qws/integrity-ppc-cxppc/qmake.conf
+-rw-r--r--	root/root	usr/share/qt/mkspecs/qws/integrity-ppc-cxppc/qplatformdefs.h
+drwxr-xr-x	root/root	usr/share/qt/mkspecs/qws/integrity-x86-cx86/
+-rw-r--r--	root/root	usr/share/qt/mkspecs/qws/integrity-x86-cx86/qmake.conf
+-rw-r--r--	root/root	usr/share/qt/mkspecs/qws/integrity-x86-cx86/qplatformdefs.h
 drwxr-xr-x	root/root	usr/share/qt/mkspecs/qws/linux-arm-g++/
 -rw-r--r--	root/root	usr/share/qt/mkspecs/qws/linux-arm-g++/qmake.conf
 -rw-r--r--	root/root	usr/share/qt/mkspecs/qws/linux-arm-g++/qplatformdefs.h
@@ -3590,6 +3615,21 @@ drwxr-xr-x	root/root	usr/share/qt/mkspecs/qws/macx-generic-g++/
 drwxr-xr-x	root/root	usr/share/qt/mkspecs/qws/macx-nacl-g++/
 -rw-r--r--	root/root	usr/share/qt/mkspecs/qws/macx-nacl-g++/qmake.conf
 -rw-r--r--	root/root	usr/share/qt/mkspecs/qws/macx-nacl-g++/qplatformdefs.h
+drwxr-xr-x	root/root	usr/share/qt/mkspecs/qws/qnx-arm-g++/
+-rw-r--r--	root/root	usr/share/qt/mkspecs/qws/qnx-arm-g++/qmake.conf
+-rw-r--r--	root/root	usr/share/qt/mkspecs/qws/qnx-arm-g++/qplatformdefs.h
+drwxr-xr-x	root/root	usr/share/qt/mkspecs/qws/qnx-armv7-g++/
+-rw-r--r--	root/root	usr/share/qt/mkspecs/qws/qnx-armv7-g++/qmake.conf
+-rw-r--r--	root/root	usr/share/qt/mkspecs/qws/qnx-armv7-g++/qplatformdefs.h
+drwxr-xr-x	root/root	usr/share/qt/mkspecs/qws/qnx-generic-g++/
+-rw-r--r--	root/root	usr/share/qt/mkspecs/qws/qnx-generic-g++/qmake.conf
+-rw-r--r--	root/root	usr/share/qt/mkspecs/qws/qnx-generic-g++/qplatformdefs.h
+drwxr-xr-x	root/root	usr/share/qt/mkspecs/qws/qnx-i386-g++/
+-rw-r--r--	root/root	usr/share/qt/mkspecs/qws/qnx-i386-g++/qmake.conf
+-rw-r--r--	root/root	usr/share/qt/mkspecs/qws/qnx-i386-g++/qplatformdefs.h
+drwxr-xr-x	root/root	usr/share/qt/mkspecs/qws/qnx-ppc-g++/
+-rw-r--r--	root/root	usr/share/qt/mkspecs/qws/qnx-ppc-g++/qmake.conf
+-rw-r--r--	root/root	usr/share/qt/mkspecs/qws/qnx-ppc-g++/qplatformdefs.h
 drwxr-xr-x	root/root	usr/share/qt/mkspecs/qws/solaris-generic-g++/
 -rw-r--r--	root/root	usr/share/qt/mkspecs/qws/solaris-generic-g++/qmake.conf
 -rw-r--r--	root/root	usr/share/qt/mkspecs/qws/solaris-generic-g++/qplatformdefs.h
@@ -3654,9 +3694,12 @@ drwxr-xr-x	root/root	usr/share/qt/mkspecs/unixware-g++/
 -rw-r--r--	root/root	usr/share/qt/mkspecs/unixware-g++/qmake.conf
 -rw-r--r--	root/root	usr/share/qt/mkspecs/unixware-g++/qplatformdefs.h
 drwxr-xr-x	root/root	usr/share/qt/mkspecs/unsupported/
-drwxr-xr-x	root/root	usr/share/qt/mkspecs/unsupported/integrity-ghs/
--rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/integrity-ghs/qmake.conf
--rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/integrity-ghs/qplatformdefs.h
+drwxr-xr-x	root/root	usr/share/qt/mkspecs/unsupported/blackberry-armv7le-qcc/
+-rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/blackberry-armv7le-qcc/qmake.conf
+-rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/blackberry-armv7le-qcc/qplatformdefs.h
+drwxr-xr-x	root/root	usr/share/qt/mkspecs/unsupported/blackberry-x86-qcc/
+-rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/blackberry-x86-qcc/qmake.conf
+-rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/blackberry-x86-qcc/qplatformdefs.h
 drwxr-xr-x	root/root	usr/share/qt/mkspecs/unsupported/linux-armcc/
 -rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/linux-armcc/qmake.conf
 -rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/linux-armcc/qplatformdefs.h
@@ -3674,37 +3717,25 @@ drwxr-xr-x	root/root	usr/share/qt/mkspecs/unsupported/macx-clang/
 -rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/macx-clang/Info.plist.lib
 -rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/macx-clang/qmake.conf
 -rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/macx-clang/qplatformdefs.h
-drwxr-xr-x	root/root	usr/share/qt/mkspecs/unsupported/qnx-g++/
--rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/qnx-g++/qmake.conf
--rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/qnx-g++/qplatformdefs.h
+drwxr-xr-x	root/root	usr/share/qt/mkspecs/unsupported/qnx-X11-g++/
+-rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/qnx-X11-g++/qmake.conf
+-rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/qnx-X11-g++/qplatformdefs.h
+drwxr-xr-x	root/root	usr/share/qt/mkspecs/unsupported/qnx-armv7le-qcc/
+-rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/qnx-armv7le-qcc/qmake.conf
+-rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/qnx-armv7le-qcc/qplatformdefs.h
+drwxr-xr-x	root/root	usr/share/qt/mkspecs/unsupported/qnx-x86-qcc/
+-rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/qnx-x86-qcc/qmake.conf
+-rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/qnx-x86-qcc/qplatformdefs.h
 drwxr-xr-x	root/root	usr/share/qt/mkspecs/unsupported/qws/
-drwxr-xr-x	root/root	usr/share/qt/mkspecs/unsupported/qws/integrity-arm-cxarm/
--rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/qws/integrity-arm-cxarm/qmake.conf
--rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/qws/integrity-arm-cxarm/qplatformdefs.h
-drwxr-xr-x	root/root	usr/share/qt/mkspecs/unsupported/qws/integrity-ppc-cxppc/
--rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/qws/integrity-ppc-cxppc/qmake.conf
--rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/qws/integrity-ppc-cxppc/qplatformdefs.h
+drwxr-xr-x	root/root	usr/share/qt/mkspecs/unsupported/qws/integrity-x86-cx86/
+-rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/qws/integrity-x86-cx86/qmake.conf
+-rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/qws/integrity-x86-cx86/qplatformdefs.h
 drwxr-xr-x	root/root	usr/share/qt/mkspecs/unsupported/qws/linux-x86-openkode-g++/
 -rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/qws/linux-x86-openkode-g++/qmake.conf
 -rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h
 drwxr-xr-x	root/root	usr/share/qt/mkspecs/unsupported/qws/qnx-641/
 -rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/qws/qnx-641/qmake.conf
 -rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/qws/qnx-641/qplatformdefs.h
-drwxr-xr-x	root/root	usr/share/qt/mkspecs/unsupported/qws/qnx-arm-g++/
--rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/qws/qnx-arm-g++/qmake.conf
--rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/qws/qnx-arm-g++/qplatformdefs.h
-drwxr-xr-x	root/root	usr/share/qt/mkspecs/unsupported/qws/qnx-armv7-g++/
--rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/qws/qnx-armv7-g++/qmake.conf
--rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/qws/qnx-armv7-g++/qplatformdefs.h
-drwxr-xr-x	root/root	usr/share/qt/mkspecs/unsupported/qws/qnx-generic-g++/
--rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf
--rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/qws/qnx-generic-g++/qplatformdefs.h
-drwxr-xr-x	root/root	usr/share/qt/mkspecs/unsupported/qws/qnx-i386-g++/
--rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/qws/qnx-i386-g++/qmake.conf
--rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/qws/qnx-i386-g++/qplatformdefs.h
-drwxr-xr-x	root/root	usr/share/qt/mkspecs/unsupported/qws/qnx-ppc-g++/
--rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/qws/qnx-ppc-g++/qmake.conf
--rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/qws/qnx-ppc-g++/qplatformdefs.h
 drwxr-xr-x	root/root	usr/share/qt/mkspecs/unsupported/vxworks-ppc-dcc/
 -rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf
 -rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/vxworks-ppc-dcc/qplatformdefs.h
@@ -3717,6 +3748,9 @@ drwxr-xr-x	root/root	usr/share/qt/mkspecs/unsupported/vxworks-simpentium-dcc/
 drwxr-xr-x	root/root	usr/share/qt/mkspecs/unsupported/vxworks-simpentium-g++/
 -rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/vxworks-simpentium-g++/qmake.conf
 -rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/vxworks-simpentium-g++/qplatformdefs.h
+drwxr-xr-x	root/root	usr/share/qt/mkspecs/unsupported/win32-g++-4.6-cross/
+-rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/win32-g++-4.6-cross/qmake.conf
+-rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/win32-g++-4.6-cross/qplatformdefs.h
 drwxr-xr-x	root/root	usr/share/qt/mkspecs/unsupported/win32-g++-cross/
 -rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/win32-g++-cross/qmake.conf
 -rw-r--r--	root/root	usr/share/qt/mkspecs/unsupported/win32-g++-cross/qplatformdefs.h
@@ -3786,6 +3820,14 @@ drwxr-xr-x	root/root	usr/share/qt/mkspecs/wince60standard-armv4i-msvc2005/
 drwxr-xr-x	root/root	usr/share/qt/mkspecs/wince60standard-x86-msvc2005/
 -rw-r--r--	root/root	usr/share/qt/mkspecs/wince60standard-x86-msvc2005/qmake.conf
 -rw-r--r--	root/root	usr/share/qt/mkspecs/wince60standard-x86-msvc2005/qplatformdefs.h
+drwxr-xr-x	root/root	usr/share/qt/mkspecs/wince70embedded-armv4i-msvc2008/
+-rw-r--r--	root/root	usr/share/qt/mkspecs/wince70embedded-armv4i-msvc2008/default_post.prf
+-rw-r--r--	root/root	usr/share/qt/mkspecs/wince70embedded-armv4i-msvc2008/qmake.conf
+-rw-r--r--	root/root	usr/share/qt/mkspecs/wince70embedded-armv4i-msvc2008/qplatformdefs.h
+drwxr-xr-x	root/root	usr/share/qt/mkspecs/wince70embedded-x86-msvc2008/
+-rw-r--r--	root/root	usr/share/qt/mkspecs/wince70embedded-x86-msvc2008/default_post.prf
+-rw-r--r--	root/root	usr/share/qt/mkspecs/wince70embedded-x86-msvc2008/qmake.conf
+-rw-r--r--	root/root	usr/share/qt/mkspecs/wince70embedded-x86-msvc2008/qplatformdefs.h
 drwxr-xr-x	root/root	usr/share/qt/mkspecs/wincewm50pocket-msvc2005/
 -rw-r--r--	root/root	usr/share/qt/mkspecs/wincewm50pocket-msvc2005/default_post.prf
 -rw-r--r--	root/root	usr/share/qt/mkspecs/wincewm50pocket-msvc2005/qmake.conf
diff --git a/qt/.md5sum.i686 b/qt/.md5sum.i686
index fd3c0a410..f78c517c0 100644
--- a/qt/.md5sum.i686
+++ b/qt/.md5sum.i686
@@ -1 +1 @@
-e8a5fdbeba2927c948d9f477a6abe904  qt-everywhere-opensource-src-4.8.0.tar.gz
+3c1146ddf56247e16782f96910a8423b  qt-everywhere-opensource-src-4.8.2.tar.gz
diff --git a/qt/.md5sum.x86_64 b/qt/.md5sum.x86_64
index fd3c0a410..f78c517c0 100644
--- a/qt/.md5sum.x86_64
+++ b/qt/.md5sum.x86_64
@@ -1 +1 @@
-e8a5fdbeba2927c948d9f477a6abe904  qt-everywhere-opensource-src-4.8.0.tar.gz
+3c1146ddf56247e16782f96910a8423b  qt-everywhere-opensource-src-4.8.2.tar.gz
diff --git a/qt/Pkgfile b/qt/Pkgfile
index ea4bb950a..90720cb59 100755
--- a/qt/Pkgfile
+++ b/qt/Pkgfile
@@ -6,11 +6,10 @@
 # Run on: libtiff,libmng,dbus,fontconfig,alsa-lib,xdg-utils,hicolor-icon-theme,libpostgresql,libmysql,unixodbc,mesa3d,gtk
 
 name=qt
-version=4.8.0
-release=2
+version=4.8.2
+release=1
 _name=qt-everywhere-opensource-src-${version}
-
-source=(http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-$version.tar.gz)
+source=(http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-$version.tar.gz)
 
 build() {
 	unset QMAKESPC
@@ -70,4 +69,3 @@ build() {
 	sed -i -e "s|$SRC/${_pkgfqn}/bin/uic|/usr/bin/uic|g" $PKG/usr/lib/pkgconfig/*.pc
 
 }
-  
diff --git a/qt/qt-4.7.1-add-postgresql9.patch b/qt/qt-4.7.1-add-postgresql9.patch
deleted file mode 100644
index 32c45a80a..000000000
--- a/qt/qt-4.7.1-add-postgresql9.patch
+++ /dev/null
@@ -1,215 +0,0 @@
-From 03f94089a16cf6b6a3b533ba1f90444eb18c29ab Mon Sep 17 00:00:00 2001
-From: Charles Yin <charles.yin@nokia.com>
-Date: Thu, 4 Nov 2010 15:38:57 +1000
-Subject: [PATCH] Add Postgresql 8.x and 9 supports
-
-Change-Id: Ic740686ead768cc3e106703049d878549dfd3c6a
-Task-number:QTBUG-14206
-Reviewed-by: Michael Goddard
----
- src/sql/drivers/psql/qsql_psql.cpp      |  116 +++++++++++++++++++++---------
- src/sql/drivers/psql/qsql_psql.h        |    6 ++-
- tests/auto/qsqldatabase/tst_databases.h |    2 +
- 3 files changed, 88 insertions(+), 36 deletions(-)
-
-diff --git a/src/sql/drivers/psql/qsql_psql.cpp b/src/sql/drivers/psql/qsql_psql.cpp
-index 2a4e595..bf9685f 100644
---- a/src/sql/drivers/psql/qsql_psql.cpp
-+++ b/src/sql/drivers/psql/qsql_psql.cpp
-@@ -54,7 +54,6 @@
- #include <qstringlist.h>
- #include <qmutex.h>
- 
--
- #include <libpq-fe.h>
- #include <pg_config.h>
- 
-@@ -619,6 +618,50 @@ static void setDatestyle(PGconn* connection)
-     PQclear(result);
- }
- 
-+static QPSQLDriver::Protocol qMakePSQLVersion(int vMaj, int vMin)
-+{
-+    switch (vMaj) {
-+    case 6:
-+        return QPSQLDriver::Version6;
-+    case 7:
-+    {
-+        switch (vMin) {
-+        case 1:
-+            return QPSQLDriver::Version71;
-+        case 3:
-+            return QPSQLDriver::Version73;
-+        case 4:
-+            return QPSQLDriver::Version74;
-+        default:
-+            return QPSQLDriver::Version7;
-+        }
-+        break;
-+    }
-+    case 8:
-+    {
-+        switch (vMin) {
-+        case 1:
-+            return QPSQLDriver::Version81;
-+        case 2:
-+            return QPSQLDriver::Version82;
-+        case 3:
-+            return QPSQLDriver::Version83;
-+        case 4:
-+            return QPSQLDriver::Version84;
-+        default:
-+            return QPSQLDriver::Version8;
-+        }
-+        break;
-+    }
-+    case 9:
-+        return QPSQLDriver::Version9;
-+        break;
-+    default:
-+        break;
-+    }
-+    return QPSQLDriver::VersionUnknown;
-+}
-+
- static QPSQLDriver::Protocol getPSQLVersion(PGconn* connection)
- {
-     QPSQLDriver::Protocol serverVersion = QPSQLDriver::Version6;
-@@ -626,50 +669,44 @@ static QPSQLDriver::Protocol getPSQLVersion(PGconn* connection)
-     int status = PQresultStatus(result);
-     if (status == PGRES_COMMAND_OK || status == PGRES_TUPLES_OK) {
-         QString val = QString::fromAscii(PQgetvalue(result, 0, 0));
-+
-         QRegExp rx(QLatin1String("(\\d+)\\.(\\d+)"));
-         rx.setMinimal(true); // enforce non-greedy RegExp
-+
-         if (rx.indexIn(val) != -1) {
-             int vMaj = rx.cap(1).toInt();
-             int vMin = rx.cap(2).toInt();
--
--            switch (vMaj) {
--            case 7:
--                switch (vMin) {
--                case 0:
--                    serverVersion = QPSQLDriver::Version7;
--                    break;
--                case 1:
--                case 2:
--                    serverVersion = QPSQLDriver::Version71;
--                    break;
--                default:
--                    serverVersion = QPSQLDriver::Version73;
--                    break;
--                }
--                break;
--            case 8:
--                switch (vMin) {
--                case 0:
--                    serverVersion = QPSQLDriver::Version8;
--                    break;
--                case 1:
--                    serverVersion = QPSQLDriver::Version81;
--                    break;
--                case 2:
--                default:
--                    serverVersion = QPSQLDriver::Version82;
--                    break;
--                }
--                break;
--            default:
--                break;
-+            serverVersion = qMakePSQLVersion(vMaj, vMin);
-+#ifdef PG_MAJORVERSION
-+            if (rx.indexIn(QLatin1String(PG_MAJORVERSION)) != -1) {
-+                vMaj = rx.cap(1).toInt();
-+                vMin = rx.cap(2).toInt();
-+            }
-+            QPSQLDriver::Protocol clientVersion = qMakePSQLVersion(vMaj, vMin);
-+
-+            if (serverVersion >= QPSQLDriver::Version9 && clientVersion < QPSQLDriver::Version9) {
-+                //Client version before QPSQLDriver::Version9 only supports escape mode for bytea type,
-+                //but bytea format is set to hex by default in PSQL 9 and above. So need to force the
-+                //server use the old escape mode when connects to the new server with old client library.
-+                result = PQexec(connection, "SET bytea_output=escape; ");
-+                status = PQresultStatus(result);
-+            } else if (serverVersion == QPSQLDriver::VersionUnknown) {
-+                serverVersion = clientVersion;
-+                if (serverVersion != QPSQLDriver::VersionUnknown)
-+                   qWarning("The server version of this PostgreSQL is unknown, falling back to the client version.");
-             }
-+#endif
-         }
-     }
-     PQclear(result);
- 
--    if (serverVersion < QPSQLDriver::Version71)
-+    //keep the old behavior unchanged
-+    if (serverVersion == QPSQLDriver::VersionUnknown)
-+        serverVersion = QPSQLDriver::Version6;
-+
-+    if (serverVersion < QPSQLDriver::Version71) {
-         qWarning("This version of PostgreSQL is not supported and may not work.");
-+    }
- 
-     return serverVersion;
- }
-@@ -852,7 +889,10 @@ bool QPSQLDriver::commitTransaction()
-     // This hack can dissapear once there is an API to query this sort of information.
-     if (d->pro == QPSQLDriver::Version8 ||
-         d->pro == QPSQLDriver::Version81 ||
--        d->pro == QPSQLDriver::Version82) {
-+        d->pro == QPSQLDriver::Version82 ||
-+        d->pro == QPSQLDriver::Version83 ||
-+        d->pro == QPSQLDriver::Version84 ||
-+        d->pro == QPSQLDriver::Version9) {
-         transaction_failed = qstrcmp(PQcmdStatus(res), "ROLLBACK") == 0;
-     }
- 
-@@ -963,6 +1003,9 @@ QSqlIndex QPSQLDriver::primaryIndex(const QString& tablename) const
-     case QPSQLDriver::Version8:
-     case QPSQLDriver::Version81:
-     case QPSQLDriver::Version82:
-+    case QPSQLDriver::Version83:
-+    case QPSQLDriver::Version84:
-+    case QPSQLDriver::Version9:
-         stmt = QLatin1String("SELECT pg_attribute.attname, pg_attribute.atttypid::int, "
-                 "pg_class.relname "
-                 "FROM pg_attribute, pg_class "
-@@ -1046,6 +1089,9 @@ QSqlRecord QPSQLDriver::record(const QString& tablename) const
-     case QPSQLDriver::Version8:
-     case QPSQLDriver::Version81:
-     case QPSQLDriver::Version82:
-+    case QPSQLDriver::Version83:
-+    case QPSQLDriver::Version84:
-+    case QPSQLDriver::Version9:
-         stmt = QLatin1String("select pg_attribute.attname, pg_attribute.atttypid::int, "
-                 "pg_attribute.attnotnull, pg_attribute.attlen, pg_attribute.atttypmod, "
-                 "pg_attrdef.adsrc "
-diff --git a/src/sql/drivers/psql/qsql_psql.h b/src/sql/drivers/psql/qsql_psql.h
-index 22871ff..107da87 100644
---- a/src/sql/drivers/psql/qsql_psql.h
-+++ b/src/sql/drivers/psql/qsql_psql.h
-@@ -97,6 +97,7 @@ class Q_EXPORT_SQLDRIVER_PSQL QPSQLDriver : public QSqlDriver
-     Q_OBJECT
- public:
-     enum Protocol {
-+        VersionUnknown = -1,
-         Version6 = 6,
-         Version7 = 7,
-         Version71 = 8,
-@@ -104,7 +105,10 @@ public:
-         Version74 = 10,
-         Version8 = 11,
-         Version81 = 12,
--        Version82 = 13
-+        Version82 = 13,
-+        Version83 = 14,
-+        Version84 = 15,
-+        Version9 = 16,
-     };
- 
-     explicit QPSQLDriver(QObject *parent=0);
- 
--- 
-1.6.1
-
diff --git a/qt/qt-4.7.1-fix-qtbug-15857.patch b/qt/qt-4.7.1-fix-qtbug-15857.patch
deleted file mode 100644
index 4a0dfb8b1..000000000
--- a/qt/qt-4.7.1-fix-qtbug-15857.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 6ae84f1183e91c910ca92a55e37f8254ace805c0 Mon Sep 17 00:00:00 2001
-From: Jiang Jiang <jiang.jiang@nokia.com>
-Date: Mon, 6 Dec 2010 13:07:36 +0100
-Subject: [PATCH] Fix QTextEdit::selectAll crash from textChanged()
-
-Doing selectAll() after the entire block of text has been removed
-will cause this crash, because we didn't check if the block we
-found is valid or not.
-
-Task-number: QTBUG-15857
-Reviewed-by: Eskil
----
- src/gui/text/qtextcursor.cpp |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/src/gui/text/qtextcursor.cpp b/src/gui/text/qtextcursor.cpp
-index 769ab2f..f73cc4b 100644
---- a/src/gui/text/qtextcursor.cpp
-+++ b/src/gui/text/qtextcursor.cpp
-@@ -363,6 +363,9 @@ bool QTextCursorPrivate::movePosition(QTextCursor::MoveOperation op, QTextCursor
-     bool adjustX = true;
-     QTextBlock blockIt = block();
- 
-+    if (!blockIt.isValid())
-+        return false;
-+
-     if (op >= QTextCursor::Left && op <= QTextCursor::WordRight
-         && blockIt.textDirection() == Qt::RightToLeft) {
-         if (op == QTextCursor::Left)
--- 
-1.6.1
-