Eabi DEF file sync between Qt 4.7 and 4.8

New functions have been added to both Qt 4.7 and 4.8, but they have
ended up at different ordinal positions in the DEF files. This change
corrects that so that a function in 4.7 will be at the same position
in 4.8.

Reviewed-by: Honglei Zhang

7 files changed, 80 insertions, 72 deletions

diff --git a/src/s60installs/eabi/QtCoreu.def b/src/s60installs/eabi/QtCoreu.def
index c754d917a3..f0bf9fc752 100644
--- a/src/s60installs/eabi/QtCoreu.def
+++ b/src/s60installs/eabi/QtCoreu.def
@@ -4162,4 +4162,5 @@ EXPORTS
 	_ZNK4QUrl14topLevelDomainEv @ 4161 NONAME
 	_ZNK5QUuid11toByteArrayEv @ 4162 NONAME
 	_ZNK5QUuid9toRfc4122Ev @ 4163 NONAME
+	_ZN18QAbstractItemModel17resetInternalDataEv @ 4164 NONAME
 
diff --git a/src/s60installs/eabi/QtDeclarativeu.def b/src/s60installs/eabi/QtDeclarativeu.def
index b40ac381dd..85030cdddc 100644
--- a/src/s60installs/eabi/QtDeclarativeu.def
+++ b/src/s60installs/eabi/QtDeclarativeu.def
@@ -2007,4 +2007,5 @@ EXPORTS
 	_ZNK28QDeclarativeInspectorService10metaObjectEv @ 2006 NONAME
 	_ZTI28QDeclarativeInspectorService @ 2007 NONAME
 	_ZTV28QDeclarativeInspectorService @ 2008 NONAME
+	_ZN28QDeclarativeInspectorService12updateStatusEv @ 2009 NONAME
 
diff --git a/src/s60installs/eabi/QtGuiu.def b/src/s60installs/eabi/QtGuiu.def
index 95a5dbd178..01b3772a2e 100644
--- a/src/s60installs/eabi/QtGuiu.def
+++ b/src/s60installs/eabi/QtGuiu.def
@@ -12182,24 +12182,24 @@ EXPORTS
 	_ZNK14QVolatileImage9constBitsEv @ 12181 NONAME
 	_ZN15QGraphicsSystem22releaseCachedResourcesEv @ 12182 NONAME ABSENT
 	_Z32qt_s60_setPartialScreenInputModeb @ 12183 NONAME
-	_Z18qt_addBitmapToPathffPKhiiiP12QPainterPath @ 12184 NONAME
-	_Z22qt_fontdata_from_indexi @ 12185 NONAME
-	_Z32qGamma_correct_back_to_linear_csP6QImage @ 12186 NONAME
-	_ZN10QBlittable4lockEv @ 12187 NONAME
-	_ZN10QBlittable6unlockEv @ 12188 NONAME
-	_ZN10QBlittableC2ERK5QSize6QFlagsINS_10CapabilityEE @ 12189 NONAME
-	_ZN10QBlittableD0Ev @ 12190 NONAME
-	_ZN10QBlittableD1Ev @ 12191 NONAME
-	_ZN10QBlittableD2Ev @ 12192 NONAME
-	_ZN11QFontEngine16alphaMapForGlyphEj6QFixed @ 12193 NONAME
-	_ZN11QFontEngine16alphaMapForGlyphEj6QFixedRK10QTransform @ 12194 NONAME
-	_ZN11QFontEngine19alphaRGBMapForGlyphEj6QFixediRK10QTransform @ 12195 NONAME
-	_ZN12QInputDialog7getItemEP7QWidgetRK7QStringS4_RK11QStringListibPb6QFlagsIN2Qt10WindowTypeEES9_INSA_15InputMethodHintEE @ 12196 NONAME
-	_ZN12QInputDialog7getTextEP7QWidgetRK7QStringS4_N9QLineEdit8EchoModeES4_Pb6QFlagsIN2Qt10WindowTypeEES8_INS9_15InputMethodHintEE @ 12197 NONAME
-	_Z27qt_isExtendedRadialGradientRK6QBrush @ 12198 NONAME
-	_Z28qt_painterPathFromVectorPathRK11QVectorPath @ 12199 NONAME
-	_Z29qt_draw_decoration_for_glyphsP8QPainterPKjPK11QFixedPointiP11QFontEngineRK5QFontRK15QTextCharFormat @ 12200 NONAME
-	_Z43qt_s60_setPartialScreenAutomaticTranslationb @ 12201 NONAME
+	_Z29qt_draw_decoration_for_glyphsP8QPainterPKjPK11QFixedPointiP11QFontEngineRK5QFontRK15QTextCharFormat @ 12184 NONAME
+	_ZNK14QVolatileImage14paintingActiveEv @ 12185 NONAME
+	_ZN11QTextEngine17leadingSpaceWidthERK11QScriptLine @ 12186 NONAME
+	_ZN15QGraphicsLayout28instantInvalidatePropagationEv @ 12187 NONAME
+	_ZN15QGraphicsLayout31setInstantInvalidatePropagationEb @ 12188 NONAME
+	_ZN15QGraphicsSystem17platformExtensionEv @ 12189 NONAME
+	_ZN24QSymbianGraphicsSystemEx10hasBCM2727Ev @ 12190 NONAME
+	_ZN24QSymbianGraphicsSystemEx13forceToRasterEP7QWidget @ 12191 NONAME
+	_ZN24QSymbianGraphicsSystemEx22releaseAllGpuResourcesEv @ 12192 NONAME
+	_ZN24QSymbianGraphicsSystemEx25releaseCachedGpuResourcesEv @ 12193 NONAME
+	_ZTI17QGraphicsSystemEx @ 12194 NONAME
+	_ZTI24QSymbianGraphicsSystemEx @ 12195 NONAME
+	_ZTV24QSymbianGraphicsSystemEx @ 12196 NONAME
+	_ZNK11QPixmapData15toVolatileImageEv @ 12197 NONAME
+	_ZNK14QVolatileImage13constImageRefEv @ 12198 NONAME
+	_Z43qt_s60_setPartialScreenAutomaticTranslationb @ 12199 NONAME
+	_Z18qt_addBitmapToPathffPKhiiiP12QPainterPath @ 12200 NONAME
+	_Z28qt_painterPathFromVectorPathRK11QVectorPath @ 12201 NONAME
 	_ZN10QBoxLayout18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12202 NONAME
 	_ZN10QBoxLayout25staticMetaObjectExtraDataE @ 12203 NONAME DATA 8
 	_ZN10QClipboard18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12204 NONAME
@@ -12282,7 +12282,7 @@ EXPORTS
 	_ZN11QTapGesture25staticMetaObjectExtraDataE @ 12281 NONAME DATA 8
 	_ZN11QTextEngine15beginningOfLineEi @ 12282 NONAME
 	_ZN11QTextEngine16offsetInLigatureEPK11QScriptItemiii @ 12283 NONAME
-	_ZN11QTextEngine17leadingSpaceWidthERK11QScriptLine @ 12284 NONAME
+	_Z32qGamma_correct_back_to_linear_csP6QImage @ 12284 NONAME
 	_ZN11QTextEngine22insertionPointsForLineEiR7QVectorIiE @ 12285 NONAME
 	_ZN11QTextEngine25lineNumberForTextPositionEi @ 12286 NONAME
 	_ZN11QTextEngine27positionAfterVisualMovementEiN11QTextCursor13MoveOperationE @ 12287 NONAME
@@ -12387,8 +12387,8 @@ EXPORTS
 	_ZN15QGraphicsAnchor25staticMetaObjectExtraDataE @ 12386 NONAME DATA 8
 	_ZN15QGraphicsEffect18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12387 NONAME
 	_ZN15QGraphicsEffect25staticMetaObjectExtraDataE @ 12388 NONAME DATA 8
-	_ZN15QGraphicsLayout28instantInvalidatePropagationEv @ 12389 NONAME
-	_ZN15QGraphicsLayout31setInstantInvalidatePropagationEb @ 12390 NONAME
+	_ZN10QBlittable4lockEv @ 12389 NONAME
+	_ZN10QBlittable6unlockEv @ 12390 NONAME
 	_ZN15QGraphicsObject18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12391 NONAME
 	_ZN15QGraphicsObject25staticMetaObjectExtraDataE @ 12392 NONAME DATA 8
 	_ZN15QGraphicsWidget18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12393 NONAME
@@ -12684,7 +12684,7 @@ EXPORTS
 	_ZNK13QFontMetricsF10inFontUcs4Ej @ 12683 NONAME
 	_ZNK13QTextDocument22defaultCursorMoveStyleEv @ 12684 NONAME
 	_ZNK14QFileOpenEvent8openFileER5QFile6QFlagsIN9QIODevice12OpenModeFlagEE @ 12685 NONAME
-	_ZNK14QVolatileImage14paintingActiveEv @ 12686 NONAME
+	_Z22qt_fontdata_from_indexi @ 12686 NONAME
 	_ZNK14QWidgetPrivate17hasHeightForWidthEv @ 12687 NONAME
 	_ZNK14QWindowSurface8featuresEv @ 12688 NONAME
 	_ZNK15QRadialGradient11focalRadiusEv @ 12689 NONAME
@@ -12740,18 +12740,22 @@ EXPORTS
 	_Zls6QDebugPK13QSymbianEvent @ 12739 NONAME
 	_ZN11QTextLayout18setCursorMoveStyleEN2Qt15CursorMoveStyleE @ 12740 NONAME
 	_ZN13QTextDocument25setDefaultCursorMoveStyleEN2Qt15CursorMoveStyleE @ 12741 NONAME
-	_ZN15QGraphicsSystem17platformExtensionEv @ 12742 NONAME
-	_ZN24QSymbianGraphicsSystemEx10hasBCM2727Ev @ 12743 NONAME
-	_ZN24QSymbianGraphicsSystemEx13forceToRasterEP7QWidget @ 12744 NONAME
-	_ZN24QSymbianGraphicsSystemEx22releaseAllGpuResourcesEv @ 12745 NONAME
-	_ZN24QSymbianGraphicsSystemEx25releaseCachedGpuResourcesEv @ 12746 NONAME
+	_ZN10QBlittableC2ERK5QSize6QFlagsINS_10CapabilityEE @ 12742 NONAME
+	_ZN10QBlittableD0Ev @ 12743 NONAME
+	_ZN10QBlittableD1Ev @ 12744 NONAME
+	_ZN10QBlittableD2Ev @ 12745 NONAME
+	_ZN11QFontEngine16alphaMapForGlyphEj6QFixed @ 12746 NONAME
 	_ZN9QLineEdit18setCursorMoveStyleEN2Qt15CursorMoveStyleE @ 12747 NONAME
-	_ZTI17QGraphicsSystemEx @ 12748 NONAME
-	_ZTI24QSymbianGraphicsSystemEx @ 12749 NONAME
-	_ZTV24QSymbianGraphicsSystemEx @ 12750 NONAME
+	_ZN11QFontEngine16alphaMapForGlyphEj6QFixedRK10QTransform @ 12748 NONAME
+	_ZN11QFontEngine19alphaRGBMapForGlyphEj6QFixediRK10QTransform @ 12749 NONAME
+	_ZN12QInputDialog7getItemEP7QWidgetRK7QStringS4_RK11QStringListibPb6QFlagsIN2Qt10WindowTypeEES9_INSA_15InputMethodHintEE @ 12750 NONAME
 	_ZN11QTextEngine16getClusterLengthEPtPK17HB_CharAttributesiiiPi @ 12751 NONAME
 	_ZN11QTextEngine18positionInLigatureEPK11QScriptItemi6QFixedS3_ib @ 12752 NONAME
 	_ZN14QPaintEngineEx18drawStaticTextItemEP15QStaticTextItem @ 12753 NONAME
 	_ZNK14QPaintEngineEx23supportsTransformationsEfRK10QTransform @ 12754 NONAME
-	_ZNK11QPixmapData15toVolatileImageEv @ 12755 NONAME
-	_ZNK14QVolatileImage13constImageRefEv @ 12756 NONAME
+	_ZN12QInputDialog7getTextEP7QWidgetRK7QStringS4_N9QLineEdit8EchoModeES4_Pb6QFlagsIN2Qt10WindowTypeEES8_INS9_15InputMethodHintEE @ 12755 NONAME
+	_Z27qt_isExtendedRadialGradientRK6QBrush @ 12756 NONAME
+	_ZN5QFont12setStyleNameERK7QString @ 12757 NONAME
+	_ZNK5QFont9styleNameEv @ 12758 NONAME
+	_ZNK9QFontInfo9styleNameEv @ 12759 NONAME
+
diff --git a/src/s60installs/eabi/QtNetworku.def b/src/s60installs/eabi/QtNetworku.def
index 8e29c2de69..32c1b974ce 100644
--- a/src/s60installs/eabi/QtNetworku.def
+++ b/src/s60installs/eabi/QtNetworku.def
@@ -1268,4 +1268,6 @@ EXPORTS
 	_ZN18QNetworkProxyQueryC2ERK21QNetworkConfigurationRK7QStringiS5_NS_9QueryTypeE @ 1267 NONAME
 	_ZN18QNetworkProxyQueryC2ERK21QNetworkConfigurationtRK7QStringNS_9QueryTypeE @ 1268 NONAME
 	_ZNK18QNetworkProxyQuery20networkConfigurationEv @ 1269 NONAME
+	_ZN35QNetworkConfigurationManagerPrivate10initializeEv @ 1270 NONAME
+	_ZN35QNetworkConfigurationManagerPrivate7cleanupEv @ 1271 NONAME
 
diff --git a/src/s60installs/eabi/QtOpenGLu.def b/src/s60installs/eabi/QtOpenGLu.def
index 695829cfdd..ad33f9c02f 100644
--- a/src/s60installs/eabi/QtOpenGLu.def
+++ b/src/s60installs/eabi/QtOpenGLu.def
@@ -724,9 +724,9 @@ EXPORTS
 	_ZN13QGLPixmapData24releaseNativeImageHandleEv @ 723 NONAME
 	_ZN13QGLPixmapData25initFromNativeImageHandleEPvRK7QString @ 724 NONAME
 	_ZN13QGLPixmapData35createFromNativeImageHandleProviderEv @ 725 NONAME
-	_Z28qt_resolve_buffer_extensionsP10QGLContext @ 726 NONAME
-	_ZN12QGLFunctions21initializeGLFunctionsEPK10QGLContext @ 727 NONAME
-	_ZN12QGLFunctionsC1EPK10QGLContext @ 728 NONAME
+	_ZN17QGLGraphicsSystem17platformExtensionEv @ 726 NONAME
+	_ZN17QGLGraphicsSystem25releaseCachedGpuResourcesEv @ 727 NONAME
+	_ZThn4_N17QGLGraphicsSystem25releaseCachedGpuResourcesEv @ 728 NONAME
 	_ZN12QGLFunctionsC1Ev @ 729 NONAME
 	_ZN12QGLFunctionsC2EPK10QGLContext @ 730 NONAME
 	_ZN12QGLFunctionsC2Ev @ 731 NONAME
@@ -780,7 +780,7 @@ EXPORTS
 	_ZN9QGLShader25staticMetaObjectExtraDataE @ 779 NONAME DATA 8
 	_ZN9QGLWidget18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 780 NONAME
 	_ZN9QGLWidget25staticMetaObjectExtraDataE @ 781 NONAME DATA 8
-	_ZN17QGLGraphicsSystem17platformExtensionEv @ 782 NONAME
-	_ZN17QGLGraphicsSystem25releaseCachedGpuResourcesEv @ 783 NONAME
-	_ZThn4_N17QGLGraphicsSystem25releaseCachedGpuResourcesEv @ 784 NONAME
+	_Z28qt_resolve_buffer_extensionsP10QGLContext @ 782 NONAME
+	_ZN12QGLFunctions21initializeGLFunctionsEPK10QGLContext @ 783 NONAME
+	_ZN12QGLFunctionsC1EPK10QGLContext @ 784 NONAME
 
diff --git a/src/s60installs/eabi/QtOpenVGu.def b/src/s60installs/eabi/QtOpenVGu.def
index e2cdbcfa32..7e1d7faf4f 100644
--- a/src/s60installs/eabi/QtOpenVGu.def
+++ b/src/s60installs/eabi/QtOpenVGu.def
@@ -214,5 +214,5 @@ EXPORTS
 	_ZN13QVGPixmapData25initFromNativeImageHandleEPvRK7QString @ 213 NONAME
 	_ZN13QVGPixmapData35createFromNativeImageHandleProviderEv @ 214 NONAME
 	_ZN13QVGPixmapData12forceToImageEb @ 215 NONAME
-	_ZNK16QVGWindowSurface8featuresEv @ 216 NONAME
-	_ZNK13QVGPixmapData15toVolatileImageEv @ 217 NONAME
+	_ZNK13QVGPixmapData15toVolatileImageEv @ 216 NONAME
+	_ZNK16QVGWindowSurface8featuresEv @ 217 NONAME
diff --git a/src/s60installs/eabi/QtTestu.def b/src/s60installs/eabi/QtTestu.def
index 3a4cd73283..ce98aa65dd 100644
--- a/src/s60installs/eabi/QtTestu.def
+++ b/src/s60installs/eabi/QtTestu.def
@@ -132,38 +132,38 @@ EXPORTS
 	_ZN8QTestLog10setLogModeENS_7LogModeE @ 131 NONAME
 	_ZN8QTestLog11stopLoggingEv @ 132 NONAME
 	_ZN8QTestLog12setFlushModeENS_9FlushModeE @ 133 NONAME
-	_ZN8QTestLog12startLoggingEj @ 134 NONAME
-	_ZN8QTestLog12startLoggingEv @ 135 NONAME
-	_ZN8QTestLog12verboseLevelEv @ 136 NONAME
-	_ZN8QTestLog14outputFileNameEv @ 137 NONAME
-	_ZN8QTestLog14redirectOutputEPKc @ 138 NONAME
-	_ZN8QTestLog14setMaxWarningsEi @ 139 NONAME
-	_ZN8QTestLog15setVerboseLevelEi @ 140 NONAME
-	_ZN8QTestLog16addIgnoreMessageE9QtMsgTypePKc @ 141 NONAME
-	_ZN8QTestLog17enterTestFunctionEPKc @ 142 NONAME
-	_ZN8QTestLog17leaveTestFunctionEv @ 143 NONAME
-	_ZN8QTestLog18addBenchmarkResultERK16QBenchmarkResult @ 144 NONAME
-	_ZN8QTestLog23unhandledIgnoreMessagesEv @ 145 NONAME
-	_ZN8QTestLog28printUnhandledIgnoreMessagesEv @ 146 NONAME
-	_ZN8QTestLog4infoEPKcS1_i @ 147 NONAME
-	_ZN8QTestLog4warnEPKc @ 148 NONAME
-	_ZN8QTestLog7addFailEPKcS1_i @ 149 NONAME
-	_ZN8QTestLog7addPassEPKc @ 150 NONAME
-	_ZN8QTestLog7addSkipEPKcN5QTest8SkipModeES1_i @ 151 NONAME
-	_ZN8QTestLog7logModeEv @ 152 NONAME
-	_ZN8QTestLog8addXFailEPKcS1_i @ 153 NONAME
-	_ZN8QTestLog8addXPassEPKcS1_i @ 154 NONAME
-	_ZN8QTestLogC1Ev @ 155 NONAME
-	_ZN8QTestLogC2Ev @ 156 NONAME
-	_ZN8QTestLogD1Ev @ 157 NONAME
-	_ZN8QTestLogD2Ev @ 158 NONAME
-	_ZNK10QTestTable12elementCountEv @ 159 NONAME
-	_ZNK10QTestTable13elementTypeIdEi @ 160 NONAME
-	_ZNK10QTestTable7dataTagEi @ 161 NONAME
-	_ZNK10QTestTable7indexOfEPKc @ 162 NONAME
-	_ZNK10QTestTable7isEmptyEv @ 163 NONAME
-	_ZNK10QTestTable8testDataEi @ 164 NONAME
-	_ZNK10QTestTable9dataCountEv @ 165 NONAME
+	_ZN8QTestLog12startLoggingEv @ 134 NONAME
+	_ZN8QTestLog12verboseLevelEv @ 135 NONAME
+	_ZN8QTestLog14outputFileNameEv @ 136 NONAME
+	_ZN8QTestLog14redirectOutputEPKc @ 137 NONAME
+	_ZN8QTestLog14setMaxWarningsEi @ 138 NONAME
+	_ZN8QTestLog15setVerboseLevelEi @ 139 NONAME
+	_ZN8QTestLog16addIgnoreMessageE9QtMsgTypePKc @ 140 NONAME
+	_ZN8QTestLog17enterTestFunctionEPKc @ 141 NONAME
+	_ZN8QTestLog17leaveTestFunctionEv @ 142 NONAME
+	_ZN8QTestLog18addBenchmarkResultERK16QBenchmarkResult @ 143 NONAME
+	_ZN8QTestLog23unhandledIgnoreMessagesEv @ 144 NONAME
+	_ZN8QTestLog28printUnhandledIgnoreMessagesEv @ 145 NONAME
+	_ZN8QTestLog4infoEPKcS1_i @ 146 NONAME
+	_ZN8QTestLog4warnEPKc @ 147 NONAME
+	_ZN8QTestLog7addFailEPKcS1_i @ 148 NONAME
+	_ZN8QTestLog7addPassEPKc @ 149 NONAME
+	_ZN8QTestLog7addSkipEPKcN5QTest8SkipModeES1_i @ 150 NONAME
+	_ZN8QTestLog7logModeEv @ 151 NONAME
+	_ZN8QTestLog8addXFailEPKcS1_i @ 152 NONAME
+	_ZN8QTestLog8addXPassEPKcS1_i @ 153 NONAME
+	_ZN8QTestLogC1Ev @ 154 NONAME
+	_ZN8QTestLogC2Ev @ 155 NONAME
+	_ZN8QTestLogD1Ev @ 156 NONAME
+	_ZN8QTestLogD2Ev @ 157 NONAME
+	_ZNK10QTestTable12elementCountEv @ 158 NONAME
+	_ZNK10QTestTable13elementTypeIdEi @ 159 NONAME
+	_ZNK10QTestTable7dataTagEi @ 160 NONAME
+	_ZNK10QTestTable7indexOfEPKc @ 161 NONAME
+	_ZNK10QTestTable7isEmptyEv @ 162 NONAME
+	_ZNK10QTestTable8testDataEi @ 163 NONAME
+	_ZNK10QTestTable9dataCountEv @ 164 NONAME
+	_ZN8QTestLog12startLoggingEj @ 165 NONAME
 	_ZN14QTestEventLoop18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 166 NONAME
 	_ZN14QTestEventLoop25staticMetaObjectExtraDataE @ 167 NONAME DATA 8