Changeset 769 for trunk/src/s60installs


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

Legend:

Unmodified
Added
Removed

  • trunk

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

    r651 r769  
    44004400        ?signalIndex@SignalEvent@QStateMachine@@QBEHXZ @ 4399 NONAME ; int QStateMachine::SignalEvent::signalIndex(void) const
    44014401        ?disconnectOne@QMetaObject@@SA_NPBVQObject@@H0H@Z @ 4400 NONAME ; bool QMetaObject::disconnectOne(class QObject const *, int, class QObject const *, int)
     4402        ?QBasicAtomicInt_fetchAndAddRelease@@YAHPCHH@Z @ 4401 NONAME ; int QBasicAtomicInt_fetchAndAddRelease(int volatile *, int)
     4403        ?QBasicAtomicPointer_testAndSetRelaxed@@YA_NPCRAXPAX1@Z @ 4402 NONAME ; bool QBasicAtomicPointer_testAndSetRelaxed(void * volatile *, void *, void *)
     4404        ?QBasicAtomicInt_fetchAndAddRelaxed@@YAHPCHH@Z @ 4403 NONAME ; int QBasicAtomicInt_fetchAndAddRelaxed(int volatile *, int)
     4405        ?QBasicAtomicPointer_testAndSetRelease@@YA_NPCRAXPAX1@Z @ 4404 NONAME ; bool QBasicAtomicPointer_testAndSetRelease(void * volatile *, void *, void *)
     4406        ?QBasicAtomicInt_fetchAndStoreRelease@@YAHPCHH@Z @ 4405 NONAME ; int QBasicAtomicInt_fetchAndStoreRelease(int volatile *, int)
     4407        ?QBasicAtomicPointer_fetchAndAddAcquire@@YAPAXPCRAXH@Z @ 4406 NONAME ; void * QBasicAtomicPointer_fetchAndAddAcquire(void * volatile *, int)
     4408        ?QBasicAtomicPointer_fetchAndAddRelease@@YAPAXPCRAXH@Z @ 4407 NONAME ; void * QBasicAtomicPointer_fetchAndAddRelease(void * volatile *, int)
     4409        ?QBasicAtomicPointer_testAndSetAcquire@@YA_NPCRAXPAX1@Z @ 4408 NONAME ; bool QBasicAtomicPointer_testAndSetAcquire(void * volatile *, void *, void *)
     4410        ?QBasicAtomicPointer_fetchAndStoreAcquire@@YAPAXPCRAXPAX@Z @ 4409 NONAME ; void * QBasicAtomicPointer_fetchAndStoreAcquire(void * volatile *, void *)
     4411        ?QBasicAtomicPointer_fetchAndAddRelaxed@@YAPAXPCRAXH@Z @ 4410 NONAME ; void * QBasicAtomicPointer_fetchAndAddRelaxed(void * volatile *, int)
     4412        ?QBasicAtomicInt_testAndSetAcquire@@YA_NPCHHH@Z @ 4411 NONAME ; bool QBasicAtomicInt_testAndSetAcquire(int volatile *, int, int)
     4413        ?QBasicAtomicPointer_fetchAndStoreRelaxed@@YAPAXPCRAXPAX@Z @ 4412 NONAME ; void * QBasicAtomicPointer_fetchAndStoreRelaxed(void * volatile *, void *)
     4414        ?QBasicAtomicInt_fetchAndStoreRelaxed@@YAHPCHH@Z @ 4413 NONAME ; int QBasicAtomicInt_fetchAndStoreRelaxed(int volatile *, int)
     4415        ?QBasicAtomicInt_testAndSetRelaxed@@YA_NPCHHH@Z @ 4414 NONAME ; bool QBasicAtomicInt_testAndSetRelaxed(int volatile *, int, int)
     4416        ?QBasicAtomicPointer_fetchAndStoreRelease@@YAPAXPCRAXPAX@Z @ 4415 NONAME ; void * QBasicAtomicPointer_fetchAndStoreRelease(void * volatile *, void *)
     4417        ?QBasicAtomicInt_testAndSetRelease@@YA_NPCHHH@Z @ 4416 NONAME ; bool QBasicAtomicInt_testAndSetRelease(int volatile *, int, int)
     4418        ?QBasicAtomicInt_fetchAndStoreAcquire@@YAHPCHH@Z @ 4417 NONAME ; int QBasicAtomicInt_fetchAndStoreAcquire(int volatile *, int)
     4419        ?QBasicAtomicInt_fetchAndAddAcquire@@YAHPCHH@Z @ 4418 NONAME ; int QBasicAtomicInt_fetchAndAddAcquire(int volatile *, int)
     4420        ?validCodecs@QTextCodec@@CA_NXZ @ 4419 NONAME ; bool QTextCodec::validCodecs(void)
     4421        ?clearHistory@QStateMachinePrivate@@QAEXXZ @ 4420 NONAME ; void QStateMachinePrivate::clearHistory(void)
    44024422

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

    r651 r769  
    89968996        ?setFocus@QWidget@@QAEXW4FocusReason@Qt@@@Z @ 8995 NONAME ; void QWidget::setFocus(enum Qt::FocusReason)
    89978997        ?setFocus@QWidget@@QAEXXZ @ 8996 NONAME ; void QWidget::setFocus(void)
    8998         ?setFocusHelper@QGraphicsItemPrivate@@QAEXW4FocusReason@Qt@@_N@Z @ 8997 NONAME ; void QGraphicsItemPrivate::setFocusHelper(enum Qt::FocusReason, bool)
     8998        ?setFocusHelper@QGraphicsItemPrivate@@QAEXW4FocusReason@Qt@@_N@Z @ 8997 NONAME ABSENT ; void QGraphicsItemPrivate::setFocusHelper(enum Qt::FocusReason, bool)
    89998999        ?setFocusItem@QGraphicsScene@@QAEXPAVQGraphicsItem@@W4FocusReason@Qt@@@Z @ 8998 NONAME ; void QGraphicsScene::setFocusItem(class QGraphicsItem *, enum Qt::FocusReason)
    90009000        ?setFocusPolicy@QGraphicsWidget@@QAEXW4FocusPolicy@Qt@@@Z @ 8999 NONAME ; void QGraphicsWidget::setFocusPolicy(enum Qt::FocusPolicy)
    … …  
    1192311923        ?updateCell@QCalendarWidget@@IAEXABVQDate@@@Z @ 11922 NONAME ; void QCalendarWidget::updateCell(class QDate const &)
    1192411924        ?updateCells@QCalendarWidget@@IAEXXZ @ 11923 NONAME ; void QCalendarWidget::updateCells(void)
    11925         ?updateDisplayText@QLineControl@@AAEXXZ @ 11924 NONAME ; void QLineControl::updateDisplayText(void)
     11925        ?updateDisplayText@QLineControl@@AAEXXZ @ 11924 NONAME ABSENT ; void QLineControl::updateDisplayText(void)
    1192611926        ?updateEditorData@QAbstractItemView@@MAEXXZ @ 11925 NONAME ; void QAbstractItemView::updateEditorData(void)
    1192711927        ?updateEditorGeometries@QAbstractItemView@@MAEXXZ @ 11926 NONAME ; void QAbstractItemView::updateEditorGeometries(void)
    … …  
    1254912549        ?updateAncestorFlags@QGraphicsItemPrivate@@QAEXXZ @ 12548 NONAME ; void QGraphicsItemPrivate::updateAncestorFlags(void)
    1255012550        ?updateChildWithGraphicsEffectFlagRecursively@QGraphicsItemPrivate@@QAEXXZ @ 12549 NONAME ; void QGraphicsItemPrivate::updateChildWithGraphicsEffectFlagRecursively(void)
     12551        ?api@QEglContext@@QBE?AW4API@QEgl@@XZ @ 12550 NONAME ; enum QEgl::API QEglContext::api(void) const
     12552        ?display@QEglContext@@SAHXZ @ 12551 NONAME ; int QEglContext::display(void)
     12553        ?isOpacityNull@QGraphicsItemPrivate@@SA_NM@Z @ 12552 NONAME ; bool QGraphicsItemPrivate::isOpacityNull(float)
     12554        ?chooseConfig@QEglContext@@QAE_NABVQEglProperties@@W4PixelFormatMatch@QEgl@@@Z @ 12553 NONAME ; bool QEglContext::chooseConfig(class QEglProperties const &, enum QEgl::PixelFormatMatch)
     12555        ?destroySurface@QEglContext@@QAEXH@Z @ 12554 NONAME ; void QEglContext::destroySurface(int)
     12556        ?lazyDoneCurrent@QEglContext@@QAE_NXZ @ 12555 NONAME ; bool QEglContext::lazyDoneCurrent(void)
     12557        ?waitNative@QEglContext@@QAEXXZ @ 12556 NONAME ; void QEglContext::waitNative(void)
     12558        ?context@QEglContext@@QBEHXZ @ 12557 NONAME ; int QEglContext::context(void) const
     12559        ?configAttrib@QEglContext@@QBE_NHPAH@Z @ 12558 NONAME ; bool QEglContext::configAttrib(int, int *) const
     12560        ??0QEglProperties@@QAE@ABV0@@Z @ 12559 NONAME ; QEglProperties::QEglProperties(class QEglProperties const &)
     12561        ?config@QEglContext@@QBEHXZ @ 12560 NONAME ; int QEglContext::config(void) const
     12562        ?clearFocusHelper@QGraphicsItemPrivate@@QAEX_N@Z @ 12561 NONAME ; void QGraphicsItemPrivate::clearFocusHelper(bool)
     12563        ?error@QEglContext@@SAHXZ @ 12562 NONAME ; int QEglContext::error(void)
     12564        ?swapBuffers@QEglContext@@QAE_NH@Z @ 12563 NONAME ; bool QEglContext::swapBuffers(int)
     12565        ?canKeypadNavigate@QWidgetPrivate@@SA_NW4Orientation@Qt@@@Z @ 12564 NONAME ; bool QWidgetPrivate::canKeypadNavigate(enum Qt::Orientation)
     12566        ?removeAllApplicationFonts@QFontDatabase@@SA_NXZ @ 12565 NONAME ; bool QFontDatabase::removeAllApplicationFonts(void)
     12567        ?setApi@QEglContext@@QAEXW4API@QEgl@@@Z @ 12566 NONAME ; void QEglContext::setApi(enum QEgl::API)
     12568        ?updateDisplayText@QLineControl@@AAEX_N@Z @ 12567 NONAME ; void QLineControl::updateDisplayText(bool)
     12569        ?makeCurrent@QEglContext@@QAE_NH@Z @ 12568 NONAME ; bool QEglContext::makeCurrent(int)
     12570        ?isPixmapCached@QImagePixmapCleanupHooks@@SA_NABVQPixmap@@@Z @ 12569 NONAME ; bool QImagePixmapCleanupHooks::isPixmapCached(class QPixmap const &)
     12571        ?createSurface@QEglContext@@QAEHPAVQPaintDevice@@PBVQEglProperties@@@Z @ 12570 NONAME ; int QEglContext::createSurface(class QPaintDevice *, class QEglProperties const *)
     12572        ?dumpAllConfigs@QEglContext@@QAEXXZ @ 12571 NONAME ; void QEglContext::dumpAllConfigs(void)
     12573        ?reduceConfiguration@QEglProperties@@QAE_NXZ @ 12572 NONAME ; bool QEglProperties::reduceConfiguration(void)
     12574        ?nativeDisplay@QEglContext@@CAHXZ @ 12573 NONAME ; int QEglContext::nativeDisplay(void)
     12575        ?getGlyphBearings@QFontEngine@@UAEXIPAM0@Z @ 12574 NONAME ; void QFontEngine::getGlyphBearings(unsigned int, float *, float *)
     12576        ?removeValue@QEglProperties@@QAE_NH@Z @ 12575 NONAME ; bool QEglProperties::removeValue(int)
     12577        ?toString@QEglProperties@@QBE?AVQString@@XZ @ 12576 NONAME ; class QString QEglProperties::toString(void) const
     12578        ?isOpacityNull@QGraphicsItemPrivate@@QBE_NXZ @ 12577 NONAME ; bool QGraphicsItemPrivate::isOpacityNull(void) const
     12579        ?dumpAllConfigs@QEglProperties@@SAXXZ @ 12578 NONAME ; void QEglProperties::dumpAllConfigs(void)
     12580        ?inTabWidget@QWidgetPrivate@@SA_NPAVQWidget@@@Z @ 12579 NONAME ; bool QWidgetPrivate::inTabWidget(class QWidget *)
     12581        ?configProperties@QEglContext@@QBE?AVQEglProperties@@H@Z @ 12580 NONAME ; class QEglProperties QEglContext::configProperties(int) const
     12582        ?properties@QEglProperties@@QBEPBHXZ @ 12581 NONAME ; int const * QEglProperties::properties(void) const
     12583        ?destroyContext@QEglContext@@QAEXXZ @ 12582 NONAME ; void QEglContext::destroyContext(void)
     12584        ??0QEglContext@@QAE@XZ @ 12583 NONAME ; QEglContext::QEglContext(void)
     12585        ??1QEglContext@@QAE@XZ @ 12584 NONAME ; QEglContext::~QEglContext(void)
     12586        ?isValid@QEglContext@@QBE_NXZ @ 12585 NONAME ; bool QEglContext::isValid(void) const
     12587        ?value@QEglProperties@@QBEHH@Z @ 12586 NONAME ; int QEglProperties::value(int) const
     12588        ?clearError@QEglContext@@SAXXZ @ 12587 NONAME ; void QEglContext::clearError(void)
     12589        ??0QEglProperties@@QAE@H@Z @ 12588 NONAME ; QEglProperties::QEglProperties(int)
     12590        ?setValue@QEglProperties@@QAEXHH@Z @ 12589 NONAME ; void QEglProperties::setValue(int, int)
     12591        ?setPaintDeviceFormat@QEglProperties@@QAEXPAVQPaintDevice@@@Z @ 12590 NONAME ; void QEglProperties::setPaintDeviceFormat(class QPaintDevice *)
     12592        ?isImageCached@QImagePixmapCleanupHooks@@SA_NABVQImage@@@Z @ 12591 NONAME ; bool QImagePixmapCleanupHooks::isImageCached(class QImage const &)
     12593        ?setRenderableType@QEglProperties@@QAEXW4API@QEgl@@@Z @ 12592 NONAME ; void QEglProperties::setRenderableType(enum QEgl::API)
     12594        ?setContext@QEglContext@@QAEXH@Z @ 12593 NONAME ; void QEglContext::setContext(int)
     12595        ?waitClient@QEglContext@@QAEXXZ @ 12594 NONAME ; void QEglContext::waitClient(void)
     12596        ?isEmpty@QEglProperties@@QBE_NXZ @ 12595 NONAME ; bool QEglProperties::isEmpty(void) const
     12597        ?dpy@QEglContext@@0HA @ 12596 NONAME ; int QEglContext::dpy
     12598        ?isSharing@QEglContext@@QBE_NXZ @ 12597 NONAME ; bool QEglContext::isSharing(void) const
     12599        ?isCurrent@QEglContext@@QBE_NXZ @ 12598 NONAME ; bool QEglContext::isCurrent(void) const
     12600        ??0QEglProperties@@QAE@XZ @ 12599 NONAME ; QEglProperties::QEglProperties(void)
     12601        ?extensions@QEglContext@@SA?AVQString@@XZ @ 12600 NONAME ; class QString QEglContext::extensions(void)
     12602        ?setCurrentContext@QEglContext@@CAXW4API@QEgl@@PAV1@@Z @ 12601 NONAME ; void QEglContext::setCurrentContext(enum QEgl::API, class QEglContext *)
     12603        ??1QEglProperties@@QAE@XZ @ 12602 NONAME ; QEglProperties::~QEglProperties(void)
     12604        ?createContext@QEglContext@@QAE_NPAV1@PBVQEglProperties@@@Z @ 12603 NONAME ; bool QEglContext::createContext(class QEglContext *, class QEglProperties const *)
     12605        ?setConfig@QEglContext@@QAEXH@Z @ 12604 NONAME ; void QEglContext::setConfig(int)
     12606        ?hasExtension@QEglContext@@SA_NPBD@Z @ 12605 NONAME ; bool QEglContext::hasExtension(char const *)
     12607        ?doneCurrent@QEglContext@@QAE_NXZ @ 12606 NONAME ; bool QEglContext::doneCurrent(void)
     12608        ?setPixelFormat@QEglProperties@@QAEXW4Format@QImage@@@Z @ 12607 NONAME ; void QEglProperties::setPixelFormat(enum QImage::Format)
     12609        ?currentContext@QEglContext@@CAPAV1@W4API@QEgl@@@Z @ 12608 NONAME ; class QEglContext * QEglContext::currentContext(enum QEgl::API)
     12610        ?setFocusHelper@QGraphicsItemPrivate@@QAEXW4FocusReason@Qt@@_N1@Z @ 12609 NONAME ; void QGraphicsItemPrivate::setFocusHelper(enum Qt::FocusReason, bool, bool)
     12611        ?errorString@QEglContext@@SA?AVQString@@H@Z @ 12610 NONAME ; class QString QEglContext::errorString(int)
    1255112612

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

    r561 r769  
    963963        ?staticMetaObject@QUdpSocket@@2UQMetaObject@@B @ 962 NONAME ; struct QMetaObject const QUdpSocket::staticMetaObject
    964964        ?staticMetaObject@QAbstractSocket@@2UQMetaObject@@B @ 963 NONAME ; struct QMetaObject const QAbstractSocket::staticMetaObject
     965        ?qt_qhostinfo_clear_cache@@YAXXZ @ 964 NONAME ; void qt_qhostinfo_clear_cache(void)
     966        ?qt_qhostinfo_lookup@@YA?AVQHostInfo@@ABVQString@@PAVQObject@@PBDPA_NPAH@Z @ 965 NONAME ; class QHostInfo qt_qhostinfo_lookup(class QString const &, class QObject *, char const *, bool *, int *)
    965967

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

    r561 r769  
    4949        ??0QVGPainterState@@QAE@XZ @ 48 NONAME ; QVGPainterState::QVGPainterState(void)
    5050        ?d_func@QVGPaintEngine@@ABEPBVQVGPaintEnginePrivate@@XZ @ 49 NONAME ; class QVGPaintEnginePrivate const * QVGPaintEngine::d_func(void) const
    51         ?qt_vg_create_context@@YAPAVQEglContext@@PAVQPaintDevice@@@Z @ 50 NONAME ; class QEglContext * qt_vg_create_context(class QPaintDevice *)
     51        ?qt_vg_create_context@@YAPAVQEglContext@@PAVQPaintDevice@@@Z @ 50 NONAME ABSENT ; class QEglContext * qt_vg_create_context(class QPaintDevice *)
    5252        ?clip@QVGPaintEngine@@UAEXABVQRegion@@W4ClipOperation@Qt@@@Z @ 51 NONAME ; void QVGPaintEngine::clip(class QRegion const &, enum Qt::ClipOperation)
    5353        ?endNativePainting@QVGPaintEngine@@UAEXXZ @ 52 NONAME ; void QVGPaintEngine::endNativePainting(void)
    … …  
    7979        ?createState@QVGPaintEngine@@UBEPAVQPainterState@@PAV2@@Z @ 78 NONAME ; class QPainterState * QVGPaintEngine::createState(class QPainterState *) const
    8080        ?buffer@QVGPixmapData@@UAEPAVQImage@@XZ @ 79 NONAME ; class QImage * QVGPixmapData::buffer(void)
    81         ?qt_vg_destroy_context@@YAXPAVQEglContext@@@Z @ 80 NONAME ; void qt_vg_destroy_context(class QEglContext *)
     81        ?qt_vg_destroy_context@@YAXPAVQEglContext@@@Z @ 80 NONAME ABSENT ; void qt_vg_destroy_context(class QEglContext *)
    8282        ?clip@QVGPaintEngine@@UAEXABVQVectorPath@@W4ClipOperation@Qt@@@Z @ 81 NONAME ; void QVGPaintEngine::clip(class QVectorPath const &, enum Qt::ClipOperation)
    8383        ?drawPolygon@QVGPaintEngine@@UAEXPBVQPoint@@HW4PolygonDrawMode@QPaintEngine@@@Z @ 82 NONAME ; void QVGPaintEngine::drawPolygon(class QPoint const *, int, enum QPaintEngine::PolygonDrawMode)
    … …  
    140140        ?clip@QVGPaintEngine@@UAEXABVQPainterPath@@W4ClipOperation@Qt@@@Z @ 139 NONAME ; void QVGPaintEngine::clip(class QPainterPath const &, enum Qt::ClipOperation)
    141141        ?vgPrivate@QVGPaintEngine@@QAEPAVQVGPaintEnginePrivate@@XZ @ 140 NONAME ; class QVGPaintEnginePrivate * QVGPaintEngine::vgPrivate(void)
     142        ?removeFromLRU@QVGImagePool@@IAEXPAVQVGPixmapData@@@Z @ 141 NONAME ; void QVGImagePool::removeFromLRU(class QVGPixmapData *)
     143        ?releaseImage@QVGImagePool@@UAEXPAVQVGPixmapData@@K@Z @ 142 NONAME ; void QVGImagePool::releaseImage(class QVGPixmapData *, unsigned long)
     144        ?d_func@QVGImagePool@@AAEPAVQVGImagePoolPrivate@@XZ @ 143 NONAME ; class QVGImagePoolPrivate * QVGImagePool::d_func(void)
     145        ?detachImageFromPool@QVGPixmapData@@UAEXXZ @ 144 NONAME ; void QVGPixmapData::detachImageFromPool(void)
     146        ?createImageForPixmap@QVGImagePool@@UAEKW4VGImageFormat@@JJKPAVQVGPixmapData@@@Z @ 145 NONAME ; unsigned long QVGImagePool::createImageForPixmap(enum VGImageFormat, long, long, unsigned long, class QVGPixmapData *)
     147        ?destroyImageAndContext@QVGPixmapData@@IAEXXZ @ 146 NONAME ; void QVGPixmapData::destroyImageAndContext(void)
     148        ?moveToHeadOfLRU@QVGImagePool@@IAEXPAVQVGPixmapData@@@Z @ 147 NONAME ; void QVGImagePool::moveToHeadOfLRU(class QVGPixmapData *)
     149        ?instance@QVGImagePool@@SAPAV1@XZ @ 148 NONAME ; class QVGImagePool * QVGImagePool::instance(void)
     150        ?useImage@QVGImagePool@@UAEXPAVQVGPixmapData@@@Z @ 149 NONAME ; void QVGImagePool::useImage(class QVGPixmapData *)
     151        ??1QVGImagePool@@UAE@XZ @ 150 NONAME ; QVGImagePool::~QVGImagePool(void)
     152        ?destroyImages@QVGPixmapData@@IAEXXZ @ 151 NONAME ; void QVGPixmapData::destroyImages(void)
     153        ?reclaimSpace@QVGImagePool@@UAE_NW4VGImageFormat@@JJPAVQVGPixmapData@@@Z @ 152 NONAME ; bool QVGImagePool::reclaimSpace(enum VGImageFormat, long, long, class QVGPixmapData *)
     154        ?detachImage@QVGImagePool@@UAEXPAVQVGPixmapData@@@Z @ 153 NONAME ; void QVGImagePool::detachImage(class QVGPixmapData *)
     155        ?createPermanentImage@QVGImagePool@@UAEKW4VGImageFormat@@JJK@Z @ 154 NONAME ; unsigned long QVGImagePool::createPermanentImage(enum VGImageFormat, long, long, unsigned long)
     156        ?d_func@QVGImagePool@@ABEPBVQVGImagePoolPrivate@@XZ @ 155 NONAME ; class QVGImagePoolPrivate const * QVGImagePool::d_func(void) const
     157        ?createTemporaryImage@QVGImagePool@@UAEKW4VGImageFormat@@JJKPAVQVGPixmapData@@@Z @ 156 NONAME ; unsigned long QVGImagePool::createTemporaryImage(enum VGImageFormat, long, long, unsigned long, class QVGPixmapData *)
     158        ??_EQVGImagePool@@UAE@I@Z @ 157 NONAME ; QVGImagePool::~QVGImagePool(unsigned int)
     159        ?hibernate@QVGImagePool@@UAEXXZ @ 158 NONAME ; void QVGImagePool::hibernate(void)
     160        ?qt_vg_destroy_context@@YAXPAVQEglContext@@H@Z @ 159 NONAME ; void qt_vg_destroy_context(class QEglContext *, int)
     161        ??0QVGImagePool@@QAE@XZ @ 160 NONAME ; QVGImagePool::QVGImagePool(void)
     162        ?setImagePool@QVGImagePool@@SAXPAV1@@Z @ 161 NONAME ; void QVGImagePool::setImagePool(class QVGImagePool *)
     163        ?pixmapLRU@QVGImagePool@@IAEPAVQVGPixmapData@@XZ @ 162 NONAME ; class QVGPixmapData * QVGImagePool::pixmapLRU(void)
     164        ?qt_vg_create_context@@YAPAVQEglContext@@PAVQPaintDevice@@H@Z @ 163 NONAME ; class QEglContext * qt_vg_create_context(class QPaintDevice *, int)
     165        ?reclaimImages@QVGPixmapData@@UAEXXZ @ 164 NONAME ; void QVGPixmapData::reclaimImages(void)
     166        ?hibernate@QVGPixmapData@@UAEXXZ @ 165 NONAME ; void QVGPixmapData::hibernate(void)
     167        ?supportsStaticContents@QVGEGLWindowSurfaceDirect@@UBE_NXZ @ 166 NONAME ; bool QVGEGLWindowSurfaceDirect::supportsStaticContents(void) const
     168        ?scroll@QVGEGLWindowSurfacePrivate@@UAE_NPAVQWidget@@ABVQRegion@@HH@Z @ 167 NONAME ; bool QVGEGLWindowSurfacePrivate::scroll(class QWidget *, class QRegion const &, int, int)
     169        ?scroll@QVGEGLWindowSurfaceDirect@@UAE_NPAVQWidget@@ABVQRegion@@HH@Z @ 168 NONAME ; bool QVGEGLWindowSurfaceDirect::scroll(class QWidget *, class QRegion const &, int, int)
     170        ?supportsStaticContents@QVGEGLWindowSurfacePrivate@@UBE_NXZ @ 169 NONAME ; bool QVGEGLWindowSurfacePrivate::supportsStaticContents(void) const
    142171

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

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

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

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

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

    r561 r769  
    994994        _ZN15QNetworkRequest20setOriginatingObjectEP7QObject @ 993 NONAME
    995995        _ZNK15QNetworkRequest17originatingObjectEv @ 994 NONAME
     996        _Z19qt_qhostinfo_lookupRK7QStringP7QObjectPKcPbPi @ 995 NONAME
     997        _Z24qt_qhostinfo_clear_cachev @ 996 NONAME
    996998

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

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

  • trunk/src/s60installs/qt.iby

    r651 r769  
    44#include <bldvariant.hrh>
    55
    6 // Dependancies for more than one module
    7 #include <base.iby>
    8 #include <openenv.iby> // QtCore, QtGui, QtNetwork, QtOpenGL, QSvgIconEngine,
    9 #include <cone.iby> // QtGui, QtOpenGL
    10 #include <stdcpp.iby> // for std C++ support
    11 
    12 // QtGui dependancies
    13 #include <bafl.iby>
    14 #include <store.iby>
    15 #include <fntstore.iby>
    16 #include <ecom.iby>
    17 #include <fontutils.iby>
    18 #include <fepbase.iby>
    19 #include <fbserv.iby>
    20 #include <bitgdi.iby>
    21 #include <gdi.iby>
    22 #include <wserv.iby>
    23 #include <apparc.iby>
    24 #include <uikon.iby>
    25 #include <etext.iby>
    26 #include <emime.iby>
    27 #include <eikstd.iby>
    28 #include <mmf.iby>
    29 #include <avkon.iby>
    30 #include <commonui.iby>
    31 #include <platformenv.iby>
    32 #include <senduiservices.iby>
    33 #include <aknicon.iby>
    34 #include <aknskins.iby>
    35 
    36 // QtNetwork dependancies
    37 #include <esock_core.iby>
    38 #include <insock.iby>
    39 
    40 // QtOpenGL dependancies
    41 ///@todo Problem here as we need libegl.dll and libglesv2.dll but they may come from a variety of places
    42 /// depending on the platform we're on
    43 
    446#warning("qt.iby: hack - BINARY_SELECTION_ORDER really needs to be at the baseport/device level as it depends on the device type");
    457BINARY_SELECTION_ORDER ARMV6,ARMV5 // hack - this really needs to be at the baseport/device level as it depends on the device type
    468
    47 file=ABI_DIR\BUILD_DIR\QtCore.dll            SHARED_LIB_DIR\QtCore.dll       PAGED
    48 file=ABI_DIR\BUILD_DIR\QtGui.dll             SHARED_LIB_DIR\QtGui.dll        PAGED
    49 file=ABI_DIR\BUILD_DIR\QtOpenGL.dll          SHARED_LIB_DIR\QtOpenGL.dll     PAGED
    50 file=ABI_DIR\BUILD_DIR\QtOpenVG.dll          SHARED_LIB_DIR\QtOpenVG.dll     PAGED
    51 file=ABI_DIR\BUILD_DIR\QtSvg.dll             SHARED_LIB_DIR\QtSvg.dll        PAGED
    52 file=ABI_DIR\BUILD_DIR\QtSql.dll             SHARED_LIB_DIR\QtSql.dll        PAGED
    53 file=ABI_DIR\BUILD_DIR\QtXml.dll             SHARED_LIB_DIR\QtXml.dll        PAGED
    54 file=ABI_DIR\BUILD_DIR\QtNetwork.dll         SHARED_LIB_DIR\QtNetwork.dll    PAGED
    55 file=ABI_DIR\BUILD_DIR\QtScript.dll          SHARED_LIB_DIR\QtScript.dll     PAGED
    56 file=ABI_DIR\BUILD_DIR\QtTest.dll            SHARED_LIB_DIR\QtTest.dll       PAGED
    57 file=ABI_DIR\BUILD_DIR\QtWebKit.dll          SHARED_LIB_DIR\QtWebKit.dll     PAGED
    58 file=ABI_DIR\BUILD_DIR\phonon.dll            SHARED_LIB_DIR\phonon.dll       PAGED
    59 file=ABI_DIR\BUILD_DIR\QtMultimedia.dll      SHARED_LIB_DIR\QtMultimedia.dll PAGED
    60 file=ABI_DIR\BUILD_DIR\QtXmlPatterns.dll     SHARED_LIB_DIR\QtXmlPatterns.dll       PAGED
    61 file=ABI_DIR\BUILD_DIR\QtDeclarative.dll     SHARED_LIB_DIR\QtDeclarative.dll       PAGED
     9file=ABI_DIR\BUILD_DIR\QtCore.dll            SHARED_LIB_DIR\QtCore.dll
     10file=ABI_DIR\BUILD_DIR\QtGui.dll             SHARED_LIB_DIR\QtGui.dll
     11file=ABI_DIR\BUILD_DIR\QtOpenVG.dll          SHARED_LIB_DIR\QtOpenVG.dll
     12file=ABI_DIR\BUILD_DIR\QtSvg.dll             SHARED_LIB_DIR\QtSvg.dll
     13file=ABI_DIR\BUILD_DIR\QtSql.dll             SHARED_LIB_DIR\QtSql.dll
     14file=ABI_DIR\BUILD_DIR\QtXml.dll             SHARED_LIB_DIR\QtXml.dll
     15file=ABI_DIR\BUILD_DIR\QtNetwork.dll         SHARED_LIB_DIR\QtNetwork.dll
     16file=ABI_DIR\BUILD_DIR\QtScript.dll          SHARED_LIB_DIR\QtScript.dll
     17file=ABI_DIR\BUILD_DIR\QtTest.dll            SHARED_LIB_DIR\QtTest.dll
     18file=ABI_DIR\BUILD_DIR\QtWebKit.dll          SHARED_LIB_DIR\QtWebKit.dll
     19file=ABI_DIR\BUILD_DIR\phonon.dll            SHARED_LIB_DIR\phonon.dll
     20file=ABI_DIR\BUILD_DIR\QtMultimedia.dll      SHARED_LIB_DIR\QtMultimedia.dll
     21file=ABI_DIR\BUILD_DIR\QtXmlPatterns.dll     SHARED_LIB_DIR\QtXmlPatterns.dll
    6222
    6323// imageformats
    64 file=ABI_DIR\BUILD_DIR\qgif.dll              SHARED_LIB_DIR\qgif.dll         PAGED
    65 file=ABI_DIR\BUILD_DIR\qico.dll              SHARED_LIB_DIR\qico.dll         PAGED
    66 file=ABI_DIR\BUILD_DIR\qjpeg.dll             SHARED_LIB_DIR\qjpeg.dll        PAGED
    67 file=ABI_DIR\BUILD_DIR\qmng.dll              SHARED_LIB_DIR\qmng.dll         PAGED
    68 file=ABI_DIR\BUILD_DIR\qsvg.dll              SHARED_LIB_DIR\qsvg.dll         PAGED
    69 file=ABI_DIR\BUILD_DIR\qtiff.dll             SHARED_LIB_DIR\qtiff.dll        PAGED
     24file=ABI_DIR\BUILD_DIR\qgif.dll              SHARED_LIB_DIR\qgif.dll
     25file=ABI_DIR\BUILD_DIR\qico.dll              SHARED_LIB_DIR\qico.dll
     26file=ABI_DIR\BUILD_DIR\qjpeg.dll             SHARED_LIB_DIR\qjpeg.dll
     27file=ABI_DIR\BUILD_DIR\qmng.dll              SHARED_LIB_DIR\qmng.dll
     28file=ABI_DIR\BUILD_DIR\qsvg.dll              SHARED_LIB_DIR\qsvg.dll
     29file=ABI_DIR\BUILD_DIR\qtiff.dll             SHARED_LIB_DIR\qtiff.dll
    7030
    7131// codecs
    72 file=ABI_DIR\BUILD_DIR\qcncodecs.dll         SHARED_LIB_DIR\qcncodecs.dll    PAGED
    73 file=ABI_DIR\BUILD_DIR\qjpcodecs.dll         SHARED_LIB_DIR\qjpcodecs.dll    PAGED
    74 file=ABI_DIR\BUILD_DIR\qkrcodecs.dll         SHARED_LIB_DIR\qkrcodecs.dll    PAGED
    75 file=ABI_DIR\BUILD_DIR\qtwcodecs.dll         SHARED_LIB_DIR\qtwcodecs.dll    PAGED
     32file=ABI_DIR\BUILD_DIR\qcncodecs.dll         SHARED_LIB_DIR\qcncodecs.dll
     33file=ABI_DIR\BUILD_DIR\qjpcodecs.dll         SHARED_LIB_DIR\qjpcodecs.dll
     34file=ABI_DIR\BUILD_DIR\qkrcodecs.dll         SHARED_LIB_DIR\qkrcodecs.dll
     35file=ABI_DIR\BUILD_DIR\qtwcodecs.dll         SHARED_LIB_DIR\qtwcodecs.dll
    7636
    7737// iconengines
    78 file=ABI_DIR\BUILD_DIR\qsvgicon.dll          SHARED_LIB_DIR\qsvgicon.dll     PAGED
     38file=ABI_DIR\BUILD_DIR\qsvgicon.dll          SHARED_LIB_DIR\qsvgicon.dll
    7939
    8040// Phonon MMF backend
    81 file=ABI_DIR\BUILD_DIR\phonon_mmf.dll        SHARED_LIB_DIR\phonon_mmf.dll   PAGED
     41// This is commented out by default, as normally Helix backend will be used.
     42// If the Helix backend is present, it will override MMF backend, so make sure to remove it from
     43// image creation in addition to uncommenting the following lines if you want to use MMF backend.
     44//file=ABI_DIR\BUILD_DIR\phonon_mmf.dll        SHARED_LIB_DIR\phonon_mmf.dll
     45//data=\epoc32\data\z\resource\qt\plugins\phonon_backend\phonon_mmf.qtplugin resource\qt\plugins\phonon_backend\phonon_mmf.qtplugin
     46
     47// QtMultimedia audio backend
     48file=ABI_DIR\BUILD_DIR\qaudio.dll            SHARED_LIB_DIR\qaudio.dll
    8249
    8350// graphicssystems
    84 file=ABI_DIR\BUILD_DIR\qvggraphicssystem.dll SHARED_LIB_DIR\qvggraphicssystem.dll     PAGED
     51file=ABI_DIR\BUILD_DIR\qvggraphicssystem.dll SHARED_LIB_DIR\qvggraphicssystem.dll
    8552
    8653// S60 version compatibility plugins for 5.0 (3.1 and 3.2 devices are never likely to have this in ROM,
    8754// so don't bother including those plugins
    88 file=ABI_DIR\BUILD_DIR\qts60plugin_5_0.dll   SHARED_LIB_DIR\qts60plugin_5_0.dll   PAGED
     55file=ABI_DIR\BUILD_DIR\qts60plugin_5_0.dll   SHARED_LIB_DIR\qts60plugin_5_0.dll
    8956
    9057S60_APP_RESOURCE(s60main)
    … …  
    10774data=\epoc32\data\z\resource\qt\plugins\iconengines\qsvgicon.qtplugin      resource\qt\plugins\iconengines\qsvgicon.qtplugin
    10875
    109 // Phonon MMF backend
    110 data=\epoc32\data\z\resource\qt\plugins\phonon_backend\phonon_mmf.qtplugin resource\qt\plugins\phonon_backend\phonon_mmf.qtplugin
     76
     77// QtMultimedia audio backend
     78data=\epoc32\data\qt\qtlibspluginstubs\qaudio.qtplugin resource\qt\plugins\audio\qaudio.qtplugin
    11179
    11280// graphicssystems
    … …  
    11482
    11583// Stub sis file
    116 data=ZSYSTEM\install\qt.sis    System\Install\qt.sis
     84data=ZSYSTEM\install\qt_stub.sis    System\Install\qt_stub.sis
     85data=ZSYSTEM\install\qtwebkit_stub.sis    System\Install\qtwebkit_stub.sis
    11786
    11887#endif // __QT_IBY__
     88

  • trunk/src/s60installs/s60installs.pro

    r651 r769  
    88    # WARNING: Changing TARGET name will break Symbian SISX upgrade functionality
    99    # DO NOT TOUCH TARGET VARIABLE IF YOU ARE NOT SURE WHAT YOU ARE DOING
    10     TARGET = "Qt"
    11     TARGET.UID3 = 0x2001E61C
     10    TARGET = "Qt$${QT_LIBINFIX}"
     11
     12    isEmpty(QT_LIBINFIX) {
     13        TARGET.UID3 = 0x2001E61C
     14
     15        # sqlite3 is expected to be already found on phone if infixed configuration is built.
     16        BLD_INF_RULES.prj_exports += \
     17            "sqlite3.sis $${EPOCROOT}epoc32/data/qt/sis/sqlite3.sis" \
     18            "sqlite3_selfsigned.sis $${EPOCROOT}epoc32/data/qt/sis/sqlite3_selfsigned.sis"
     19        sqlitedeployment = \
     20            "; Deploy sqlite onto phone that does not have it already" \
     21            "@\"$${EPOCROOT}epoc32/data/qt/sis/sqlite3.sis\", (0x2002af5f)"
     22        qtlibraries.pkg_postrules += sqlitedeployment
     23    } else {
     24        # Always use experimental UID for infixed configuration to avoid UID clash
     25        TARGET.UID3 = 0xE001E61C
     26    }
    1227    VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
    1328
    14     qtresources.sources = $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/s60main.rsc
     29    qtresources.sources = $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/s60main$${QT_LIBINFIX}.rsc
    1530    qtresources.path = c:$$APP_RESOURCE_DIR
     31    DEPLOYMENT += qtresources
    1632
    1733    qtlibraries.sources = \
    18         QtCore.dll \
    19         QtXml.dll \
    20         QtGui.dll \
    21         QtNetwork.dll \
    22         QtTest.dll \
    23         QtSql.dll
     34        QtCore$${QT_LIBINFIX}.dll \
     35        QtXml$${QT_LIBINFIX}.dll \
     36        QtGui$${QT_LIBINFIX}.dll \
     37        QtNetwork$${QT_LIBINFIX}.dll \
     38        QtTest$${QT_LIBINFIX}.dll \
     39        QtSql$${QT_LIBINFIX}.dll
    2440
    2541    qts60plugindeployment = \
    2642        "IF package(0x1028315F)" \
    27         "   \"$${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET)/qts60plugin_5_0.dll\" - \"c:\\sys\\bin\\qts60plugin_5_0.dll\"" \
     43        "   \"$${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET)/qts60plugin_5_0$${QT_LIBINFIX}.dll\" - \"c:\\sys\\bin\\qts60plugin_5_0$${QT_LIBINFIX}.dll\"" \
    2844        "ELSEIF package(0x102752AE)" \
    29         "   \"$${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET)/qts60plugin_3_2.dll\" - \"c:\\sys\\bin\\qts60plugin_3_2.dll\"" \
     45        "   \"$${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET)/qts60plugin_3_2$${QT_LIBINFIX}.dll\" - \"c:\\sys\\bin\\qts60plugin_3_2$${QT_LIBINFIX}.dll\"" \
    3046        "ELSEIF package(0x102032BE)" \
    31         "   \"$${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET)/qts60plugin_3_1.dll\" - \"c:\\sys\\bin\\qts60plugin_3_1.dll\"" \
     47        "   \"$${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET)/qts60plugin_3_1$${QT_LIBINFIX}.dll\" - \"c:\\sys\\bin\\qts60plugin_3_1$${QT_LIBINFIX}.dll\"" \
    3248        "ELSE" \
    33         "   \"$${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET)/qts60plugin_5_0.dll\" - \"c:\\sys\\bin\\qts60plugin_5_0.dll\"" \
     49        "   \"$${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET)/qts60plugin_5_0$${QT_LIBINFIX}.dll\" - \"c:\\sys\\bin\\qts60plugin_5_0$${QT_LIBINFIX}.dll\"" \
    3450        "ENDIF"
    3551    qtlibraries.pkg_postrules += qts60plugindeployment
    3652
    37     sqlitedeployment = \
    38         "; Deploy sqlite onto phone that does not have it already" \
    39         "@\"$$PWD/sqlite3.sis\", (0x2002af5f)"
    40     qtlibraries.pkg_postrules += sqlitedeployment
    4153
    4254    qtlibraries.path = c:/sys/bin
    … …  
    6274    qtlibraries.pkg_prerules += "(0x2002af5f), 0, 5, 0, {\"sqlite3\"}"
    6375
    64     !contains(QT_CONFIG, no-jpeg): imageformats_plugins.sources += qjpeg.dll
    65     !contains(QT_CONFIG, no-gif):  imageformats_plugins.sources += qgif.dll
    66     !contains(QT_CONFIG, no-mng):  imageformats_plugins.sources += qmng.dll
    67     !contains(QT_CONFIG, no-tiff): imageformats_plugins.sources += qtiff.dll
    68     !contains(QT_CONFIG, no-ico):  imageformats_plugins.sources += qico.dll
     76    !contains(QT_CONFIG, no-jpeg): imageformats_plugins.sources += qjpeg$${QT_LIBINFIX}.dll
     77    !contains(QT_CONFIG, no-gif):  imageformats_plugins.sources += qgif$${QT_LIBINFIX}.dll
     78    !contains(QT_CONFIG, no-mng):  imageformats_plugins.sources += qmng$${QT_LIBINFIX}.dll
     79    !contains(QT_CONFIG, no-tiff): imageformats_plugins.sources += qtiff$${QT_LIBINFIX}.dll
     80    !contains(QT_CONFIG, no-ico):  imageformats_plugins.sources += qico$${QT_LIBINFIX}.dll
    6981    imageformats_plugins.path = c:$$QT_PLUGINS_BASE_DIR/imageformats
    7082
    71     codecs_plugins.sources = qcncodecs.dll qjpcodecs.dll qtwcodecs.dll qkrcodecs.dll
     83    codecs_plugins.sources = qcncodecs$${QT_LIBINFIX}.dll qjpcodecs$${QT_LIBINFIX}.dll qtwcodecs$${QT_LIBINFIX}.dll qkrcodecs$${QT_LIBINFIX}.dll
    7284    codecs_plugins.path = c:$$QT_PLUGINS_BASE_DIR/codecs
    7385
    7486    contains(QT_CONFIG, phonon-backend) {
    75         phonon_backend_plugins.sources += phonon_mmf.dll
     87        phonon_backend_plugins.sources += phonon_mmf$${QT_LIBINFIX}.dll
    7688
    7789        phonon_backend_plugins.path = c:$$QT_PLUGINS_BASE_DIR/phonon_backend
    … …  
    8395    qtbackup.path = c:/private/10202D56/import/packages/$$replace(TARGET.UID3, 0x,)
    8496
    85     DEPLOYMENT += qtresources qtlibraries qtbackup imageformats_plugins codecs_plugins graphicssystems_plugins
     97    DEPLOYMENT += qtlibraries qtbackup imageformats_plugins codecs_plugins graphicssystems_plugins
    8698
    8799    contains(QT_CONFIG, svg): {
    88        qtlibraries.sources += QtSvg.dll
    89        imageformats_plugins.sources += qsvg.dll
    90        iconengines_plugins.sources = qsvgicon.dll
     100       qtlibraries.sources += QtSvg$${QT_LIBINFIX}.dll
     101       imageformats_plugins.sources += qsvg$${QT_LIBINFIX}.dll
     102       iconengines_plugins.sources = qsvgicon$${QT_LIBINFIX}.dll
    91103       iconengines_plugins.path = c:$$QT_PLUGINS_BASE_DIR/iconengines
    92104       DEPLOYMENT += iconengines_plugins
    … …  
    94106
    95107    contains(QT_CONFIG, phonon): {
    96        qtlibraries.sources += phonon.dll
     108       qtlibraries.sources += phonon$${QT_LIBINFIX}.dll
    97109    }
    98110
    99111    contains(QT_CONFIG, script): {
    100         qtlibraries.sources += QtScript.dll
     112        qtlibraries.sources += QtScript$${QT_LIBINFIX}.dll
    101113    }
    102114
    103115    contains(QT_CONFIG, xmlpatterns): {
    104        qtlibraries.sources += QtXmlPatterns.dll
     116       qtlibraries.sources += QtXmlPatterns$${QT_LIBINFIX}.dll
    105117    }
    106118
    107119    contains(QT_CONFIG, declarative): {
    108         qtlibraries.sources += QtDeclarative.dll
     120        qtlibraries.sources += QtDeclarative$${QT_LIBINFIX}.dll
    109121    }
    110122
    111123    graphicssystems_plugins.path = c:$$QT_PLUGINS_BASE_DIR/graphicssystems
    112124    contains(QT_CONFIG, openvg) {
    113         qtlibraries.sources += QtOpenVG.dll
    114         graphicssystems_plugins.sources += qvggraphicssystem.dll
     125        qtlibraries.sources += QtOpenVG$${QT_LIBINFIX}.dll
     126        graphicssystems_plugins.sources += qvggraphicssystem$${QT_LIBINFIX}.dll
    115127    }
    116128
    117129    contains(QT_CONFIG, multimedia) {
    118         qtlibraries.sources += QtMultimedia.dll
     130        qtlibraries.sources += QtMultimedia$${QT_LIBINFIX}.dll
    119131    }
    120132
    121133    BLD_INF_RULES.prj_exports += "qt.iby $$CORE_MW_LAYER_IBY_EXPORT_PATH(qt.iby)"
    122     BLD_INF_RULES.prj_exports += "qtdemoapps.iby $$CORE_APP_LAYER_IBY_EXPORT_PATH(qtdemoapps.iby)"
     134    BLD_INF_RULES.prj_exports += "qtdemoapps.iby $$CUSTOMER_VARIANT_APP_LAYER_IBY_EXPORT_PATH(qtdemoapps.iby)"
    123135}
Note: See TracChangeset for help on using the changeset viewer.