Ignore:
Timestamp:
May 5, 2011, 5:36:53 AM (14 years ago)
Author:
Dmitry A. Kuminov
Message:

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

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/demos/embedded/fluidlauncher/fluidlauncher.pro

    r769 r846  
    33DEPENDPATH += .
    44INCLUDEPATH += .
     5VERSION = $$QT_VERSION
    56
    67# Input
    … …  
    5859symbian {
    5960    load(data_caging_paths)
     61    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
     62    RSS_RULES = # Clear RSS_RULES, otherwise fluidlauncher will get put into QtDemos folder
    6063
    6164    TARGET.UID3 = 0xA000A641
    62     ICON = $$QT_SOURCE_TREE/src/s60installs/qt.svg
     65
     66    defineReplace(regResourceDir) {
     67        symbian-abld|symbian-sbsv2 {
     68            return($${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/$$basename(1))
     69        } else {
     70            return($${QT_BUILD_TREE}/$$1)
     71        }
     72    }
     73
     74    defineReplace(appResourceDir) {
     75        symbian-abld|symbian-sbsv2 {
     76            return($${EPOCROOT}$${HW_ZDIR}$${APP_RESOURCE_DIR}/$$basename(1))
     77        } else {
     78            return($${QT_BUILD_TREE}/$$1)
     79        }
     80    }
    6381
    6482    executables.sources = \
    65         styledemo.exe \
    66         deform.exe \
    67         pathstroke.exe \
    68         wiggly.exe \
    69         qftp.exe \
    70         saxbookmarks.exe \
    71         desktopservices.exe \
    72         fridgemagnets.exe \
    73         softkeys.exe \
    74         raycasting.exe \
    75         flickable.exe \
    76         digiflip.exe \
    77         lightmaps.exe \
    78         flightinfo.exe
     83        $$QT_BUILD_TREE/demos/embedded/styledemo/styledemo.exe \
     84        $$QT_BUILD_TREE/demos/deform/deform.exe \
     85        $$QT_BUILD_TREE/demos/pathstroke/pathstroke.exe \
     86        $$QT_BUILD_TREE/examples/widgets/wiggly/wiggly.exe \
     87        $$QT_BUILD_TREE/examples/network/qftp/qftp.exe \
     88        $$QT_BUILD_TREE/examples/xml/saxbookmarks/saxbookmarks.exe \
     89        $$QT_BUILD_TREE/demos/embedded/desktopservices/desktopservices.exe \
     90        $$QT_BUILD_TREE/examples/draganddrop/fridgemagnets/fridgemagnets.exe \
     91        $$QT_BUILD_TREE/examples/widgets/softkeys/softkeys.exe \
     92        $$QT_BUILD_TREE/demos/embedded/raycasting/raycasting.exe \
     93        $$QT_BUILD_TREE/demos/embedded/flickable/flickable.exe \
     94        $$QT_BUILD_TREE/demos/embedded/digiflip/digiflip.exe \
     95        $$QT_BUILD_TREE/demos/embedded/lightmaps/lightmaps.exe \
     96        $$QT_BUILD_TREE/demos/embedded/flightinfo/flightinfo.exe
    7997
    8098    executables.path = /sys/bin
    8199
    82100    reg_resource.sources = \
    83         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/styledemo_reg.rsc \
    84         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/deform_reg.rsc \
    85         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/pathstroke_reg.rsc \
    86         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/wiggly_reg.rsc \
    87         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/qftp_reg.rsc\
    88         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/saxbookmarks_reg.rsc \
    89         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/desktopservices_reg.rsc \
    90         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/fridgemagnets_reg.rsc \
    91         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/softkeys_reg.rsc \
    92         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/raycasting_reg.rsc \
    93         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/flickable_reg.rsc \
    94         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/digiflip_reg.rsc \
    95         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/lightmaps_reg.rsc \
    96         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/flightinfo_reg.rsc
     101        $$regResourceDir(demos/embedded/styledemo/styledemo_reg.rsc) \
     102        $$regResourceDir(demos/deform/deform_reg.rsc) \
     103        $$regResourceDir(demos/pathstroke/pathstroke_reg.rsc) \
     104        $$regResourceDir(examples/widgets/wiggly/wiggly_reg.rsc) \
     105        $$regResourceDir(examples/network/qftp/qftp_reg.rsc)\
     106        $$regResourceDir(examples/xml/saxbookmarks/saxbookmarks_reg.rsc) \
     107        $$regResourceDir(demos/embedded/desktopservices/desktopservices_reg.rsc) \
     108        $$regResourceDir(examples/draganddrop/fridgemagnets/fridgemagnets_reg.rsc) \
     109        $$regResourceDir(examples/widgets/softkeys/softkeys_reg.rsc) \
     110        $$regResourceDir(demos/embedded/raycasting/raycasting_reg.rsc) \
     111        $$regResourceDir(demos/embedded/flickable/flickable_reg.rsc) \
     112        $$regResourceDir(demos/embedded/digiflip/digiflip_reg.rsc) \
     113        $$regResourceDir(demos/embedded/lightmaps/lightmaps_reg.rsc) \
     114        $$regResourceDir(demos/embedded/flightinfo/flightinfo_reg.rsc)
    97115
    98116    contains(QT_CONFIG, phonon) {
    99         reg_resource.sources += $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/qmediaplayer_reg.rsc
     117        reg_resource.sources += $$regResourceDir(demos/qmediaplayer/qmediaplayer_reg.rsc)
    100118    }
    101119
    102120    contains(QT_CONFIG, multimedia) {
    103         reg_resource.sources += $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/spectrum_reg.rsc
     121        reg_resource.sources += $$regResourceDir(demos/spectrum/app/spectrum_reg.rsc)
    104122    }
    105123
    … …  
    108126
    109127    resource.sources = \
    110         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/styledemo.rsc \
    111         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/deform.rsc \
    112         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/pathstroke.rsc \
    113         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/wiggly.rsc \
    114         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/qftp.rsc\
    115         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/saxbookmarks.rsc \
    116         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/desktopservices.rsc \
    117         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/fridgemagnets.rsc \
    118         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/softkeys.rsc \
    119         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/raycasting.rsc \
    120         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/flickable.rsc \
    121         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/digiflip.rsc \
    122         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/lightmaps.rsc \
    123         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/flightinfo.rsc
     128        $$appResourceDir(demos/embedded/styledemo/styledemo.rsc) \
     129        $$appResourceDir(demos/deform/deform.rsc) \
     130        $$appResourceDir(demos/pathstroke/pathstroke.rsc) \
     131        $$appResourceDir(examples/widgets/wiggly/wiggly.rsc) \
     132        $$appResourceDir(examples/network/qftp/qftp.rsc)\
     133        $$appResourceDir(examples/xml/saxbookmarks/saxbookmarks.rsc) \
     134        $$appResourceDir(demos/embedded/desktopservices/desktopservices.rsc) \
     135        $$appResourceDir(examples/draganddrop/fridgemagnets/fridgemagnets.rsc) \
     136        $$appResourceDir(examples/widgets/softkeys/softkeys.rsc) \
     137        $$appResourceDir(demos/embedded/raycasting/raycasting.rsc) \
     138        $$appResourceDir(demos/embedded/flickable/flickable.rsc) \
     139        $$appResourceDir(demos/embedded/digiflip/digiflip.rsc) \
     140        $$appResourceDir(demos/embedded/lightmaps/lightmaps.rsc) \
     141        $$appResourceDir(demos/embedded/flightinfo/flightinfo.rsc)
    124142
    125143
    … …  
    127145
    128146    mifs.sources = \
    129         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/fluidlauncher.mif \
    130         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/styledemo.mif \
    131         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/deform.mif \
    132         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/pathstroke.mif \
    133         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/wiggly.mif \
    134         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/qftp.mif \
    135         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/saxbookmarks.mif \
    136         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/desktopservices.mif \
    137         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/fridgemagnets.mif \
    138         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/softkeys.mif \
    139         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/raycasting.mif \
    140         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/flickable.mif \
    141         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/digiflip.mif \
    142         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/lightmaps.mif \
    143         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/flightinfo.mif
     147        $$appResourceDir(demos/embedded/fluidlauncher/fluidlauncher.mif) \
     148        $$appResourceDir(demos/embedded/styledemo/styledemo.mif) \
     149        $$appResourceDir(demos/deform/deform.mif) \
     150        $$appResourceDir(demos/pathstroke/pathstroke.mif) \
     151        $$appResourceDir(examples/widgets/wiggly/wiggly.mif) \
     152        $$appResourceDir(examples/network/qftp/qftp.mif) \
     153        $$appResourceDir(examples/xml/saxbookmarks/saxbookmarks.mif) \
     154        $$appResourceDir(demos/embedded/desktopservices/desktopservices.mif) \
     155        $$appResourceDir(examples/draganddrop/fridgemagnets/fridgemagnets.mif) \
     156        $$appResourceDir(examples/widgets/softkeys/softkeys.mif) \
     157        $$appResourceDir(demos/embedded/raycasting/raycasting.mif) \
     158        $$appResourceDir(demos/embedded/flickable/flickable.mif) \
     159        $$appResourceDir(demos/embedded/digiflip/digiflip.mif) \
     160        $$appResourceDir(demos/embedded/lightmaps/lightmaps.mif) \
     161        $$appResourceDir(demos/embedded/flightinfo/flightinfo.mif)
    144162    mifs.path = $$APP_RESOURCE_DIR
    145163
    146164    contains(QT_CONFIG, svg) {
    147165        executables.sources += \
    148             embeddedsvgviewer.exe \
    149             weatherinfo.exe
     166            $$QT_BUILD_TREE/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.exe \
     167            $$QT_BUILD_TREE/demos/embedded/weatherinfo/weatherinfo.exe
    150168
    151169        reg_resource.sources += \
    152             $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/embeddedsvgviewer_reg.rsc \
    153             $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/weatherinfo_reg.rsc
     170            $$regResourceDir(demos/embedded/embeddedsvgviewer/embeddedsvgviewer_reg.rsc) \
     171            $$regResourceDir(demos/embedded/weatherinfo/weatherinfo_reg.rsc)
    154172
    155173        resource.sources += \
    156             $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/embeddedsvgviewer.rsc \
    157             $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/weatherinfo.rsc
    158 
    159         mifs.sources += \
    160             $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/embeddedsvgviewer.mif \
    161             $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/weatherinfo.mif
     174            $$appResourceDir(demos/embedded/embeddedsvgviewer/embeddedsvgviewer.rsc) \
     175            $$appResourceDir(demos/embedded/weatherinfo/weatherinfo.rsc)
     176
     177        mifs.sources += \
     178            $$appResourceDir(demos/embedded/embeddedsvgviewer/embeddedsvgviewer.mif) \
     179            $$appResourceDir(demos/embedded/weatherinfo/weatherinfo.mif)
    162180
    163181    }
    164182    contains(QT_CONFIG, webkit) {
    165         executables.sources += anomaly.exe
    166         reg_resource.sources += $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/anomaly_reg.rsc
    167         resource.sources += $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/anomaly.rsc
    168         mifs.sources += \
    169             $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/anomaly.mif
     183        executables.sources += $$QT_BUILD_TREE/demos/embedded/anomaly/anomaly.exe
     184        reg_resource.sources += $$regResourceDir(demos/embedded/anomaly/anomaly_reg.rsc)
     185        resource.sources += $$appResourceDir(demos/embedded/anomaly/anomaly.rsc)
     186        mifs.sources += \
     187            $$appResourceDir(demos/embedded/anomaly/anomaly.mif)
    170188
    171189        isEmpty(QT_LIBINFIX) {
    … …  
    178196
    179197    contains(QT_CONFIG, phonon) {
    180         executables.sources += qmediaplayer.exe
    181         resource.sources += $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/qmediaplayer.rsc
    182         mifs.sources += \
    183             $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/qmediaplayer.mif
     198        executables.sources += $$QT_BUILD_TREE/demos/qmediaplayer/qmediaplayer.exe
     199        resource.sources += $$appResourceDir(demos/qmediaplayer/qmediaplayer.rsc)
     200        mifs.sources += \
     201            $$appResourceDir(demos/qmediaplayer/qmediaplayer.mif)
    184202    }
    185203
    186204    contains(QT_CONFIG, multimedia) {
    187         executables.sources += spectrum.exe fftreal.dll
    188         resource.sources += $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/spectrum.rsc
    189         mifs.sources += \
    190             $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/spectrum.mif
     205        executables.sources += $$QT_BUILD_TREE/demos/spectrum/app/spectrum.exe
     206        executables.sources += $$QT_BUILD_TREE/demos/spectrum/3rdparty/fftreal/fftreal.dll
     207        resource.sources += $$appResourceDir(demos/spectrum/app/spectrum.rsc)
     208        mifs.sources += \
     209            $$appResourceDir(demos/spectrum/app/spectrum.mif)
    191210    }
    192211
    193212    contains(QT_CONFIG, script) {
    194         executables.sources += context2d.exe
    195         reg_resource.sources += $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/context2d_reg.rsc
    196         resource.sources += $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/context2d.rsc
    197         mifs.sources += \
    198             $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/context2d.mif
     213        executables.sources += $$QT_BUILD_TREE/examples/script/context2d/context2d.exe
     214        reg_resource.sources += $$regResourceDir(examples/script/context2d/context2d_reg.rsc)
     215        resource.sources += $$appResourceDir(examples/script/context2d/context2d.rsc)
     216        mifs.sources += \
     217            $$appResourceDir(examples/script/context2d/context2d.mif)
     218    }
     219
     220    qmldemos = qmlcalculator qmlclocks qmldialcontrol qmleasing qmlflickr qmlphotoviewer qmltwitter
     221    contains(QT_CONFIG, declarative) {
     222        for(qmldemo, qmldemos) {
     223            executables.sources += $$QT_BUILD_TREE/demos/embedded/$${qmldemo}/$${qmldemo}.exe
     224            reg_resource.sources += $$regResourceDir(demos/embedded/$${qmldemo}/$${qmldemo}_reg.rsc)
     225            resource.sources += $$appResourceDir(demos/embedded/$${qmldemo}/$${qmldemo}.rsc)
     226            mifs.sources += $$appResourceDir(demos/embedded/$${qmldemo}/$${qmldemo}.mif)
     227        }
    199228    }
    200229
    … …  
    227256        mifs desktopservices_music desktopservices_images fluidbackup
    228257
     258    contains(QT_CONFIG, declarative):for(qmldemo, qmldemos):include($$QT_BUILD_TREE/demos/embedded/$${qmldemo}/deployment.pri)
     259
    229260    DEPLOYMENT.installer_header = 0xA000D7CD
    230261
Note: See TracChangeset for help on using the changeset viewer.