Changeset 865 for trunk/src/s60installs/eabi

Timestamp:

May 16, 2011, 4:09:34 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

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

Location:

trunk

Files:

• . (modified) (1 prop)
• src/s60installs/eabi/QtDeclarativeu.def (modified) (6 diffs)

trunk/src/s60installs/eabi/QtDeclarativeu.def

@@ -762 +762 @@
         _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
@@ -1426 +1426 @@
         _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
@@ -1555 +1555 @@
         _ZTI23QDeclarativePropertyMap @ 1554 NONAME
         _ZTI24QDeclarativeCustomParser @ 1555 NONAME
-        _ZTI24QDeclarativeDebugService @ 1556 NONAME ABSENT
+        _ZTI24QDeclarativeDebugService @ 1556 NONAME
         _ZTI24QDeclarativeParserStatus @ 1557 NONAME
         _ZTI25QDeclarativeImageProvider @ 1558 NONAME
@@ -1605 +1605 @@
         _ZTV23QDeclarativePropertyMap @ 1604 NONAME
         _ZTV24QDeclarativeCustomParser @ 1605 NONAME
-        _ZTV24QDeclarativeDebugService @ 1606 NONAME ABSENT
+        _ZTV24QDeclarativeDebugService @ 1606 NONAME
         _ZTV24QDeclarativeParserStatus @ 1607 NONAME
         _ZTV25QDeclarativeImageProvider @ 1608 NONAME
@@ -1778 +1778 @@
         _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
@@ -1852 +1852 @@
         _ZNK23QDeclarativeDebugClient6statusEv @ 1851 NONAME ABSENT
         _ZNK23QDeclarativeEngineDebug6statusEv @ 1852 NONAME ABSENT
-        _ZNK24QDeclarativeDebugService6statusEv @ 1853 NONAME ABSENT
+        _ZNK24QDeclarativeDebugService6statusEv @ 1853 NONAME
         _ZNK26QDeclarativeBasePositioner10metaObjectEv @ 1854 NONAME ABSENT
         _ZNK26QDeclarativeBasePositioner3addEv @ 1855 NONAME ABSENT