Changeset 865 for trunk/src


Ignore:
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:
17 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/src/3rdparty/webkit/WebKit/qt/qt_webkit_version.pri

    r846 r865  
    1 QT_WEBKIT_VERSION = 4.7.2
     1QT_WEBKIT_VERSION = 4.7.3
    22QT_WEBKIT_MAJOR_VERSION = 4
    33QT_WEBKIT_MINOR_VERSION = 7
    4 QT_WEBKIT_PATCH_VERSION = 2
     4QT_WEBKIT_PATCH_VERSION = 3
    55QT_CONFIG += webkit

  • trunk/src/corelib/global/qglobal.h

    r846 r865  
    4545#include <stddef.h>
    4646
    47 #define QT_VERSION_STR "4.7.2"
     47#define QT_VERSION_STR "4.7.3"
    4848/*
    4949   QT_VERSION is (major << 16) + (minor << 8) + patch.
    5050*/
    51 #define QT_VERSION 0x040702
     51#define QT_VERSION 0x040703
    5252/*
    5353   can be used like #if (QT_VERSION >= QT_VERSION_CHECK(4, 4, 0))
    … …  
    5555#define QT_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch))
    5656
    57 #define QT_PACKAGEDATE_STR "2011-02-22"
    58 
    59 #define QT_PACKAGE_TAG "0828c69ad805406568f6eef2bffbbd54b04dea41"
     57#define QT_PACKAGEDATE_STR "2011-03-30"
     58
     59#define QT_PACKAGE_TAG "a5f89cb5e52554b59b308ca0ceed76873f833c46"
    6060
    6161#if !defined(QT_BUILD_MOC)

  • trunk/src/declarative/debugger/qdeclarativedebugservice_p.h

    r846 r865  
    5454
    5555class QDeclarativeDebugServicePrivate;
    56 class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugService : public QObject
     56class Q_DECLARATIVE_EXPORT QDeclarativeDebugService : public QObject
    5757{
    5858    Q_OBJECT

  • trunk/src/gui/image/qpixmap_s60.cpp

    r846 r865  
    600600}
    601601
     602Q_GUI_EXPORT int qt_defaultDpiX();
     603Q_GUI_EXPORT int qt_defaultDpiY();
     604
    602605int QS60PixmapData::metric(QPaintDevice::PaintDeviceMetric metric) const
    603606{
    … …  
    610613    case QPaintDevice::PdmHeight:
    611614        return cfbsBitmap->SizeInPixels().iHeight;
    612     case QPaintDevice::PdmWidthMM: {
    613         TInt twips = cfbsBitmap->SizeInTwips().iWidth;
    614         return (int)(twips * (25.4/KTwipsPerInch));
    615     }
    616     case QPaintDevice::PdmHeightMM: {
    617         TInt twips = cfbsBitmap->SizeInTwips().iHeight;
    618         return (int)(twips * (25.4/KTwipsPerInch));
    619     }
     615    case QPaintDevice::PdmWidthMM:
     616        return qRound(cfbsBitmap->SizeInPixels().iWidth * 25.4 / qt_defaultDpiX());
     617    case QPaintDevice::PdmHeightMM:
     618        return qRound(cfbsBitmap->SizeInPixels().iHeight * 25.4 / qt_defaultDpiY());
    620619    case QPaintDevice::PdmNumColors:
    621620        return TDisplayModeUtils::NumDisplayModeColors(cfbsBitmap->DisplayMode());
    622621    case QPaintDevice::PdmDpiX:
    623     case QPaintDevice::PdmPhysicalDpiX: {
    624         TReal inches = cfbsBitmap->SizeInTwips().iWidth / (TReal)KTwipsPerInch;
    625         TInt pixels = cfbsBitmap->SizeInPixels().iWidth;
    626         return pixels / inches;
    627     }
     622    case QPaintDevice::PdmPhysicalDpiX:
     623        return qt_defaultDpiX();
    628624    case QPaintDevice::PdmDpiY:
    629     case QPaintDevice::PdmPhysicalDpiY: {
    630         TReal inches = cfbsBitmap->SizeInTwips().iHeight / (TReal)KTwipsPerInch;
    631         TInt pixels = cfbsBitmap->SizeInPixels().iHeight;
    632         return pixels / inches;
    633     }
     625    case QPaintDevice::PdmPhysicalDpiY:
     626        return qt_defaultDpiY();
    634627    case QPaintDevice::PdmDepth:
    635628        return TDisplayModeUtils::NumDisplayModeBitsPerPixel(cfbsBitmap->DisplayMode());

  • trunk/src/gui/kernel/qapplication_s60.cpp

    r846 r865  
    12441244        qwidget->d_func()->setWindowTitle_sys(qwidget->windowTitle());
    12451245#ifdef Q_WS_S60
    1246         // If widget is fullscreen/minimized, hide status pane and button container otherwise show them.
    1247         QWidget *const window = qwidget->window();
    1248         if (!window->parentWidget()) { // Only top level native windows have control over cba/status pane
    1249             const bool decorationsVisible = !(window->windowState() & (Qt::WindowFullScreen | Qt::WindowMinimized));
    1250             const bool statusPaneVisibility = decorationsVisible;
    1251             const bool isFullscreen = window->windowState() & Qt::WindowFullScreen;
    1252             const bool cbaVisibilityHint = window->windowFlags() & Qt::WindowSoftkeysVisibleHint;
    1253             const bool buttonGroupVisibility = (decorationsVisible || (isFullscreen && cbaVisibilityHint));
    1254             S60->setStatusPaneAndButtonGroupVisibility(statusPaneVisibility, buttonGroupVisibility);
     1246        if (qwidget->isWindow()) {
     1247            QWidget *const window = qwidget->window();
     1248            QWidget *parentWindow = window->parentWidget();
     1249            if (parentWindow) {
     1250                while (parentWindow->parentWidget())
     1251                    parentWindow = parentWindow->parentWidget();
     1252            } else {
     1253                parentWindow = window;
     1254            }
     1255
     1256            const bool parentDecorationsVisible = !(parentWindow->windowState() & (Qt::WindowFullScreen | Qt::WindowMinimized));
     1257            const bool parentIsFullscreen = parentWindow->windowState() & Qt::WindowFullScreen;
     1258            const bool parentCbaVisibilityHint = parentWindow->windowFlags() & Qt::WindowSoftkeysVisibleHint;
     1259            bool buttonGroupVisibility = (parentDecorationsVisible || (parentIsFullscreen && parentCbaVisibilityHint));
     1260
     1261            // For non-toplevel normal and maximized windows, show cba if window has softkey
     1262            // actions even if topmost parent is not showing cba. Do the same for fullscreen
     1263            // windows that request it.
     1264            if (!buttonGroupVisibility
     1265                && window->parentWidget()
     1266                && !(window->windowState() & Qt::WindowMinimized)
     1267                && ((window->windowFlags() & Qt::WindowSoftkeysVisibleHint) || !(window->windowState() & Qt::WindowFullScreen))) {
     1268                for (int i = 0; i < window->actions().size(); ++i) {
     1269                    if (window->actions().at(i)->softKeyRole() != QAction::NoSoftKey) {
     1270                        buttonGroupVisibility = true;
     1271                        break;
     1272                    }
     1273                }
     1274            }
     1275            S60->setStatusPaneAndButtonGroupVisibility(parentDecorationsVisible, buttonGroupVisibility);
    12551276        }
    12561277#endif

  • trunk/src/gui/kernel/qwidget_s60.cpp

    r846 r865  
    11851185
    11861186#ifdef Q_WS_S60
    1187         bool decorationsVisible(false);
    1188         if (!parentWidget()) { // Only top level native windows have control over cba/status pane
    1189             // Hide window decoration when switching to fullscreen / minimized otherwise show decoration.
    1190             // The window decoration visibility has to be changed before doing actual window state
    1191             // change since in that order the availableGeometry will return directly the right size and
    1192             // we will avoid unnecessary redraws
    1193             decorationsVisible = !(newstate & (Qt::WindowFullScreen | Qt::WindowMinimized));
    1194             const bool statusPaneVisibility = decorationsVisible;
    1195             const bool buttonGroupVisibility = (decorationsVisible || (isFullscreen && cbaRequested));
    1196             S60->setStatusPaneAndButtonGroupVisibility(statusPaneVisibility, buttonGroupVisibility);
    1197         }
     1187        // Hide window decoration when switching to fullscreen / minimized otherwise show decoration.
     1188        // The window decoration visibility has to be changed before doing actual window state
     1189        // change since in that order the availableGeometry will return directly the right size and
     1190        // we will avoid unnecessary redraws
     1191        Qt::WindowStates comparisonState = newstate;
     1192        QWidget *parentWindow = parentWidget();
     1193        if (parentWindow) {
     1194            while (parentWindow->parentWidget())
     1195                parentWindow = parentWindow->parentWidget();
     1196            comparisonState = parentWindow->windowState();
     1197        } else {
     1198            parentWindow = this;
     1199        }
     1200
     1201        const bool decorationsVisible = !(comparisonState & (Qt::WindowFullScreen | Qt::WindowMinimized));
     1202        const bool parentIsFullscreen = comparisonState & Qt::WindowFullScreen;
     1203        const bool parentCbaVisibilityHint = parentWindow->windowFlags() & Qt::WindowSoftkeysVisibleHint;
     1204        bool buttonGroupVisibility = (decorationsVisible || (parentIsFullscreen && parentCbaVisibilityHint));
     1205
     1206        // For non-toplevel normal and maximized windows, show cba if window has softkey
     1207        // actions even if topmost parent is not showing cba. Do the same for fullscreen
     1208        // windows that request it.
     1209        if (!buttonGroupVisibility
     1210            && parentWidget()
     1211            && !(newstate & Qt::WindowMinimized)
     1212            && ((windowFlags() & Qt::WindowSoftkeysVisibleHint) || !(newstate & Qt::WindowFullScreen))) {
     1213            for (int i = 0; i < actions().size(); ++i) {
     1214                if (actions().at(i)->softKeyRole() != QAction::NoSoftKey) {
     1215                    buttonGroupVisibility = true;
     1216                    break;
     1217                }
     1218            }
     1219        }
     1220        S60->setStatusPaneAndButtonGroupVisibility(decorationsVisible, buttonGroupVisibility);
     1221
    11981222#endif // Q_WS_S60
    11991223

  • trunk/src/gui/styles/qs60style.cpp

    r846 r865  
    26442644            //native items have small empty areas at the beginning and end of menu item
    26452645            sz.setWidth(sz.width() + 2 * pixelMetric(PM_MenuHMargin) + 2 * QS60StylePrivate::pixelMetric(PM_FrameCornerWidth));
    2646             if (QS60StylePrivate::isTouchSupported())
     2646            if (QS60StylePrivate::isTouchSupported()) {
    26472647                //Make itemview easier to use in touch devices
     2648                sz.setHeight(sz.height() + 2 * pixelMetric(PM_FocusFrameVMargin));
    26482649                //QCommonStyle does not adjust height with horizontal margin, it only adjusts width
    2649                 sz.setHeight(sz.height() + 2 * pixelMetric(PM_FocusFrameVMargin) - 8); //QCommonstyle adds 8 to height that this style handles through PM values
     2650                if (ct == CT_MenuItem)
     2651                    sz.setHeight(sz.height() - 8); //QCommonstyle adds 8 to height that this style handles through PM values
     2652            }
    26502653            break;
    26512654#ifndef QT_NO_COMBOBOX

  • trunk/src/network/bearer/qnetworksession.h

    r846 r865  
    142142#ifndef QT_MOBILITY_BEARER
    143143QT_END_NAMESPACE
     144Q_DECLARE_METATYPE(QNetworkSession::State)
     145Q_DECLARE_METATYPE(QNetworkSession::SessionError)
    144146#else
    145147QTM_END_NAMESPACE
    146148#endif
    147 
    148 Q_DECLARE_METATYPE(QNetworkSession::State)
    149 Q_DECLARE_METATYPE(QNetworkSession::SessionError)
    150149
    151150QT_END_HEADER

  • trunk/src/network/ssl/qsslcertificate.cpp

    r846 r865  
    220220    false.
    221221
    222     Note: Currently, this function only checks that the current
     222    Note: Currently, this function checks that the current
    223223    data-time is within the date-time range during which the
    224     certificate is considered valid. No other checks are
    225     currently performed.
     224    certificate is considered valid, and checks that the
     225    certificate is not in a blacklist of fraudulent certificates.
    226226
    227227    \sa isNull()
    … …  
    230230{
    231231    const QDateTime currentTime = QDateTime::currentDateTime();
    232     return currentTime >= d->notValidBefore && currentTime <= d->notValidAfter;
     232    return currentTime >= d->notValidBefore &&
     233            currentTime <= d->notValidAfter &&
     234            ! QSslCertificatePrivate::isBlacklisted(*this);
    233235}
    234236
    … …  
    799801}
    800802
     803// These certificates are known to be fraudulent and were created during the comodo
     804// compromise. See http://www.comodo.com/Comodo-Fraud-Incident-2011-03-23.html
     805static const char *certificate_blacklist[] = {
     806    "04:7e:cb:e9:fc:a5:5f:7b:d0:9e:ae:36:e1:0c:ae:1e",
     807    "f5:c8:6a:f3:61:62:f1:3a:64:f5:4f:6d:c9:58:7c:06",
     808    "d7:55:8f:da:f5:f1:10:5b:b2:13:28:2b:70:77:29:a3",
     809    "39:2a:43:4f:0e:07:df:1f:8a:a3:05:de:34:e0:c2:29",
     810    "3e:75:ce:d4:6b:69:30:21:21:88:30:ae:86:a8:2a:71",
     811    "e9:02:8b:95:78:e4:15:dc:1a:71:0a:2b:88:15:44:47",
     812    "92:39:d5:34:8f:40:d1:69:5a:74:54:70:e1:f2:3f:43",
     813    "b0:b7:13:3e:d0:96:f9:b5:6f:ae:91:c8:74:bd:3a:c0",
     814    "d8:f3:5f:4e:b7:87:2b:2d:ab:06:92:e3:15:38:2f:b0",
     815    0
     816};
     817
     818bool QSslCertificatePrivate::isBlacklisted(const QSslCertificate &certificate)
     819{
     820    for (int a = 0; certificate_blacklist[a] != 0; a++) {
     821        if (certificate.serialNumber() == certificate_blacklist[a])
     822            return true;
     823    }
     824    return false;
     825}
     826
    801827#ifndef QT_NO_DEBUG_STREAM
    802828QDebug operator<<(QDebug debug, const QSslCertificate &certificate)

  • trunk/src/network/ssl/qsslcertificate_p.h

    r846 r865  
    9797    static QList<QSslCertificate> certificatesFromPem(const QByteArray &pem, int count = -1);
    9898    static QList<QSslCertificate> certificatesFromDer(const QByteArray &der, int count = -1);
     99    static bool isBlacklisted(const QSslCertificate &certificate);
    99100
    100101    friend class QSslSocketBackendPrivate;

  • trunk/src/network/ssl/qsslsocket_openssl.cpp

    r846 r865  
    11841184    configuration.peerCertificate = QSslCertificatePrivate::QSslCertificate_from_X509(x509);
    11851185    q_X509_free(x509);
     1186    if (QSslCertificatePrivate::isBlacklisted(configuration.peerCertificate)) {
     1187        q->setErrorString(QSslSocket::tr("The peer certificate is blacklisted"));
     1188        q->setSocketError(QAbstractSocket::SslHandshakeFailedError);
     1189        emit q->error(QAbstractSocket::SslHandshakeFailedError);
     1190        plainSocket->disconnectFromHost();
     1191        return false;
     1192    }
    11861193
    11871194    // Start translating errors.

  • trunk/src/openvg/qpaintengine_vg.cpp

    r846 r865  
    23342334{
    23352335#if defined(QVG_SCISSOR_CLIP)
     2336    vgSeti(VG_MASKING, VG_FALSE); // disable mask fallback
    23362337    updateScissor();
    23372338#else

  • trunk/src/plugins/bearer/symbian/symbianengine.cpp

    r846 r865  
    830830            }
    831831        }
     832        snapConfigLocker.unlock();
    832833        if (active) {
    833834            changeConfigurationStateTo(ptr, QNetworkConfiguration::Active);

  • trunk/src/qt_targets.pri

    r846 r865  
    55
    66isEmpty(QT_MAJOR_VERSION) {
    7    VERSION=4.7.2
     7   VERSION=4.7.3
    88} else {
    99   VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}

  • trunk/src/s60installs/bwins/QtDeclarativeu.def

    r846 r865  
    44        ?trUtf8@QDeclarativeExpression@@SA?AVQString@@PBD0H@Z @ 3 NONAME ; class QString QDeclarativeExpression::trUtf8(char const *, char const *, int)
    55        ?qt_metacast@QDeclarativeComponent@@UAEPAXPBD@Z @ 4 NONAME ; void * QDeclarativeComponent::qt_metacast(char const *)
    6         ?name@QDeclarativeDebugService@@QBE?AVQString@@XZ @ 5 NONAME ABSENT ; class QString QDeclarativeDebugService::name(void) const
     6        ?name@QDeclarativeDebugService@@QBE?AVQString@@XZ @ 5 NONAME ; class QString QDeclarativeDebugService::name(void) const
    77        ?debugId@QDeclarativeDebugObjectReference@@QBEHXZ @ 6 NONAME ABSENT ; int QDeclarativeDebugObjectReference::debugId(void) const
    88        ?addPluginPath@QDeclarativeEngine@@QAEXABVQString@@@Z @ 7 NONAME ; void QDeclarativeEngine::addPluginPath(class QString const &)
    … …  
    1212        ??0QDeclarativeText@@QAE@PAVQDeclarativeItem@@@Z @ 11 NONAME ABSENT ; QDeclarativeText::QDeclarativeText(class QDeclarativeItem *)
    1313        ?propertyTypeName@QDeclarativeProperty@@QBEPBDXZ @ 12 NONAME ; char const * QDeclarativeProperty::propertyTypeName(void) const
    14         ?getStaticMetaObject@QDeclarativeDebugService@@SAABUQMetaObject@@XZ @ 13 NONAME ABSENT ; struct QMetaObject const & QDeclarativeDebugService::getStaticMetaObject(void)
     14        ?getStaticMetaObject@QDeclarativeDebugService@@SAABUQMetaObject@@XZ @ 13 NONAME ; struct QMetaObject const & QDeclarativeDebugService::getStaticMetaObject(void)
    1515        ?setLeft@QDeclarativeAnchors@@QAEXABVQDeclarativeAnchorLine@@@Z @ 14 NONAME ABSENT ; void QDeclarativeAnchors::setLeft(class QDeclarativeAnchorLine const &)
    1616        ?qt_metacall@QDeclarativeExpression@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 15 NONAME ; int QDeclarativeExpression::qt_metacall(enum QMetaObject::Call, int, void * *)
    … …  
    146146        ?enabled@QDeclarativeBinding@@QBE_NXZ @ 145 NONAME ABSENT ; bool QDeclarativeBinding::enabled(void) const
    147147        ?setSource@QDeclarativeView@@QAEXABVQUrl@@@Z @ 146 NONAME ; void QDeclarativeView::setSource(class QUrl const &)
    148         ??_EQDeclarativeDebugService@@UAE@I@Z @ 147 NONAME ABSENT ; QDeclarativeDebugService::~QDeclarativeDebugService(unsigned int)
     148        ??_EQDeclarativeDebugService@@UAE@I@Z @ 147 NONAME ; QDeclarativeDebugService::~QDeclarativeDebugService(unsigned int)
    149149        ??0QDeclarativeDomDynamicProperty@@QAE@ABV0@@Z @ 148 NONAME ABSENT ; QDeclarativeDomDynamicProperty::QDeclarativeDomDynamicProperty(class QDeclarativeDomDynamicProperty const &)
    150150        ?className@QDeclarativeDebugObjectReference@@QBE?AVQString@@XZ @ 149 NONAME ABSENT ; class QString QDeclarativeDebugObjectReference::className(void) const
    … …  
    295295        ?setName@QDeclarativeState@@QAEXABVQString@@@Z @ 294 NONAME ; void QDeclarativeState::setName(class QString const &)
    296296        ?setReversed@QDeclarativeTransition@@QAEX_N@Z @ 295 NONAME ; void QDeclarativeTransition::setReversed(bool)
    297         ?idForObject@QDeclarativeDebugService@@SAHPAVQObject@@@Z @ 296 NONAME ABSENT ; int QDeclarativeDebugService::idForObject(class QObject *)
     297        ?idForObject@QDeclarativeDebugService@@SAHPAVQObject@@@Z @ 296 NONAME ; int QDeclarativeDebugService::idForObject(class QObject *)
    298298        ?qt_metacall@QDeclarativeDebugWatch@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 297 NONAME ABSENT ; int QDeclarativeDebugWatch::qt_metacall(enum QMetaObject::Call, int, void * *)
    299299        ?fromState@QDeclarativeTransition@@QBE?AVQString@@XZ @ 298 NONAME ; class QString QDeclarativeTransition::fromState(void) const
    … …  
    333333        ??1QDeclarativeImageProvider@@UAE@XZ @ 332 NONAME ; QDeclarativeImageProvider::~QDeclarativeImageProvider(void)
    334334        ?sync@QDeclarativeListModel@@QAEXXZ @ 333 NONAME ABSENT ; void QDeclarativeListModel::sync(void)
    335         ?objectForId@QDeclarativeDebugService@@SAPAVQObject@@H@Z @ 334 NONAME ABSENT ; class QObject * QDeclarativeDebugService::objectForId(int)
     335        ?objectForId@QDeclarativeDebugService@@SAPAVQObject@@H@Z @ 334 NONAME ; class QObject * QDeclarativeDebugService::objectForId(int)
    336336        ?hasFocus@QDeclarativeItem@@QBE_NXZ @ 335 NONAME ; bool QDeclarativeItem::hasFocus(void) const
    337337        ??1QDeclarativeExtensionPlugin@@UAE@XZ @ 336 NONAME ; QDeclarativeExtensionPlugin::~QDeclarativeExtensionPlugin(void)
    … …  
    483483        ?parentContext@QDeclarativeContext@@QBEPAV1@XZ @ 482 NONAME ; class QDeclarativeContext * QDeclarativeContext::parentContext(void) const
    484484        ?leftMarginChanged@QDeclarativeAnchors@@IAEXXZ @ 483 NONAME ABSENT ; void QDeclarativeAnchors::leftMarginChanged(void)
    485         ?staticMetaObject@QDeclarativeDebugService@@2UQMetaObject@@B @ 484 NONAME ABSENT ; struct QMetaObject const QDeclarativeDebugService::staticMetaObject
     485        ?staticMetaObject@QDeclarativeDebugService@@2UQMetaObject@@B @ 484 NONAME ; struct QMetaObject const QDeclarativeDebugService::staticMetaObject
    486486        ?topMargin@QDeclarativeAnchors@@QBEMXZ @ 485 NONAME ABSENT ; float QDeclarativeAnchors::topMargin(void) const
    487487        ??0QDeclarativeDebugExpressionQuery@@AAE@PAVQObject@@@Z @ 486 NONAME ABSENT ; QDeclarativeDebugExpressionQuery::QDeclarativeDebugExpressionQuery(class QObject *)
    … …  
    560560        ??_EQDeclarativeDebugContextReference@@QAE@I@Z @ 559 NONAME ABSENT ; QDeclarativeDebugContextReference::~QDeclarativeDebugContextReference(unsigned int)
    561561        ?propertyWrite@QDeclarativeOpenMetaObject@@MAEXH@Z @ 560 NONAME ABSENT ; void QDeclarativeOpenMetaObject::propertyWrite(int)
    562         ?qt_metacall@QDeclarativeDebugService@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 561 NONAME ABSENT ; int QDeclarativeDebugService::qt_metacall(enum QMetaObject::Call, int, void * *)
     562        ?qt_metacall@QDeclarativeDebugService@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 561 NONAME ; int QDeclarativeDebugService::qt_metacall(enum QMetaObject::Call, int, void * *)
    563563        ?setVerticalCenterOffset@QDeclarativeAnchors@@QAEXM@Z @ 562 NONAME ABSENT ; void QDeclarativeAnchors::setVerticalCenterOffset(float)
    564564        ??1QDeclarativeDebugWatch@@UAE@XZ @ 563 NONAME ABSENT ; QDeclarativeDebugWatch::~QDeclarativeDebugWatch(void)
    … …  
    642642        ?binding@QDeclarativeDomValueBinding@@QBE?AVQString@@XZ @ 641 NONAME ABSENT ; class QString QDeclarativeDomValueBinding::binding(void) const
    643643        ?updateAutoState@QDeclarativeStateGroup@@AAE_NXZ @ 642 NONAME ; bool QDeclarativeStateGroup::updateAutoState(void)
    644         ?tr@QDeclarativeDebugService@@SA?AVQString@@PBD0@Z @ 643 NONAME ABSENT ; class QString QDeclarativeDebugService::tr(char const *, char const *)
     644        ?tr@QDeclarativeDebugService@@SA?AVQString@@PBD0@Z @ 643 NONAME ; class QString QDeclarativeDebugService::tr(char const *, char const *)
    645645        ?tr@QDeclarativeComponent@@SA?AVQString@@PBD0H@Z @ 644 NONAME ; class QString QDeclarativeComponent::tr(char const *, char const *, int)
    646646        ??1QDeclarativeProperty@@QAE@XZ @ 645 NONAME ; QDeclarativeProperty::~QDeclarativeProperty(void)
    … …  
    668668        ?setStdCppSet@QMetaPropertyBuilder@@QAEX_N@Z @ 667 NONAME ABSENT ; void QMetaPropertyBuilder::setStdCppSet(bool)
    669669        ??0QDeclarativeItemPrivate@@QAE@XZ @ 668 NONAME ; QDeclarativeItemPrivate::QDeclarativeItemPrivate(void)
    670         ??0QDeclarativeDebugService@@QAE@ABVQString@@PAVQObject@@@Z @ 669 NONAME ABSENT ; QDeclarativeDebugService::QDeclarativeDebugService(class QString const &, class QObject *)
     670        ??0QDeclarativeDebugService@@QAE@ABVQString@@PAVQObject@@@Z @ 669 NONAME ; QDeclarativeDebugService::QDeclarativeDebugService(class QString const &, class QObject *)
    671671        ?load@QDeclarativePixmap@@QAEXPAVQDeclarativeEngine@@ABVQUrl@@_N@Z @ 670 NONAME ; void QDeclarativePixmap::load(class QDeclarativeEngine *, class QUrl const &, bool)
    672672        ??_EQPacketAutoSend@@UAE@I@Z @ 671 NONAME ABSENT ; QPacketAutoSend::~QPacketAutoSend(unsigned int)
    … …  
    674674        ?resetHeight@QDeclarativeItem@@QAEXXZ @ 673 NONAME ; void QDeclarativeItem::resetHeight(void)
    675675        ?setVAlign@QDeclarativeText@@QAEXW4VAlignment@1@@Z @ 674 NONAME ABSENT ; void QDeclarativeText::setVAlign(enum QDeclarativeText::VAlignment)
    676         ??1QDeclarativeDebugService@@UAE@XZ @ 675 NONAME ABSENT ; QDeclarativeDebugService::~QDeclarativeDebugService(void)
    677         ?trUtf8@QDeclarativeDebugService@@SA?AVQString@@PBD0H@Z @ 676 NONAME ABSENT ; class QString QDeclarativeDebugService::trUtf8(char const *, char const *, int)
     676        ??1QDeclarativeDebugService@@UAE@XZ @ 675 NONAME ; QDeclarativeDebugService::~QDeclarativeDebugService(void)
     677        ?trUtf8@QDeclarativeDebugService@@SA?AVQString@@PBD0H@Z @ 676 NONAME ; class QString QDeclarativeDebugService::trUtf8(char const *, char const *, int)
    678678        ?elideMode@QDeclarativeText@@QBE?AW4TextElideMode@1@XZ @ 677 NONAME ABSENT ; enum QDeclarativeText::TextElideMode QDeclarativeText::elideMode(void) const
    679679        ?baseUrl@QDeclarativeContext@@QBE?AVQUrl@@XZ @ 678 NONAME ; class QUrl QDeclarativeContext::baseUrl(void) const
    … …  
    850850        ?qmlInfo@@YA?AVQDeclarativeInfo@@PBVQObject@@@Z @ 849 NONAME ; class QDeclarativeInfo qmlInfo(class QObject const *)
    851851        ?qt_metacall@QDeclarativeDebugClient@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 850 NONAME ABSENT ; int QDeclarativeDebugClient::qt_metacall(enum QMetaObject::Call, int, void * *)
    852         ?d_func@QDeclarativeDebugService@@ABEPBVQDeclarativeDebugServicePrivate@@XZ @ 851 NONAME ABSENT ; class QDeclarativeDebugServicePrivate const * QDeclarativeDebugService::d_func(void) const
     852        ?d_func@QDeclarativeDebugService@@ABEPBVQDeclarativeDebugServicePrivate@@XZ @ 851 NONAME ; class QDeclarativeDebugServicePrivate const * QDeclarativeDebugService::d_func(void) const
    853853        ??1QDeclarativeDebugQuery@@UAE@XZ @ 852 NONAME ABSENT ; QDeclarativeDebugQuery::~QDeclarativeDebugQuery(void)
    854854        ?data_append@QDeclarativeItemPrivate@@SAXPAV?$QDeclarativeListProperty@VQObject@@@@PAVQObject@@@Z @ 853 NONAME ; void QDeclarativeItemPrivate::data_append(class QDeclarativeListProperty<class QObject> *, class QObject *)
    … …  
    11211121        ??4QDeclarativeDomList@@QAEAAV0@ABV0@@Z @ 1120 NONAME ABSENT ; class QDeclarativeDomList & QDeclarativeDomList::operator=(class QDeclarativeDomList const &)
    11221122        ?qt_metacall@QDeclarativeComponent@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1121 NONAME ; int QDeclarativeComponent::qt_metacall(enum QMetaObject::Call, int, void * *)
    1123         ?tr@QDeclarativeDebugService@@SA?AVQString@@PBD0H@Z @ 1122 NONAME ABSENT ; class QString QDeclarativeDebugService::tr(char const *, char const *, int)
     1123        ?tr@QDeclarativeDebugService@@SA?AVQString@@PBD0H@Z @ 1122 NONAME ; class QString QDeclarativeDebugService::tr(char const *, char const *, int)
    11241124        ?staticMetaObject@QDeclarativeEngine@@2UQMetaObject@@B @ 1123 NONAME ; struct QMetaObject const QDeclarativeEngine::staticMetaObject
    11251125        ?staticMetaObject@QDeclarativeStateOperation@@2UQMetaObject@@B @ 1124 NONAME ; struct QMetaObject const QDeclarativeStateOperation::staticMetaObject
    … …  
    11461146        ??_EQDeclarativeAnchors@@UAE@I@Z @ 1145 NONAME ABSENT ; QDeclarativeAnchors::~QDeclarativeAnchors(unsigned int)
    11471147        ?removeNotifySignal@QMetaPropertyBuilder@@QAEXXZ @ 1146 NONAME ABSENT ; void QMetaPropertyBuilder::removeNotifySignal(void)
    1148         ?trUtf8@QDeclarativeDebugService@@SA?AVQString@@PBD0@Z @ 1147 NONAME ABSENT ; class QString QDeclarativeDebugService::trUtf8(char const *, char const *)
     1148        ?trUtf8@QDeclarativeDebugService@@SA?AVQString@@PBD0@Z @ 1147 NONAME ; class QString QDeclarativeDebugService::trUtf8(char const *, char const *)
    11491149        ?setImportPathList@QDeclarativeEngine@@QAEXABVQStringList@@@Z @ 1148 NONAME ; void QDeclarativeEngine::setImportPathList(class QStringList const &)
    11501150        ?enabledChanged@QDeclarativeDebugService@@MAEX_N@Z @ 1149 NONAME ABSENT ; void QDeclarativeDebugService::enabledChanged(bool)
    … …  
    11771177        ??6QDeclarativeState@@QAEAAV0@PAVQDeclarativeStateOperation@@@Z @ 1176 NONAME ; class QDeclarativeState & QDeclarativeState::operator<<(class QDeclarativeStateOperation *)
    11781178        ?destroy@QDeclarativeAbstractBinding@@UAEXXZ @ 1177 NONAME ABSENT ; void QDeclarativeAbstractBinding::destroy(void)
    1179         ?qt_metacast@QDeclarativeDebugService@@UAEPAXPBD@Z @ 1178 NONAME ABSENT ; void * QDeclarativeDebugService::qt_metacast(char const *)
     1179        ?qt_metacast@QDeclarativeDebugService@@UAEPAXPBD@Z @ 1178 NONAME ; void * QDeclarativeDebugService::qt_metacast(char const *)
    11801180        ?qt_metacast@QDeclarativeValueType@@UAEPAXPBD@Z @ 1179 NONAME ABSENT ; void * QDeclarativeValueType::qt_metacast(char const *)
    11811181        ?childAt@QDeclarativeItem@@QBEPAV1@MM@Z @ 1180 NONAME ; class QDeclarativeItem * QDeclarativeItem::childAt(float, float) const
    … …  
    12981298        ?tr@QDeclarativeDebugRootContextQuery@@SA?AVQString@@PBD0H@Z @ 1297 NONAME ABSENT ; class QString QDeclarativeDebugRootContextQuery::tr(char const *, char const *, int)
    12991299        ?setFromState@QDeclarativeTransition@@QAEXABVQString@@@Z @ 1298 NONAME ; void QDeclarativeTransition::setFromState(class QString const &)
    1300         ?metaObject@QDeclarativeDebugService@@UBEPBUQMetaObject@@XZ @ 1299 NONAME ABSENT ; struct QMetaObject const * QDeclarativeDebugService::metaObject(void) const
     1300        ?metaObject@QDeclarativeDebugService@@UBEPBUQMetaObject@@XZ @ 1299 NONAME ; struct QMetaObject const * QDeclarativeDebugService::metaObject(void) const
    13011301        ?state@QDeclarativeDebugQuery@@QBE?AW4State@1@XZ @ 1300 NONAME ABSENT ; enum QDeclarativeDebugQuery::State QDeclarativeDebugQuery::state(void) const
    13021302        ?setBottom@QDeclarativeScaleGrid@@QAEXH@Z @ 1301 NONAME ABSENT ; void QDeclarativeScaleGrid::setBottom(int)
    … …  
    13061306        ?update@QDeclarativeBinding@@UAEXV?$QFlags@W4WriteFlag@QDeclarativePropertyPrivate@@@@@Z @ 1305 NONAME ABSENT ; void QDeclarativeBinding::update(class QFlags<enum QDeclarativePropertyPrivate::WriteFlag>)
    13071307        ?tr@QDeclarativeBehavior@@SA?AVQString@@PBD0@Z @ 1306 NONAME ABSENT ; class QString QDeclarativeBehavior::tr(char const *, char const *)
    1308         ?isDebuggingEnabled@QDeclarativeDebugService@@SA_NXZ @ 1307 NONAME ABSENT ; bool QDeclarativeDebugService::isDebuggingEnabled(void)
     1308        ?isDebuggingEnabled@QDeclarativeDebugService@@SA_NXZ @ 1307 NONAME ; bool QDeclarativeDebugService::isDebuggingEnabled(void)
    13091309        ?tr@QDeclarativeText@@SA?AVQString@@PBD0H@Z @ 1308 NONAME ABSENT ; class QString QDeclarativeText::tr(char const *, char const *, int)
    13101310        ?reset@QDeclarativeProperty@@QBE_NXZ @ 1309 NONAME ; bool QDeclarativeProperty::reset(void) const
    … …  
    13451345        ??_EQDeclarativeDebuggerStatus@@UAE@I@Z @ 1344 NONAME ABSENT ; QDeclarativeDebuggerStatus::~QDeclarativeDebuggerStatus(unsigned int)
    13461346        ?error@QDeclarativeCustomParser@@IAEXABVQString@@@Z @ 1345 NONAME ; void QDeclarativeCustomParser::error(class QString const &)
    1347         ?messageReceived@QDeclarativeDebugService@@MAEXABVQByteArray@@@Z @ 1346 NONAME ABSENT ; void QDeclarativeDebugService::messageReceived(class QByteArray const &)
     1347        ?messageReceived@QDeclarativeDebugService@@MAEXABVQByteArray@@@Z @ 1346 NONAME ; void QDeclarativeDebugService::messageReceived(class QByteArray const &)
    13481348        ??0QDeclarativeParserStatus@@QAE@XZ @ 1347 NONAME ; QDeclarativeParserStatus::QDeclarativeParserStatus(void)
    13491349        ?isNumber@Variant@QDeclarativeParser@@QBE_NXZ @ 1348 NONAME ; bool QDeclarativeParser::Variant::isNumber(void) const
    … …  
    14761476        ?getStaticMetaObject@QDeclarativeDebugObjectQuery@@SAABUQMetaObject@@XZ @ 1475 NONAME ABSENT ; struct QMetaObject const & QDeclarativeDebugObjectQuery::getStaticMetaObject(void)
    14771477        ?isSignalProperty@QDeclarativeProperty@@QBE_NXZ @ 1476 NONAME ; bool QDeclarativeProperty::isSignalProperty(void) const
    1478         ?d_func@QDeclarativeDebugService@@AAEPAVQDeclarativeDebugServicePrivate@@XZ @ 1477 NONAME ABSENT ; class QDeclarativeDebugServicePrivate * QDeclarativeDebugService::d_func(void)
     1478        ?d_func@QDeclarativeDebugService@@AAEPAVQDeclarativeDebugServicePrivate@@XZ @ 1477 NONAME ; class QDeclarativeDebugServicePrivate * QDeclarativeDebugService::d_func(void)
    14791479        ?qmlTypeNames@QDeclarativeMetaType@@SA?AV?$QList@VQByteArray@@@@XZ @ 1478 NONAME ABSENT ; class QList<class QByteArray> QDeclarativeMetaType::qmlTypeNames(void)
    14801480        ?componentComplete@QDeclarativeItem@@MAEXXZ @ 1479 NONAME ; void QDeclarativeItem::componentComplete(void)
    … …  
    15761576        ??1QDeclarativeDomProperty@@QAE@XZ @ 1575 NONAME ABSENT ; QDeclarativeDomProperty::~QDeclarativeDomProperty(void)
    15771577        ?url@QDeclarativePixmap@@QBEABVQUrl@@XZ @ 1576 NONAME ; class QUrl const & QDeclarativePixmap::url(void) const
    1578         ?sendMessage@QDeclarativeDebugService@@QAEXABVQByteArray@@@Z @ 1577 NONAME ABSENT ; void QDeclarativeDebugService::sendMessage(class QByteArray const &)
     1578        ?sendMessage@QDeclarativeDebugService@@QAEXABVQByteArray@@@Z @ 1577 NONAME ; void QDeclarativeDebugService::sendMessage(class QByteArray const &)
    15791579        ?context@QDeclarativeScriptString@@QBEPAVQDeclarativeContext@@XZ @ 1578 NONAME ; class QDeclarativeContext * QDeclarativeScriptString::context(void) const
    15801580        ?queryObject@QDeclarativeEngineDebug@@QAEPAVQDeclarativeDebugObjectQuery@@ABVQDeclarativeDebugObjectReference@@PAVQObject@@@Z @ 1579 NONAME ABSENT ; class QDeclarativeDebugObjectQuery * QDeclarativeEngineDebug::queryObject(class QDeclarativeDebugObjectReference const &, class QObject *)
    … …  
    16091609        ?get@QDeclarativeItemPrivate@@SAPAV1@PAVQDeclarativeItem@@@Z @ 1608 NONAME ; class QDeclarativeItemPrivate * QDeclarativeItemPrivate::get(class QDeclarativeItem *)
    16101610        ?staticMetaObject@QDeclarativeView@@2UQMetaObject@@B @ 1609 NONAME ; struct QMetaObject const QDeclarativeView::staticMetaObject
    1611         ?objectToString@QDeclarativeDebugService@@SA?AVQString@@PAVQObject@@@Z @ 1610 NONAME ABSENT ; class QString QDeclarativeDebugService::objectToString(class QObject *)
     1611        ?objectToString@QDeclarativeDebugService@@SA?AVQString@@PAVQObject@@@Z @ 1610 NONAME ; class QString QDeclarativeDebugService::objectToString(class QObject *)
    16121612        ?defaultValue@QDeclarativeDomDynamicProperty@@QBE?AVQDeclarativeDomProperty@@XZ @ 1611 NONAME ABSENT ; class QDeclarativeDomProperty QDeclarativeDomDynamicProperty::defaultValue(void) const
    16131613        ?relatedMetaObject@QMetaObjectBuilder@@QBEPBUQMetaObject@@H@Z @ 1612 NONAME ABSENT ; struct QMetaObject const * QMetaObjectBuilder::relatedMetaObject(int) const
    … …  
    16341634        ?qt_metacall@QPacketProtocol@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1633 NONAME ABSENT ; int QPacketProtocol::qt_metacall(enum QMetaObject::Call, int, void * *)
    16351635        ??0QDeclarativeItem@@QAE@PAV0@@Z @ 1634 NONAME ; QDeclarativeItem::QDeclarativeItem(class QDeclarativeItem *)
    1636         ?hasDebuggingClient@QDeclarativeDebugService@@SA_NXZ @ 1635 NONAME ABSENT ; bool QDeclarativeDebugService::hasDebuggingClient(void)
     1636        ?hasDebuggingClient@QDeclarativeDebugService@@SA_NXZ @ 1635 NONAME ; bool QDeclarativeDebugService::hasDebuggingClient(void)
    16371637        ?staticMetaObject@QDeclarativeContext@@2UQMetaObject@@B @ 1636 NONAME ; struct QMetaObject const QDeclarativeContext::staticMetaObject
    16381638        ?setContextForObject@QDeclarativeEngine@@SAXPAVQObject@@PAVQDeclarativeContext@@@Z @ 1637 NONAME ; void QDeclarativeEngine::setContextForObject(class QObject *, class QDeclarativeContext *)
    … …  
    17341734        ?transition@QDeclarativeAbstractAnimation@@UAEXAAV?$QList@VQDeclarativeAction@@@@AAV?$QList@VQDeclarativeProperty@@@@W4TransitionDirection@1@@Z @ 1733 NONAME ABSENT ; void QDeclarativeAbstractAnimation::transition(class QList<class QDeclarativeAction> &, class QList<class QDeclarativeProperty> &, enum QDeclarativeAbstractAnimation::TransitionDirection)
    17351735        ?componentComplete@QDeclarativeAbstractAnimation@@UAEXXZ @ 1734 NONAME ABSENT ; void QDeclarativeAbstractAnimation::componentComplete(void)
    1736         ?statusChanged@QDeclarativeDebugService@@MAEXW4Status@1@@Z @ 1735 NONAME ABSENT ; void QDeclarativeDebugService::statusChanged(enum QDeclarativeDebugService::Status)
     1736        ?statusChanged@QDeclarativeDebugService@@MAEXW4Status@1@@Z @ 1735 NONAME ; void QDeclarativeDebugService::statusChanged(enum QDeclarativeDebugService::Status)
    17371737        ?runningChanged@QDeclarativeAbstractAnimation@@IAEX_N@Z @ 1736 NONAME ABSENT ; void QDeclarativeAbstractAnimation::runningChanged(bool)
    17381738        ?trUtf8@QDeclarativeAbstractAnimation@@SA?AVQString@@PBD0H@Z @ 1737 NONAME ABSENT ; class QString QDeclarativeAbstractAnimation::trUtf8(char const *, char const *, int)
    … …  
    18141814        ?alwaysRunToEnd@QDeclarativeAbstractAnimation@@QBE_NXZ @ 1813 NONAME ABSENT ; bool QDeclarativeAbstractAnimation::alwaysRunToEnd(void) const
    18151815        ?tr@QDeclarativeTimer@@SA?AVQString@@PBD0H@Z @ 1814 NONAME ABSENT ; class QString QDeclarativeTimer::tr(char const *, char const *, int)
    1816         ?status@QDeclarativeDebugService@@QBE?AW4Status@1@XZ @ 1815 NONAME ABSENT ; enum QDeclarativeDebugService::Status QDeclarativeDebugService::status(void) const
     1816        ?status@QDeclarativeDebugService@@QBE?AW4Status@1@XZ @ 1815 NONAME ; enum QDeclarativeDebugService::Status QDeclarativeDebugService::status(void) const
    18171817        ?intervalChanged@QDeclarativeTimer@@IAEXXZ @ 1816 NONAME ABSENT ; void QDeclarativeTimer::intervalChanged(void)
    18181818        ?isPaused@QDeclarativeAbstractAnimation@@QBE_NXZ @ 1817 NONAME ABSENT ; bool QDeclarativeAbstractAnimation::isPaused(void) const

  • trunk/src/s60installs/eabi/QtDeclarativeu.def

    r846 r865  
    762762        _ZN24QDeclarativeCustomParser5errorERK32QDeclarativeCustomParserPropertyRK7QString @ 761 NONAME
    763763        _ZN24QDeclarativeCustomParser5errorERK7QString @ 762 NONAME
    764         _ZN24QDeclarativeDebugService11idForObjectEP7QObject @ 763 NONAME ABSENT
    765         _ZN24QDeclarativeDebugService11objectForIdEi @ 764 NONAME ABSENT
    766         _ZN24QDeclarativeDebugService11qt_metacallEN11QMetaObject4CallEiPPv @ 765 NONAME ABSENT
    767         _ZN24QDeclarativeDebugService11qt_metacastEPKc @ 766 NONAME ABSENT
    768         _ZN24QDeclarativeDebugService11sendMessageERK10QByteArray @ 767 NONAME ABSENT
     764        _ZN24QDeclarativeDebugService11idForObjectEP7QObject @ 763 NONAME
     765        _ZN24QDeclarativeDebugService11objectForIdEi @ 764 NONAME
     766        _ZN24QDeclarativeDebugService11qt_metacallEN11QMetaObject4CallEiPPv @ 765 NONAME
     767        _ZN24QDeclarativeDebugService11qt_metacastEPKc @ 766 NONAME
     768        _ZN24QDeclarativeDebugService11sendMessageERK10QByteArray @ 767 NONAME
    769769        _ZN24QDeclarativeDebugService14enabledChangedEb @ 768 NONAME ABSENT
    770         _ZN24QDeclarativeDebugService14objectToStringEP7QObject @ 769 NONAME ABSENT
    771         _ZN24QDeclarativeDebugService15messageReceivedERK10QByteArray @ 770 NONAME ABSENT
    772         _ZN24QDeclarativeDebugService16staticMetaObjectE @ 771 NONAME DATA 16 ABSENT
    773         _ZN24QDeclarativeDebugService18hasDebuggingClientEv @ 772 NONAME ABSENT
    774         _ZN24QDeclarativeDebugService18isDebuggingEnabledEv @ 773 NONAME ABSENT
    775         _ZN24QDeclarativeDebugService19getStaticMetaObjectEv @ 774 NONAME ABSENT
    776         _ZN24QDeclarativeDebugServiceC1ERK7QStringP7QObject @ 775 NONAME ABSENT
    777         _ZN24QDeclarativeDebugServiceC2ERK7QStringP7QObject @ 776 NONAME ABSENT
     770        _ZN24QDeclarativeDebugService14objectToStringEP7QObject @ 769 NONAME
     771        _ZN24QDeclarativeDebugService15messageReceivedERK10QByteArray @ 770 NONAME
     772        _ZN24QDeclarativeDebugService16staticMetaObjectE @ 771 NONAME DATA 16
     773        _ZN24QDeclarativeDebugService18hasDebuggingClientEv @ 772 NONAME
     774        _ZN24QDeclarativeDebugService18isDebuggingEnabledEv @ 773 NONAME
     775        _ZN24QDeclarativeDebugService19getStaticMetaObjectEv @ 774 NONAME
     776        _ZN24QDeclarativeDebugServiceC1ERK7QStringP7QObject @ 775 NONAME
     777        _ZN24QDeclarativeDebugServiceC2ERK7QStringP7QObject @ 776 NONAME
    778778        _ZN24QDeclarativeDomComponentC1ERKS_ @ 777 NONAME ABSENT
    779779        _ZN24QDeclarativeDomComponentC1Ev @ 778 NONAME ABSENT
    … …  
    14261426        _ZNK24QDeclarativeCustomParser11resolveTypeERK10QByteArray @ 1425 NONAME
    14271427        _ZNK24QDeclarativeCustomParser12evaluateEnumERK10QByteArray @ 1426 NONAME
    1428         _ZNK24QDeclarativeDebugService10metaObjectEv @ 1427 NONAME ABSENT
    1429         _ZNK24QDeclarativeDebugService4nameEv @ 1428 NONAME ABSENT
     1428        _ZNK24QDeclarativeDebugService10metaObjectEv @ 1427 NONAME
     1429        _ZNK24QDeclarativeDebugService4nameEv @ 1428 NONAME
    14301430        _ZNK24QDeclarativeDebugService9isEnabledEv @ 1429 NONAME ABSENT
    14311431        _ZNK24QDeclarativeDomComponent13componentRootEv @ 1430 NONAME ABSENT
    … …  
    15551555        _ZTI23QDeclarativePropertyMap @ 1554 NONAME
    15561556        _ZTI24QDeclarativeCustomParser @ 1555 NONAME
    1557         _ZTI24QDeclarativeDebugService @ 1556 NONAME ABSENT
     1557        _ZTI24QDeclarativeDebugService @ 1556 NONAME
    15581558        _ZTI24QDeclarativeParserStatus @ 1557 NONAME
    15591559        _ZTI25QDeclarativeImageProvider @ 1558 NONAME
    … …  
    16051605        _ZTV23QDeclarativePropertyMap @ 1604 NONAME
    16061606        _ZTV24QDeclarativeCustomParser @ 1605 NONAME
    1607         _ZTV24QDeclarativeDebugService @ 1606 NONAME ABSENT
     1607        _ZTV24QDeclarativeDebugService @ 1606 NONAME
    16081608        _ZTV24QDeclarativeParserStatus @ 1607 NONAME
    16091609        _ZTV25QDeclarativeImageProvider @ 1608 NONAME
    … …  
    17781778        _ZN23QDeclarativeDebugClientD2Ev @ 1777 NONAME ABSENT
    17791779        _ZN23QDeclarativeEngineDebug13statusChangedENS_6StatusE @ 1778 NONAME ABSENT
    1780         _ZN24QDeclarativeDebugService13statusChangedENS_6StatusE @ 1779 NONAME ABSENT
    1781         _ZN24QDeclarativeDebugServiceD0Ev @ 1780 NONAME ABSENT
    1782         _ZN24QDeclarativeDebugServiceD1Ev @ 1781 NONAME ABSENT
    1783         _ZN24QDeclarativeDebugServiceD2Ev @ 1782 NONAME ABSENT
     1780        _ZN24QDeclarativeDebugService13statusChangedENS_6StatusE @ 1779 NONAME
     1781        _ZN24QDeclarativeDebugServiceD0Ev @ 1780 NONAME
     1782        _ZN24QDeclarativeDebugServiceD1Ev @ 1781 NONAME
     1783        _ZN24QDeclarativeDebugServiceD2Ev @ 1782 NONAME
    17841784        _ZN26QDeclarativeBasePositioner10addChangedEv @ 1783 NONAME ABSENT
    17851785        _ZN26QDeclarativeBasePositioner10itemChangeEN13QGraphicsItem18GraphicsItemChangeERK8QVariant @ 1784 NONAME ABSENT
    … …  
    18521852        _ZNK23QDeclarativeDebugClient6statusEv @ 1851 NONAME ABSENT
    18531853        _ZNK23QDeclarativeEngineDebug6statusEv @ 1852 NONAME ABSENT
    1854         _ZNK24QDeclarativeDebugService6statusEv @ 1853 NONAME ABSENT
     1854        _ZNK24QDeclarativeDebugService6statusEv @ 1853 NONAME
    18551855        _ZNK26QDeclarativeBasePositioner10metaObjectEv @ 1854 NONAME ABSENT
    18561856        _ZNK26QDeclarativeBasePositioner3addEv @ 1855 NONAME ABSENT
Note: See TracChangeset for help on using the changeset viewer.