Merge remote branch 'earth/master' into symbian-socket-engine

Conflicts:
	src/network/access/qhttpnetworkconnectionchannel.cpp
	src/network/socket/qlocalsocket.cpp
	src/s60installs/bwins/QtCoreu.def
	src/s60installs/bwins/QtGuiu.def
	src/s60installs/bwins/QtTestu.def
	src/s60installs/eabi/QtCoreu.def
	src/s60installs/eabi/QtGuiu.def

5 files changed, 97 insertions, 42 deletions

diff --git a/src/s60installs/eabi/QtCoreu.def b/src/s60installs/eabi/QtCoreu.def
index c514fbd..c5dd0ac 100644
--- a/src/s60installs/eabi/QtCoreu.def
+++ b/src/s60installs/eabi/QtCoreu.def
@@ -3832,4 +3832,5 @@ EXPORTS
 	_ZTI13QActiveObject @ 3831 NONAME
 	_ZTV13QActiveObject @ 3832 NONAME
 	gzungetc @ 3833 NONAME
-
+	_ZN16QAnimationDriverC1EP7QObject @ 3834 NONAME
+	_ZN16QAnimationDriverC1ER23QAnimationDriverPrivateP7QObject @ 3835 NONAME
diff --git a/src/s60installs/eabi/QtDeclarativeu.def b/src/s60installs/eabi/QtDeclarativeu.def
index 95180d4..2849068 100644
--- a/src/s60installs/eabi/QtDeclarativeu.def
+++ b/src/s60installs/eabi/QtDeclarativeu.def
@@ -761,20 +761,20 @@ EXPORTS
 	_ZN24QDeclarativeCustomParser5errorERK28QDeclarativeCustomParserNodeRK7QString @ 760 NONAME
 	_ZN24QDeclarativeCustomParser5errorERK32QDeclarativeCustomParserPropertyRK7QString @ 761 NONAME
 	_ZN24QDeclarativeCustomParser5errorERK7QString @ 762 NONAME
-	_ZN24QDeclarativeDebugService11idForObjectEP7QObject @ 763 NONAME ABSENT
-	_ZN24QDeclarativeDebugService11objectForIdEi @ 764 NONAME ABSENT
-	_ZN24QDeclarativeDebugService11qt_metacallEN11QMetaObject4CallEiPPv @ 765 NONAME ABSENT
-	_ZN24QDeclarativeDebugService11qt_metacastEPKc @ 766 NONAME ABSENT
-	_ZN24QDeclarativeDebugService11sendMessageERK10QByteArray @ 767 NONAME ABSENT
+	_ZN24QDeclarativeDebugService11idForObjectEP7QObject @ 763 NONAME
+	_ZN24QDeclarativeDebugService11objectForIdEi @ 764 NONAME
+	_ZN24QDeclarativeDebugService11qt_metacallEN11QMetaObject4CallEiPPv @ 765 NONAME
+	_ZN24QDeclarativeDebugService11qt_metacastEPKc @ 766 NONAME
+	_ZN24QDeclarativeDebugService11sendMessageERK10QByteArray @ 767 NONAME
 	_ZN24QDeclarativeDebugService14enabledChangedEb @ 768 NONAME ABSENT
-	_ZN24QDeclarativeDebugService14objectToStringEP7QObject @ 769 NONAME ABSENT
-	_ZN24QDeclarativeDebugService15messageReceivedERK10QByteArray @ 770 NONAME ABSENT
-	_ZN24QDeclarativeDebugService16staticMetaObjectE @ 771 NONAME DATA 16 ABSENT
-	_ZN24QDeclarativeDebugService18hasDebuggingClientEv @ 772 NONAME ABSENT
-	_ZN24QDeclarativeDebugService18isDebuggingEnabledEv @ 773 NONAME ABSENT
-	_ZN24QDeclarativeDebugService19getStaticMetaObjectEv @ 774 NONAME ABSENT
-	_ZN24QDeclarativeDebugServiceC1ERK7QStringP7QObject @ 775 NONAME ABSENT
-	_ZN24QDeclarativeDebugServiceC2ERK7QStringP7QObject @ 776 NONAME ABSENT
+	_ZN24QDeclarativeDebugService14objectToStringEP7QObject @ 769 NONAME
+	_ZN24QDeclarativeDebugService15messageReceivedERK10QByteArray @ 770 NONAME
+	_ZN24QDeclarativeDebugService16staticMetaObjectE @ 771 NONAME DATA 16
+	_ZN24QDeclarativeDebugService18hasDebuggingClientEv @ 772 NONAME
+	_ZN24QDeclarativeDebugService18isDebuggingEnabledEv @ 773 NONAME
+	_ZN24QDeclarativeDebugService19getStaticMetaObjectEv @ 774 NONAME
+	_ZN24QDeclarativeDebugServiceC1ERK7QStringP7QObject @ 775 NONAME
+	_ZN24QDeclarativeDebugServiceC2ERK7QStringP7QObject @ 776 NONAME
 	_ZN24QDeclarativeDomComponentC1ERKS_ @ 777 NONAME ABSENT
 	_ZN24QDeclarativeDomComponentC1Ev @ 778 NONAME ABSENT
 	_ZN24QDeclarativeDomComponentC2ERKS_ @ 779 NONAME ABSENT
@@ -1425,8 +1425,8 @@ EXPORTS
 	_ZNK23QDeclarativePropertyMapixERK7QString @ 1424 NONAME
 	_ZNK24QDeclarativeCustomParser11resolveTypeERK10QByteArray @ 1425 NONAME
 	_ZNK24QDeclarativeCustomParser12evaluateEnumERK10QByteArray @ 1426 NONAME
-	_ZNK24QDeclarativeDebugService10metaObjectEv @ 1427 NONAME ABSENT
-	_ZNK24QDeclarativeDebugService4nameEv @ 1428 NONAME ABSENT
+	_ZNK24QDeclarativeDebugService10metaObjectEv @ 1427 NONAME
+	_ZNK24QDeclarativeDebugService4nameEv @ 1428 NONAME
 	_ZNK24QDeclarativeDebugService9isEnabledEv @ 1429 NONAME ABSENT
 	_ZNK24QDeclarativeDomComponent13componentRootEv @ 1430 NONAME ABSENT
 	_ZNK24QDeclarativeScriptString11scopeObjectEv @ 1431 NONAME
@@ -1554,7 +1554,7 @@ EXPORTS
 	_ZTI23QDeclarativeItemPrivate @ 1553 NONAME
 	_ZTI23QDeclarativePropertyMap @ 1554 NONAME
 	_ZTI24QDeclarativeCustomParser @ 1555 NONAME
-	_ZTI24QDeclarativeDebugService @ 1556 NONAME ABSENT
+	_ZTI24QDeclarativeDebugService @ 1556 NONAME
 	_ZTI24QDeclarativeParserStatus @ 1557 NONAME
 	_ZTI25QDeclarativeImageProvider @ 1558 NONAME
 	_ZTI26QDeclarativeDebuggerStatus @ 1559 NONAME ABSENT
@@ -1604,7 +1604,7 @@ EXPORTS
 	_ZTV23QDeclarativeItemPrivate @ 1603 NONAME
 	_ZTV23QDeclarativePropertyMap @ 1604 NONAME
 	_ZTV24QDeclarativeCustomParser @ 1605 NONAME
-	_ZTV24QDeclarativeDebugService @ 1606 NONAME ABSENT
+	_ZTV24QDeclarativeDebugService @ 1606 NONAME
 	_ZTV24QDeclarativeParserStatus @ 1607 NONAME
 	_ZTV25QDeclarativeImageProvider @ 1608 NONAME
 	_ZTV26QDeclarativeDebuggerStatus @ 1609 NONAME ABSENT
@@ -1777,10 +1777,10 @@ EXPORTS
 	_ZN23QDeclarativeDebugClientD1Ev @ 1776 NONAME ABSENT
 	_ZN23QDeclarativeDebugClientD2Ev @ 1777 NONAME ABSENT
 	_ZN23QDeclarativeEngineDebug13statusChangedENS_6StatusE @ 1778 NONAME ABSENT
-	_ZN24QDeclarativeDebugService13statusChangedENS_6StatusE @ 1779 NONAME ABSENT
-	_ZN24QDeclarativeDebugServiceD0Ev @ 1780 NONAME ABSENT
-	_ZN24QDeclarativeDebugServiceD1Ev @ 1781 NONAME ABSENT
-	_ZN24QDeclarativeDebugServiceD2Ev @ 1782 NONAME ABSENT
+	_ZN24QDeclarativeDebugService13statusChangedENS_6StatusE @ 1779 NONAME
+	_ZN24QDeclarativeDebugServiceD0Ev @ 1780 NONAME
+	_ZN24QDeclarativeDebugServiceD1Ev @ 1781 NONAME
+	_ZN24QDeclarativeDebugServiceD2Ev @ 1782 NONAME
 	_ZN26QDeclarativeBasePositioner10addChangedEv @ 1783 NONAME ABSENT
 	_ZN26QDeclarativeBasePositioner10itemChangeEN13QGraphicsItem18GraphicsItemChangeERK8QVariant @ 1784 NONAME ABSENT
 	_ZN26QDeclarativeBasePositioner10setSpacingEi @ 1785 NONAME ABSENT
@@ -1851,7 +1851,7 @@ EXPORTS
 	_ZNK17QDeclarativeTimer9isRunningEv @ 1850 NONAME ABSENT
 	_ZNK23QDeclarativeDebugClient6statusEv @ 1851 NONAME ABSENT
 	_ZNK23QDeclarativeEngineDebug6statusEv @ 1852 NONAME ABSENT
-	_ZNK24QDeclarativeDebugService6statusEv @ 1853 NONAME ABSENT
+	_ZNK24QDeclarativeDebugService6statusEv @ 1853 NONAME
 	_ZNK26QDeclarativeBasePositioner10metaObjectEv @ 1854 NONAME ABSENT
 	_ZNK26QDeclarativeBasePositioner3addEv @ 1855 NONAME ABSENT
 	_ZNK26QDeclarativeBasePositioner4moveEv @ 1856 NONAME ABSENT
@@ -1930,4 +1930,7 @@ EXPORTS
 	_ZN20QDeclarativeRefCountD2Ev @ 1929 NONAME
 	_ZTI20QDeclarativeRefCount @ 1930 NONAME
 	_ZTV20QDeclarativeRefCount @ 1931 NONAME
+	_ZN23QDeclarativeItemPrivate15setLayoutMirrorEb @ 1932 NONAME
+	_ZN23QDeclarativeItemPrivate19resolveLayoutMirrorEv @ 1933 NONAME
+	_ZN23QDeclarativeItemPrivate23setImplicitLayoutMirrorEbb @ 1934 NONAME
 
diff --git a/src/s60installs/eabi/QtGuiu.def b/src/s60installs/eabi/QtGuiu.def
index c28bfb5..561e332 100644
--- a/src/s60installs/eabi/QtGuiu.def
+++ b/src/s60installs/eabi/QtGuiu.def
@@ -12338,23 +12338,39 @@ EXPORTS
 	_ZNK12QTextControl13isDragEnabledEv @ 12337 NONAME
 	_ZNK12QTextControl22isWordSelectionEnabledEv @ 12338 NONAME
 	_ZN12QLineControl16updateMicroFocusEv @ 12339 NONAME
-	_ZN17QInternalMimeData11canReadDataERK7QString @ 12340 NONAME
-	_ZN17QInternalMimeData11qt_metacallEN11QMetaObject4CallEiPPv @ 12341 NONAME
-	_ZN17QInternalMimeData11qt_metacastEPKc @ 12342 NONAME
-	_ZN17QInternalMimeData13formatsHelperEPK9QMimeData @ 12343 NONAME
-	_ZN17QInternalMimeData15hasFormatHelperERK7QStringPK9QMimeData @ 12344 NONAME
-	_ZN17QInternalMimeData16renderDataHelperERK7QStringPK9QMimeData @ 12345 NONAME
-	_ZN17QInternalMimeData16staticMetaObjectE @ 12346 NONAME DATA 16
-	_ZN17QInternalMimeData19getStaticMetaObjectEv @ 12347 NONAME
-	_ZN17QInternalMimeDataC2Ev @ 12348 NONAME
-	_ZN17QInternalMimeDataD0Ev @ 12349 NONAME
-	_ZN17QInternalMimeDataD1Ev @ 12350 NONAME
-	_ZN17QInternalMimeDataD2Ev @ 12351 NONAME
-	_ZNK14QWidgetPrivate20assignedInputContextEv @ 12352 NONAME
-	_ZNK17QInternalMimeData10metaObjectEv @ 12353 NONAME
-	_ZNK17QInternalMimeData12retrieveDataERK7QStringN8QVariant4TypeE @ 12354 NONAME
-	_ZNK17QInternalMimeData7formatsEv @ 12355 NONAME
-	_ZNK17QInternalMimeData9hasFormatERK7QString @ 12356 NONAME
-	_ZTI17QInternalMimeData @ 12357 NONAME
-	_ZTV17QInternalMimeData @ 12358 NONAME
+	_ZN13QFontDatabase22resolveFontFamilyAliasERK7QString @ 12340 NONAME
+	_ZN14QVolatileImage11paintEngineEv @ 12341 NONAME
+	_ZN14QVolatileImage12ensureFormatEN6QImage6FormatE @ 12342 NONAME
+	_ZN14QVolatileImage15setAlphaChannelERK7QPixmap @ 12343 NONAME
+	_ZN14QVolatileImage4bitsEv @ 12344 NONAME
+	_ZN14QVolatileImage4fillEj @ 12345 NONAME
+	_ZN14QVolatileImage8copyFromEPS_RK5QRect @ 12346 NONAME
+	_ZN14QVolatileImage8imageRefEv @ 12347 NONAME
+	_ZN14QVolatileImageC1EPvS0_ @ 12348 NONAME
+	_ZN14QVolatileImageC1ERK6QImage @ 12349 NONAME
+	_ZN14QVolatileImageC1ERKS_ @ 12350 NONAME
+	_ZN14QVolatileImageC1EiiN6QImage6FormatE @ 12351 NONAME
+	_ZN14QVolatileImageC1Ev @ 12352 NONAME
+	_ZN14QVolatileImageC2EPvS0_ @ 12353 NONAME
+	_ZN14QVolatileImageC2ERK6QImage @ 12354 NONAME
+	_ZN14QVolatileImageC2ERKS_ @ 12355 NONAME
+	_ZN14QVolatileImageC2EiiN6QImage6FormatE @ 12356 NONAME
+	_ZN14QVolatileImageC2Ev @ 12357 NONAME
+	_ZN14QVolatileImageD1Ev @ 12358 NONAME
+	_ZN14QVolatileImageD2Ev @ 12359 NONAME
+	_ZN14QVolatileImageaSERKS_ @ 12360 NONAME
+	_ZN15QGraphicsSystem22releaseCachedResourcesEv @ 12361 NONAME
+	_ZNK14QVolatileImage12bytesPerLineEv @ 12374 NONAME
+	_ZNK14QVolatileImage13endDataAccessEb @ 12375 NONAME
+	_ZNK14QVolatileImage15beginDataAccessEv @ 12376 NONAME
+	_ZNK14QVolatileImage15hasAlphaChannelEv @ 12377 NONAME
+	_ZNK14QVolatileImage20duplicateNativeImageEv @ 12378 NONAME
+	_ZNK14QVolatileImage5depthEv @ 12379 NONAME
+	_ZNK14QVolatileImage5widthEv @ 12380 NONAME
+	_ZNK14QVolatileImage6formatEv @ 12381 NONAME
+	_ZNK14QVolatileImage6heightEv @ 12382 NONAME
+	_ZNK14QVolatileImage6isNullEv @ 12383 NONAME
+	_ZNK14QVolatileImage7toImageEv @ 12384 NONAME
+	_ZNK14QVolatileImage9byteCountEv @ 12385 NONAME
+	_ZNK14QVolatileImage9constBitsEv @ 12386 NONAME
 
diff --git a/src/s60installs/eabi/QtOpenGLu.def b/src/s60installs/eabi/QtOpenGLu.def
index 794d43d..4977959 100644
--- a/src/s60installs/eabi/QtOpenGLu.def
+++ b/src/s60installs/eabi/QtOpenGLu.def
@@ -707,4 +707,36 @@ EXPORTS
 	_ZNK20QGLTextureGlyphCache16maxTextureHeightEv @ 706 NONAME
 	_ZThn8_NK20QGLTextureGlyphCache15maxTextureWidthEv @ 707 NONAME ABSENT
 	_ZThn8_NK20QGLTextureGlyphCache16maxTextureHeightEv @ 708 NONAME ABSENT
+	_Z28qt_resolve_buffer_extensionsP10QGLContext @ 709 NONAME
+	_ZN12QGLFunctions21initializeGLFunctionsEPK10QGLContext @ 710 NONAME
+	_ZN12QGLFunctionsC1EPK10QGLContext @ 711 NONAME
+	_ZN12QGLFunctionsC1Ev @ 712 NONAME
+	_ZN12QGLFunctionsC2EPK10QGLContext @ 713 NONAME
+	_ZN12QGLFunctionsC2Ev @ 714 NONAME
+	_ZN13QGLPixmapData12toNativeTypeEN11QPixmapData10NativeTypeE @ 715 NONAME
+	_ZN13QGLPixmapData14fromNativeTypeEPvN11QPixmapData10NativeTypeE @ 716 NONAME
+	_ZN13QGLPixmapData15fromImageReaderEP12QImageReader6QFlagsIN2Qt19ImageConversionFlagEE @ 717 NONAME
+	_ZN13QGLPixmapData20createPixmapForImageER6QImage6QFlagsIN2Qt19ImageConversionFlagEEb @ 718 NONAME
+	_ZN16QGLWindowSurface12swapBehaviorE @ 719 NONAME DATA 4
+	_ZN17QGLContextPrivate17qt_extensionFuncsE @ 720 NONAME DATA 60
+	_ZN20QGLTextureGlyphCache10setContextEPK10QGLContext @ 721 NONAME
+	_ZN20QGLTextureGlyphCache11fillTextureERKN18QTextureGlyphCache5CoordEj6QFixed @ 722 NONAME
+	_ZN20QGLTextureGlyphCacheC1EPK10QGLContextN21QFontEngineGlyphCache4TypeERK10QTransform @ 723 NONAME
+	_ZN20QGLTextureGlyphCacheC2EPK10QGLContextN21QFontEngineGlyphCache4TypeERK10QTransform @ 724 NONAME
+	_ZN26QGLFramebufferObjectFormat9setMipmapEb @ 725 NONAME
+	_ZN27QGLContextGroupResourceBase5valueEPK10QGLContext @ 726 NONAME
+	_ZN27QGLContextGroupResourceBase6insertEPK10QGLContextPv @ 727 NONAME
+	_ZN27QGLContextGroupResourceBase7cleanupEPK10QGLContextPv @ 728 NONAME
+	_ZN27QGLContextGroupResourceBaseC2Ev @ 729 NONAME
+	_ZN27QGLContextGroupResourceBaseD0Ev @ 730 NONAME
+	_ZN27QGLContextGroupResourceBaseD1Ev @ 731 NONAME
+	_ZN27QGLContextGroupResourceBaseD2Ev @ 732 NONAME
+	_ZNK12QGLFunctions14openGLFeaturesEv @ 733 NONAME
+	_ZNK12QGLFunctions16hasOpenGLFeatureENS_13OpenGLFeatureE @ 734 NONAME
+	_ZNK14QGLPaintDevice9isFlippedEv @ 735 NONAME
+	_ZNK26QGLFramebufferObjectFormat6mipmapEv @ 736 NONAME
+	_ZTI27QGLContextGroupResourceBase @ 737 NONAME
+	_ZTV27QGLContextGroupResourceBase @ 738 NONAME
+	_ZThn104_N20QGLTextureGlyphCacheD0Ev @ 739 NONAME
+	_ZThn104_N20QGLTextureGlyphCacheD1Ev @ 740 NONAME
 
diff --git a/src/s60installs/eabi/QtOpenVGu.def b/src/s60installs/eabi/QtOpenVGu.def
index e1828c1..e05cc79 100644
--- a/src/s60installs/eabi/QtOpenVGu.def
+++ b/src/s60installs/eabi/QtOpenVGu.def
@@ -206,4 +206,7 @@ EXPORTS
 	_ZN13QVGPixmapData8fromDataEPKhjPKc6QFlagsIN2Qt19ImageConversionFlagEE @ 205 NONAME
 	_ZN13QVGPixmapData8fromFileERK7QStringPKc6QFlagsIN2Qt19ImageConversionFlagEE @ 206 NONAME
 	_ZNK14QVGPaintEngine16canVgWritePixelsERK6QImage @ 207 NONAME
+	_ZN13QVGPixmapData12updateSerialEv @ 208 NONAME ABSENT
+	_ZN13QVGPixmapData4copyEPK11QPixmapDataRK5QRect @ 209 NONAME ABSENT
+	_ZNK13QVGPixmapData11idealFormatEP6QImage6QFlagsIN2Qt19ImageConversionFlagEE @ 210 NONAME ABSENT