Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7

5 files changed, 56 insertions, 11 deletions

diff --git a/src/s60installs/eabi/QtCoreu.def b/src/s60installs/eabi/QtCoreu.def
index dc9431b..48ba8d2 100644
--- a/src/s60installs/eabi/QtCoreu.def
+++ b/src/s60installs/eabi/QtCoreu.def
@@ -3700,4 +3700,11 @@ EXPORTS
 	_ZN23QEventDispatcherSymbian12selectThreadEv @ 3699 NONAME
 	_ZN10QByteArray10setRawDataEPKcj @ 3700 NONAME
 	_ZN7QString10setRawDataEPK5QChari @ 3701 NONAME
+	_ZN23QCoreApplicationPrivate11symbianInitEv @ 3702 NONAME
+	_ZN23QEventDispatcherSymbian11qt_metacallEN11QMetaObject4CallEiPPv @ 3703 NONAME
+	_ZN23QEventDispatcherSymbian11qt_metacastEPKc @ 3704 NONAME
+	_ZN23QEventDispatcherSymbian16staticMetaObjectE @ 3705 NONAME DATA 16
+	_ZN23QEventDispatcherSymbian19getStaticMetaObjectEv @ 3706 NONAME
+	_ZNK23QEventDispatcherSymbian10metaObjectEv @ 3707 NONAME
+	_ZNK9QDateTime7msecsToERKS_ @ 3708 NONAME
 
diff --git a/src/s60installs/eabi/QtDeclarativeu.def b/src/s60installs/eabi/QtDeclarativeu.def
index e1d8e96..a26e193 100644
--- a/src/s60installs/eabi/QtDeclarativeu.def
+++ b/src/s60installs/eabi/QtDeclarativeu.def
@@ -1044,14 +1044,14 @@ EXPORTS
 	_ZN21QDeclarativeFlickable17flickableChildrenEv @ 1043 NONAME
 	_ZN21QDeclarativeFlickable17mouseReleaseEventEP24QGraphicsSceneMouseEvent @ 1044 NONAME
 	_ZN21QDeclarativeFlickable17pressDelayChangedEv @ 1045 NONAME
-	_ZN21QDeclarativeFlickable17setFlickDirectionENS_14FlickDirectionE @ 1046 NONAME
+	_ZN21QDeclarativeFlickable17setFlickDirectionENS_14FlickDirectionE @ 1046 NONAME ABSENT
 	_ZN21QDeclarativeFlickable18interactiveChangedEv @ 1047 NONAME
 	_ZN21QDeclarativeFlickable19contentWidthChangedEv @ 1048 NONAME
 	_ZN21QDeclarativeFlickable19getStaticMetaObjectEv @ 1049 NONAME
 	_ZN21QDeclarativeFlickable19isAtBoundaryChangedEv @ 1050 NONAME
 	_ZN21QDeclarativeFlickable20contentHeightChangedEv @ 1051 NONAME
 	_ZN21QDeclarativeFlickable20setFlickDecelerationEf @ 1052 NONAME
-	_ZN21QDeclarativeFlickable21flickDirectionChangedEv @ 1053 NONAME
+	_ZN21QDeclarativeFlickable21flickDirectionChangedEv @ 1053 NONAME ABSENT
 	_ZN21QDeclarativeFlickable23setMaximumFlickVelocityEf @ 1054 NONAME
 	_ZN21QDeclarativeFlickable23verticalVelocityChangedEv @ 1055 NONAME
 	_ZN21QDeclarativeFlickable24flickDecelerationChangedEv @ 1056 NONAME
@@ -1602,7 +1602,7 @@ EXPORTS
 	_ZN24QDeclarativeParentChange11qt_metacastEPKc @ 1601 NONAME
 	_ZN24QDeclarativeParentChange11setRotationEf @ 1602 NONAME
 	_ZN24QDeclarativeParentChange12isReversableEv @ 1603 NONAME
-	_ZN24QDeclarativeParentChange13copyOriginalsEP23QDeclarativeActionEvent @ 1604 NONAME
+	_ZN24QDeclarativeParentChange13copyOriginalsEP23QDeclarativeActionEvent @ 1604 NONAME ABSENT
 	_ZN24QDeclarativeParentChange13saveOriginalsEv @ 1605 NONAME
 	_ZN24QDeclarativeParentChange16staticMetaObjectE @ 1606 NONAME DATA 16
 	_ZN24QDeclarativeParentChange17saveCurrentValuesEv @ 1607 NONAME
@@ -1941,9 +1941,9 @@ EXPORTS
 	_ZN27QDeclarativeVisualDataModel7setPartERK7QString @ 1940 NONAME
 	_ZN27QDeclarativeVisualDataModel8evaluateEiRK7QStringP7QObject @ 1941 NONAME
 	_ZN27QDeclarativeVisualDataModel8setModelERK8QVariant @ 1942 NONAME
-	_ZN27QDeclarativeVisualDataModelC1EP19QDeclarativeContext @ 1943 NONAME
+	_ZN27QDeclarativeVisualDataModelC1EP19QDeclarativeContext @ 1943 NONAME ABSENT
 	_ZN27QDeclarativeVisualDataModelC1Ev @ 1944 NONAME
-	_ZN27QDeclarativeVisualDataModelC2EP19QDeclarativeContext @ 1945 NONAME
+	_ZN27QDeclarativeVisualDataModelC2EP19QDeclarativeContext @ 1945 NONAME ABSENT
 	_ZN27QDeclarativeVisualDataModelC2Ev @ 1946 NONAME
 	_ZN27QDeclarativeVisualDataModelD0Ev @ 1947 NONAME
 	_ZN27QDeclarativeVisualDataModelD1Ev @ 1948 NONAME
@@ -1960,8 +1960,8 @@ EXPORTS
 	_ZN27QDeclarativeVisualItemModel7releaseEP16QDeclarativeItem @ 1959 NONAME
 	_ZN27QDeclarativeVisualItemModel8childrenEv @ 1960 NONAME
 	_ZN27QDeclarativeVisualItemModel8evaluateEiRK7QStringP7QObject @ 1961 NONAME
-	_ZN27QDeclarativeVisualItemModelC1Ev @ 1962 NONAME
-	_ZN27QDeclarativeVisualItemModelC2Ev @ 1963 NONAME
+	_ZN27QDeclarativeVisualItemModelC1Ev @ 1962 NONAME ABSENT
+	_ZN27QDeclarativeVisualItemModelC2Ev @ 1963 NONAME ABSENT
 	_ZN28QDeclarativeCustomParserNodeC1ERKS_ @ 1964 NONAME
 	_ZN28QDeclarativeCustomParserNodeC1Ev @ 1965 NONAME
 	_ZN28QDeclarativeCustomParserNodeC2ERKS_ @ 1966 NONAME
@@ -3306,7 +3306,7 @@ EXPORTS
 	_ZThn8_N23QDeclarativePaintedItemD0Ev @ 3305 NONAME
 	_ZThn8_N23QDeclarativePaintedItemD1Ev @ 3306 NONAME
 	_ZThn8_N24QDeclarativeParentChange12isReversableEv @ 3307 NONAME
-	_ZThn8_N24QDeclarativeParentChange13copyOriginalsEP23QDeclarativeActionEvent @ 3308 NONAME
+	_ZThn8_N24QDeclarativeParentChange13copyOriginalsEP23QDeclarativeActionEvent @ 3308 NONAME ABSENT
 	_ZThn8_N24QDeclarativeParentChange13saveOriginalsEv @ 3309 NONAME
 	_ZThn8_N24QDeclarativeParentChange17saveCurrentValuesEv @ 3310 NONAME
 	_ZThn8_N24QDeclarativeParentChange6rewindEv @ 3311 NONAME
@@ -3578,4 +3578,28 @@ EXPORTS
 	_ZThn8_N23QDeclarativeConnections10classBeginEv @ 3577 NONAME
 	_ZThn8_N23QDeclarativePaintedItem10itemChangeEN13QGraphicsItem18GraphicsItemChangeERK8QVariant @ 3578 NONAME
 	_ZThn8_N24QDeclarativeWorkerScript10classBeginEv @ 3579 NONAME
+	_ZN16QDeclarativeItem18keyPressPreHandlerEP9QKeyEvent @ 3580 NONAME
+	_ZN16QDeclarativeItem20keyReleasePreHandlerEP9QKeyEvent @ 3581 NONAME
+	_ZN16QDeclarativeItem21inputMethodPreHandlerEP17QInputMethodEvent @ 3582 NONAME
+	_ZN18QDeclarativeLoader17componentCompleteEv @ 3583 NONAME
+	_ZN18QDeclarativeLoader6loadedEv @ 3584 NONAME
+	_ZN20QDeclarativePathView21decrementCurrentIndexEv @ 3585 NONAME
+	_ZN20QDeclarativePathView21incrementCurrentIndexEv @ 3586 NONAME
+	_ZN21QDeclarativeFlickable17setFlickDirectionENS_18FlickableDirectionE @ 3587 NONAME
+	_ZN21QDeclarativeFlickable21setFlickableDirectionENS_18FlickableDirectionE @ 3588 NONAME
+	_ZN21QDeclarativeFlickable23movingVerticallyChangedEv @ 3589 NONAME
+	_ZN21QDeclarativeFlickable25flickableDirectionChangedEv @ 3590 NONAME
+	_ZN21QDeclarativeFlickable25flickingVerticallyChangedEv @ 3591 NONAME
+	_ZN21QDeclarativeFlickable25movingHorizontallyChangedEv @ 3592 NONAME
+	_ZN21QDeclarativeFlickable27flickingHorizontallyChangedEv @ 3593 NONAME
+	_ZN27QDeclarativeVisualDataModelC1EP19QDeclarativeContextP7QObject @ 3594 NONAME
+	_ZN27QDeclarativeVisualDataModelC2EP19QDeclarativeContextP7QObject @ 3595 NONAME
+	_ZN27QDeclarativeVisualItemModelC1EP7QObject @ 3596 NONAME
+	_ZN27QDeclarativeVisualItemModelC2EP7QObject @ 3597 NONAME
+	_ZNK21QDeclarativeFlickable18flickableDirectionEv @ 3598 NONAME
+	_ZNK21QDeclarativeFlickable18isMovingVerticallyEv @ 3599 NONAME
+	_ZNK21QDeclarativeFlickable20isFlickingVerticallyEv @ 3600 NONAME
+	_ZNK21QDeclarativeFlickable20isMovingHorizontallyEv @ 3601 NONAME
+	_ZNK21QDeclarativeFlickable22isFlickingHorizontallyEv @ 3602 NONAME
+	_ZThn16_N18QDeclarativeLoader17componentCompleteEv @ 3603 NONAME
 
diff --git a/src/s60installs/eabi/QtGuiu.def b/src/s60installs/eabi/QtGuiu.def
index 02b74ee..6b05e9b 100644
--- a/src/s60installs/eabi/QtGuiu.def
+++ b/src/s60installs/eabi/QtGuiu.def
@@ -9899,7 +9899,7 @@ EXPORTS
 	_ZNK7QAction9statusTipEv @ 9898 NONAME
 	_ZNK7QAction9whatsThisEv @ 9899 NONAME
 	_ZNK7QBezier10addIfCloseEPff @ 9900 NONAME
-	_ZNK7QBezier12addToPolygonEP9QPolygonF @ 9901 NONAME
+	_ZNK7QBezier12addToPolygonEP9QPolygonF @ 9901 NONAME ABSENT
 	_ZNK7QBezier16bezierOnIntervalEff @ 9902 NONAME
 	_ZNK7QBezier17addToPolygonMixedEP9QPolygonF @ 9903 NONAME ABSENT
 	_ZNK7QBezier17stationaryYPointsERfS0_ @ 9904 NONAME
@@ -9909,7 +9909,7 @@ EXPORTS
 	_ZNK7QBezier6lengthEf @ 9908 NONAME
 	_ZNK7QBezier7shiftedEPS_iff @ 9909 NONAME
 	_ZNK7QBezier9tAtLengthEf @ 9910 NONAME
-	_ZNK7QBezier9toPolygonEv @ 9911 NONAME
+	_ZNK7QBezier9toPolygonEv @ 9911 NONAME ABSENT
 	_ZNK7QBitmap11transformedERK10QTransform @ 9912 NONAME
 	_ZNK7QBitmap11transformedERK7QMatrix @ 9913 NONAME
 	_ZNK7QBitmapcv8QVariantEv @ 9914 NONAME
@@ -11999,4 +11999,17 @@ EXPORTS
 	_ZNK14QWindowSurface23hasPartialUpdateSupportEv @ 11998 NONAME
 	_ZNK5QIcon4nameEv @ 11999 NONAME
 	_ZN20QGraphicsViewPrivate12updateRegionERK6QRectFRK10QTransform @ 12000 NONAME
+	_ZN12QPixmapCache10allPixmapsEv @ 12001 NONAME
+	_ZN12QPixmapCache20flushDetachedPixmapsEv @ 12002 NONAME
+	_ZN12QPixmapCache9totalUsedEv @ 12003 NONAME
+	_ZN20QGraphicsItemPrivate30updatePaintedViewBoundingRectsEb @ 12004 NONAME
+	_ZN20QGraphicsViewPrivate13setUpdateClipEP13QGraphicsItem @ 12005 NONAME
+	_ZN23QImageTextureGlyphCache11fillTextureERKN18QTextureGlyphCache5CoordEj @ 12006 NONAME
+	_ZN23QImageTextureGlyphCache17createTextureDataEii @ 12007 NONAME
+	_ZN23QImageTextureGlyphCache17resizeTextureDataEii @ 12008 NONAME
+	_ZNK23QImageTextureGlyphCache11glyphMarginEv @ 12009 NONAME
+	_ZNK7QBezier12addToPolygonEP9QPolygonFf @ 12010 NONAME
+	_ZNK7QBezier9toPolygonEf @ 12011 NONAME
+	_ZTI23QImageTextureGlyphCache @ 12012 NONAME
+	_ZTV23QImageTextureGlyphCache @ 12013 NONAME
 
diff --git a/src/s60installs/eabi/QtNetworku.def b/src/s60installs/eabi/QtNetworku.def
index 2566415..87e0805 100644
--- a/src/s60installs/eabi/QtNetworku.def
+++ b/src/s60installs/eabi/QtNetworku.def
@@ -1167,4 +1167,5 @@ EXPORTS
 	_ZNK13QBearerEngine19configurationsInUseEv @ 1166 NONAME
 	_ZNK21QNetworkAccessManager17networkAccessibleEv @ 1167 NONAME
 	_ZN35QNetworkConfigurationManagerPrivate12capabilitiesEv @ 1168 NONAME
+	_ZN10QTcpServer20addPendingConnectionEP10QTcpSocket @ 1169 NONAME
 
diff --git a/src/s60installs/eabi/QtOpenVGu.def b/src/s60installs/eabi/QtOpenVGu.def
index 5db9dce..04f7876 100644
--- a/src/s60installs/eabi/QtOpenVGu.def
+++ b/src/s60installs/eabi/QtOpenVGu.def
@@ -196,7 +196,7 @@ EXPORTS
 	_ZN13QVGPixmapData19detachImageFromPoolEv @ 195 NONAME
 	_ZTI12QVGImagePool @ 196 NONAME
 	_ZTV12QVGImagePool @ 197 NONAME
-	_ZN14QVGPaintEngine16drawCachedGlyphsEiPKjRK5QFontP11QFontEngineRK7QPointF @ 198 NONAME
+	_ZN14QVGPaintEngine16drawCachedGlyphsEiPKjRK5QFontP11QFontEngineRK7QPointF @ 198 NONAME ABSENT
 	_ZN14QVGPaintEngine18drawStaticTextItemEP15QStaticTextItem @ 199 NONAME
 	_ZN14QVGPaintEngine19drawPixmapFragmentsEPKN8QPainter14PixmapFragmentEiRK7QPixmap6QFlagsINS0_18PixmapFragmentHintEE @ 200 NONAME
 	_ZN25QVGEGLWindowSurfaceDirect6scrollEP7QWidgetRK7QRegionii @ 201 NONAME