Changeset 769 for trunk/src/s60installs

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
     4403
     4404
     4405
     4406
     4407
     4408
     4409
     4410
     4411
     4412
     4413
     4414
     4415
     4416
     4417
     4418
     4419
     4420
     4421
    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 ; 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 ; 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
     12552
     12553
     12554
     12555
     12556
     12557
     12558
     12559
     12560
     12561
     12562
     12563
     12564
     12565
     12566
     12567
     12568
     12569
     12570
     12571
     12572
     12573
     12574
     12575
     12576
     12577
     12578
     12579
     12580
     12581
     12582
     12583
     12584
     12585
     12586
     12587
     12588
     12589
     12590
     12591
     12592
     12593
     12594
     12595
     12596
     12597
     12598
     12599
     12600
     12601
     12602
     12603
     12604
     12605
     12606
     12607
     12608
     12609
     12610
     12611
    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
     966
    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 ; 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 ; 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
     143
     144
     145
     146
     147
     148
     149
     150
     151
     152
     153
     154
     155
     156
     157
     158
     159
     160
     161
     162
     163
     164
     165
     166
     167
     168
     169
     170
    142171

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

    r651 r769  
    36353635        _ZTVN13QStateMachine12WrappedEventE @ 3634 NONAME
    36363636        _ZN11QMetaObject13disconnectOneEPK7QObjectiS2_i @ 3635 NONAME
     3637
     3638
     3639
     3640
     3641
     3642
     3643
     3644
     3645
     3646
     3647
     3648
     3649
     3650
     3651
     3652
     3653
     3654
     3655
     3656
    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
    18221822        _ZN12QLineControl18displayTextChangedERK7QString @ 1821 NONAME
    18231823        _ZN12QLineControl18removeSelectedTextEv @ 1822 NONAME
    … …  
    46644664        _ZN20QGraphicsItemPrivate12setPosHelperERK7QPointF @ 4663 NONAME
    46654665        _ZN20QGraphicsItemPrivate13clearSubFocusEP13QGraphicsItem @ 4664 NONAME
    4666         _ZN20QGraphicsItemPrivate14setFocusHelperEN2Qt11FocusReasonEb @ 4665 NONAME
     4666        _ZN20QGraphicsItemPrivate14setFocusHelperEN2Qt11FocusReasonEb @ 4665 NONAME
    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
     11809
     11810
     11811
     11812
     11813
     11814
     11815
     11816
     11817
     11818
     11819
     11820
     11821
     11822
    1180811823

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

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

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

    r561 r769  
    174174        _ZN13QVGPixmapData22destroyImageAndContextEv @ 173 NONAME
    175175        _ZN13QVGPixmapData9hibernateEv @ 174 NONAME
     176
     177
     178
     179
     180
     181
     182
     183
     184
     185
     186
     187
     188
     189
     190
     191
     192
     193
     194
     195
     196
     197
     198
     199
     200
    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.rsc
    1530    qtresources.path = c:$$APP_RESOURCE_DIR
     31
    1632
    1733    qtlibraries.sources = \
    18         QtCore.dll \
    19         QtXml.dll \
    20         QtGui.dll \
    21         QtNetwork.dll \
    22         QtTest.dll \
    23         QtSql.dll
     34        QtCore.dll \
     35        QtXml.dll \
     36        QtGui.dll \
     37        QtNetwork.dll \
     38        QtTest.dll \
     39        QtSql.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.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.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.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.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.dll
     77    !contains(QT_CONFIG, no-gif):  imageformats_plugins.sources += qgif.dll
     78    !contains(QT_CONFIG, no-mng):  imageformats_plugins.sources += qmng.dll
     79    !contains(QT_CONFIG, no-tiff): imageformats_plugins.sources += qtiff.dll
     80    !contains(QT_CONFIG, no-ico):  imageformats_plugins.sources += qico.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.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.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.dll
     101       imageformats_plugins.sources += qsvg.dll
     102       iconengines_plugins.sources = qsvgicon.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.dll
    97109    }
    98110
    99111    contains(QT_CONFIG, script): {
    100         qtlibraries.sources += QtScript.dll
     112        qtlibraries.sources += QtScript.dll
    101113    }
    102114
    103115    contains(QT_CONFIG, xmlpatterns): {
    104        qtlibraries.sources += QtXmlPatterns.dll
     116       qtlibraries.sources += QtXmlPatterns.dll
    105117    }
    106118
    107119    contains(QT_CONFIG, declarative): {
    108         qtlibraries.sources += QtDeclarative.dll
     120        qtlibraries.sources += QtDeclarative.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.dll
     126        graphicssystems_plugins.sources += qvggraphicssystem.dll
    115127    }
    116128
    117129    contains(QT_CONFIG, multimedia) {
    118         qtlibraries.sources += QtMultimedia.dll
     130        qtlibraries.sources += QtMultimedia.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 $$C_APP_LAYER_IBY_EXPORT_PATH(qtdemoapps.iby)"
    123135}
Note: See TracChangeset for help on using the changeset viewer.