Changeset 769 for trunk/src/s60installs/eabi

Timestamp:

Aug 2, 2010, 9:27:30 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.3 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/s60installs/eabi/QtCoreu.def (modified) (1 diff)
• src/s60installs/eabi/QtGuiu.def (modified) (4 diffs)
• src/s60installs/eabi/QtNetworku.def (modified) (1 diff)
• src/s60installs/eabi/QtOpenVGu.def (modified) (1 diff)

trunk/src/s60installs/eabi/QtCoreu.def

@@ -3635 +3635 @@
         _ZTVN13QStateMachine12WrappedEventE @ 3634 NONAME
         _ZN11QMetaObject13disconnectOneEPK7QObjectiS2_i @ 3635 NONAME
+        _Z33QBasicAtomicInt_testAndSetAcquirePViii @ 3636 NONAME
+        _Z33QBasicAtomicInt_testAndSetRelaxedPViii @ 3637 NONAME
+        _Z33QBasicAtomicInt_testAndSetReleasePViii @ 3638 NONAME
+        _Z34QBasicAtomicInt_fetchAndAddAcquirePVii @ 3639 NONAME
+        _Z34QBasicAtomicInt_fetchAndAddRelaxedPVii @ 3640 NONAME
+        _Z34QBasicAtomicInt_fetchAndAddReleasePVii @ 3641 NONAME
+        _Z36QBasicAtomicInt_fetchAndStoreAcquirePVii @ 3642 NONAME
+        _Z36QBasicAtomicInt_fetchAndStoreRelaxedPVii @ 3643 NONAME
+        _Z36QBasicAtomicInt_fetchAndStoreReleasePVii @ 3644 NONAME
+        _Z37QBasicAtomicPointer_testAndSetAcquirePVPvS_S_ @ 3645 NONAME
+        _Z37QBasicAtomicPointer_testAndSetRelaxedPVPvS_S_ @ 3646 NONAME
+        _Z37QBasicAtomicPointer_testAndSetReleasePVPvS_S_ @ 3647 NONAME
+        _Z38QBasicAtomicPointer_fetchAndAddAcquirePVPvi @ 3648 NONAME
+        _Z38QBasicAtomicPointer_fetchAndAddRelaxedPVPvi @ 3649 NONAME
+        _Z38QBasicAtomicPointer_fetchAndAddReleasePVPvi @ 3650 NONAME
+        _Z40QBasicAtomicPointer_fetchAndStoreAcquirePVPvS_ @ 3651 NONAME
+        _Z40QBasicAtomicPointer_fetchAndStoreRelaxedPVPvS_ @ 3652 NONAME
+        _Z40QBasicAtomicPointer_fetchAndStoreReleasePVPvS_ @ 3653 NONAME
+        _ZN10QTextCodec11validCodecsEv @ 3654 NONAME
+        _ZN20QStateMachinePrivate12clearHistoryEv @ 3655 NONAME
 

trunk/src/s60installs/eabi/QtGuiu.def

@@ -1819 +1819 @@
         _ZN12QLineControl17processMouseEventEP11QMouseEvent @ 1818 NONAME
         _ZN12QLineControl17resetInputContextEv @ 1819 NONAME
-        _ZN12QLineControl17updateDisplayTextEv @ 1820 NONAME
+        _ZN12QLineControl17updateDisplayTextEv @ 1820 NONAME ABSENT
         _ZN12QLineControl18displayTextChangedERK7QString @ 1821 NONAME
         _ZN12QLineControl18removeSelectedTextEv @ 1822 NONAME
@@ -4664 +4664 @@
         _ZN20QGraphicsItemPrivate12setPosHelperERK7QPointF @ 4663 NONAME
         _ZN20QGraphicsItemPrivate13clearSubFocusEP13QGraphicsItem @ 4664 NONAME
-        _ZN20QGraphicsItemPrivate14setFocusHelperEN2Qt11FocusReasonEb @ 4665 NONAME
+        _ZN20QGraphicsItemPrivate14setFocusHelperEN2Qt11FocusReasonEb @ 4665 NONAME ABSENT
         _ZN20QGraphicsItemPrivate15resetFocusProxyEv @ 4666 NONAME
         _ZN20QGraphicsItemPrivate16setEnabledHelperEbbb @ 4667 NONAME
@@ -11742 +11742 @@
         _ZNK11QVectorPath12addCacheDataEP14QPaintEngineExPvPFvS1_S2_E @ 11741 NONAME
         _ZNK20QGraphicsItemPrivate20discardUpdateRequestEbbb @ 11742 NONAME
-        _ZN11QEglContext10extensionsEv @ 11743 NONAME ABSENT
+        _ZN11QEglContext10extensionsEv @ 11743 NONAME
         _ZN11QEglContext10getDisplayEP12QPaintDevice @ 11744 NONAME ABSENT
-        _ZN11QEglContext10waitClientEv @ 11745 NONAME ABSENT
-        _ZN11QEglContext10waitNativeEv @ 11746 NONAME ABSENT
-        _ZN11QEglContext11doneCurrentEv @ 11747 NONAME ABSENT
-        _ZN11QEglContext11errorStringEi @ 11748 NONAME ABSENT
-        _ZN11QEglContext11makeCurrentEi @ 11749 NONAME ABSENT
+        _ZN11QEglContext10waitClientEv @ 11745 NONAME
+        _ZN11QEglContext10waitNativeEv @ 11746 NONAME
+        _ZN11QEglContext11doneCurrentEv @ 11747 NONAME
+        _ZN11QEglContext11errorStringEi @ 11748 NONAME
+        _ZN11QEglContext11makeCurrentEi @ 11749 NONAME
         _ZN11QEglContext11openDisplayEP12QPaintDevice @ 11750 NONAME ABSENT
-        _ZN11QEglContext11swapBuffersEi @ 11751 NONAME ABSENT
-        _ZN11QEglContext12chooseConfigERK14QEglPropertiesN4QEgl16PixelFormatMatchE @ 11752 NONAME ABSENT
-        _ZN11QEglContext12hasExtensionEPKc @ 11753 NONAME ABSENT
-        _ZN11QEglContext13createContextEPS_PK14QEglProperties @ 11754 NONAME ABSENT
-        _ZN11QEglContext13createSurfaceEP12QPaintDevicePK14QEglProperties @ 11755 NONAME ABSENT
-        _ZN11QEglContext14currentContextEN4QEgl3APIE @ 11756 NONAME ABSENT
+        _ZN11QEglContext11swapBuffersEi @ 11751 NONAME
+        _ZN11QEglContext12chooseConfigERK14QEglPropertiesN4QEgl16PixelFormatMatchE @ 11752 NONAME
+        _ZN11QEglContext12hasExtensionEPKc @ 11753 NONAME
+        _ZN11QEglContext13createContextEPS_PK14QEglProperties @ 11754 NONAME
+        _ZN11QEglContext13createSurfaceEP12QPaintDevicePK14QEglProperties @ 11755 NONAME
+        _ZN11QEglContext14currentContextEN4QEgl3APIE @ 11756 NONAME
         _ZN11QEglContext14defaultDisplayEP12QPaintDevice @ 11757 NONAME ABSENT
-        _ZN11QEglContext14destroySurfaceEi @ 11758 NONAME ABSENT
-        _ZN11QEglContext14dumpAllConfigsEv @ 11759 NONAME ABSENT
-        _ZN11QEglContext15lazyDoneCurrentEv @ 11760 NONAME ABSENT
-        _ZN11QEglContext17setCurrentContextEN4QEgl3APIEPS_ @ 11761 NONAME ABSENT
+        _ZN11QEglContext14destroySurfaceEi @ 11758 NONAME
+        _ZN11QEglContext14dumpAllConfigsEv @ 11759 NONAME
+        _ZN11QEglContext15lazyDoneCurrentEv @ 11760 NONAME
+        _ZN11QEglContext17setCurrentContextEN4QEgl3APIEPS_ @ 11761 NONAME
         _ZN11QEglContext7destroyEv @ 11762 NONAME ABSENT
-        _ZN11QEglContextC1Ev @ 11763 NONAME ABSENT
-        _ZN11QEglContextC2Ev @ 11764 NONAME ABSENT
-        _ZN11QEglContextD1Ev @ 11765 NONAME ABSENT
-        _ZN11QEglContextD2Ev @ 11766 NONAME ABSENT
-        _ZN14QEglProperties11removeValueEi @ 11767 NONAME ABSENT
-        _ZN14QEglProperties14dumpAllConfigsEv @ 11768 NONAME ABSENT
-        _ZN14QEglProperties14setPixelFormatEN6QImage6FormatE @ 11769 NONAME ABSENT
-        _ZN14QEglProperties17setRenderableTypeEN4QEgl3APIE @ 11770 NONAME ABSENT
-        _ZN14QEglProperties19reduceConfigurationEv @ 11771 NONAME ABSENT
-        _ZN14QEglProperties20setPaintDeviceFormatEP12QPaintDevice @ 11772 NONAME ABSENT
-        _ZN14QEglProperties8setValueEii @ 11773 NONAME ABSENT
-        _ZN14QEglPropertiesC1Ei @ 11774 NONAME ABSENT
-        _ZN14QEglPropertiesC1Ev @ 11775 NONAME ABSENT
-        _ZN14QEglPropertiesC2Ei @ 11776 NONAME ABSENT
-        _ZN14QEglPropertiesC2Ev @ 11777 NONAME ABSENT
-        _ZNK11QEglContext12configAttribEiPi @ 11778 NONAME ABSENT
-        _ZNK11QEglContext16configPropertiesEi @ 11779 NONAME ABSENT
-        _ZNK11QEglContext7isValidEv @ 11780 NONAME ABSENT
-        _ZNK11QEglContext9isCurrentEv @ 11781 NONAME ABSENT
-        _ZNK14QEglProperties5valueEi @ 11782 NONAME ABSENT
-        _ZNK14QEglProperties8toStringEv @ 11783 NONAME ABSENT
+        _ZN11QEglContextC1Ev @ 11763 NONAME
+        _ZN11QEglContextC2Ev @ 11764 NONAME
+        _ZN11QEglContextD1Ev @ 11765 NONAME
+        _ZN11QEglContextD2Ev @ 11766 NONAME
+        _ZN14QEglProperties11removeValueEi @ 11767 NONAME
+        _ZN14QEglProperties14dumpAllConfigsEv @ 11768 NONAME
+        _ZN14QEglProperties14setPixelFormatEN6QImage6FormatE @ 11769 NONAME
+        _ZN14QEglProperties17setRenderableTypeEN4QEgl3APIE @ 11770 NONAME
+        _ZN14QEglProperties19reduceConfigurationEv @ 11771 NONAME
+        _ZN14QEglProperties20setPaintDeviceFormatEP12QPaintDevice @ 11772 NONAME
+        _ZN14QEglProperties8setValueEii @ 11773 NONAME
+        _ZN14QEglPropertiesC1Ei @ 11774 NONAME
+        _ZN14QEglPropertiesC1Ev @ 11775 NONAME
+        _ZN14QEglPropertiesC2Ei @ 11776 NONAME
+        _ZN14QEglPropertiesC2Ev @ 11777 NONAME
+        _ZNK11QEglContext12configAttribEiPi @ 11778 NONAME
+        _ZNK11QEglContext16configPropertiesEi @ 11779 NONAME
+        _ZNK11QEglContext7isValidEv @ 11780 NONAME
+        _ZNK11QEglContext9isCurrentEv @ 11781 NONAME
+        _ZNK14QEglProperties5valueEi @ 11782 NONAME
+        _ZNK14QEglProperties8toStringEv @ 11783 NONAME
         _ZNK11QFontEngine10glyphCacheEPvN21QFontEngineGlyphCache4TypeERK10QTransform @ 11784 NONAME
         _ZNK20QGraphicsItemPrivate21effectiveBoundingRectERK6QRectF @ 11785 NONAME
@@ -11806 +11806 @@
         _ZN9QS60Style10timerEventEP11QTimerEvent @ 11805 NONAME
         _ZN9QS60Style11eventFilterEP7QObjectP6QEvent @ 11806 NONAME
+        _ZN11QEglContext10clearErrorEv @ 11807 NONAME
+        _ZN11QEglContext13nativeDisplayEv @ 11808 NONAME
+        _ZN11QEglContext14destroyContextEv @ 11809 NONAME
+        _ZN11QEglContext3dpyE @ 11810 NONAME DATA 4
+        _ZN11QEglContext5errorEv @ 11811 NONAME
+        _ZN11QEglContext7displayEv @ 11812 NONAME
+        _ZN11QFontEngine16getGlyphBearingsEjPfS0_ @ 11813 NONAME
+        _ZN12QLineControl17updateDisplayTextEb @ 11814 NONAME
+        _ZN13QFontDatabase25removeAllApplicationFontsEv @ 11815 NONAME
+        _ZN14QWidgetPrivate11inTabWidgetEP7QWidget @ 11816 NONAME
+        _ZN14QWidgetPrivate17canKeypadNavigateEN2Qt11OrientationE @ 11817 NONAME
+        _ZN20QGraphicsItemPrivate14setFocusHelperEN2Qt11FocusReasonEbb @ 11818 NONAME
+        _ZN20QGraphicsItemPrivate16clearFocusHelperEb @ 11819 NONAME
+        _ZN24QImagePixmapCleanupHooks13isImageCachedERK6QImage @ 11820 NONAME
+        _ZN24QImagePixmapCleanupHooks14isPixmapCachedERK7QPixmap @ 11821 NONAME
 

trunk/src/s60installs/eabi/QtNetworku.def

@@ -994 +994 @@
         _ZN15QNetworkRequest20setOriginatingObjectEP7QObject @ 993 NONAME
         _ZNK15QNetworkRequest17originatingObjectEv @ 994 NONAME
+        _Z19qt_qhostinfo_lookupRK7QStringP7QObjectPKcPbPi @ 995 NONAME
+        _Z24qt_qhostinfo_clear_cachev @ 996 NONAME
 

trunk/src/s60installs/eabi/QtOpenVGu.def

@@ -174 +174 @@
         _ZN13QVGPixmapData22destroyImageAndContextEv @ 173 NONAME
         _ZN13QVGPixmapData9hibernateEv @ 174 NONAME
+        _ZN12QVGImagePool11detachImageEP13QVGPixmapData @ 175 NONAME
+        _ZN12QVGImagePool12reclaimSpaceE13VGImageFormatllP13QVGPixmapData @ 176 NONAME
+        _ZN12QVGImagePool12releaseImageEP13QVGPixmapDatam @ 177 NONAME
+        _ZN12QVGImagePool12setImagePoolEPS_ @ 178 NONAME
+        _ZN12QVGImagePool13removeFromLRUEP13QVGPixmapData @ 179 NONAME
+        _ZN12QVGImagePool15moveToHeadOfLRUEP13QVGPixmapData @ 180 NONAME
+        _ZN12QVGImagePool20createImageForPixmapE13VGImageFormatllmP13QVGPixmapData @ 181 NONAME
+        _ZN12QVGImagePool20createPermanentImageE13VGImageFormatllm @ 182 NONAME
+        _ZN12QVGImagePool20createTemporaryImageE13VGImageFormatllmP13QVGPixmapData @ 183 NONAME
+        _ZN12QVGImagePool8instanceEv @ 184 NONAME
+        _ZN12QVGImagePool8useImageEP13QVGPixmapData @ 185 NONAME
+        _ZN12QVGImagePool9hibernateEv @ 186 NONAME
+        _ZN12QVGImagePool9pixmapLRUEv @ 187 NONAME
+        _ZN12QVGImagePoolC1Ev @ 188 NONAME
+        _ZN12QVGImagePoolC2Ev @ 189 NONAME
+        _ZN12QVGImagePoolD0Ev @ 190 NONAME
+        _ZN12QVGImagePoolD1Ev @ 191 NONAME
+        _ZN12QVGImagePoolD2Ev @ 192 NONAME
+        _ZN13QVGPixmapData13destroyImagesEv @ 193 NONAME
+        _ZN13QVGPixmapData13reclaimImagesEv @ 194 NONAME
+        _ZN13QVGPixmapData19detachImageFromPoolEv @ 195 NONAME
+        _ZTI12QVGImagePool @ 196 NONAME
+        _ZTV12QVGImagePool @ 197 NONAME
+        _ZN25QVGEGLWindowSurfaceDirect6scrollEP7QWidgetRK7QRegionii @ 198 NONAME
+        _ZNK25QVGEGLWindowSurfaceDirect22supportsStaticContentsEv @ 199 NONAME