src/s60installs/s60installs.pro
changeset 22 79de32ba3296
parent 19 fcece45ef507
child 30 5dc02b23752f
equal deleted inserted replaced
19:fcece45ef507 22:79de32ba3296
    62         " "
    62         " "
    63 
    63 
    64 
    64 
    65     qtlibraries.pkg_prerules = vendorinfo
    65     qtlibraries.pkg_prerules = vendorinfo
    66     qtlibraries.pkg_prerules += "; Dependencies of Qt libraries"
    66     qtlibraries.pkg_prerules += "; Dependencies of Qt libraries"
    67 
    67     qtlibraries.pkg_prerules += "(0x20013851), 1, 5, 1, {\"PIPS Installer\"}"
    68     # Comment the following dependencies out because it is not needed in MCL
    68     contains(QT_CONFIG, openssl) | contains(QT_CONFIG, openssl-linked) {
    69     
    69         qtlibraries.pkg_prerules += "(0x200110CB), 1, 5, 1, {\"Open C LIBSSL Common\"}"
    70     #qtlibraries.pkg_prerules += "(0x20013851), 1, 5, 1, {\"PIPS Installer\"}"
    70     }
    71     #contains(QT_CONFIG, openssl) | contains(QT_CONFIG, openssl-linked) {
    71     contains(CONFIG, stl) {
    72     #    qtlibraries.pkg_prerules += "(0x200110CB), 1, 5, 1, {\"Open C LIBSSL Common\"}"
    72         qtlibraries.pkg_prerules += "(0x2000F866), 1, 0, 0, {\"Standard C++ Library Common\"}"
    73     #}
    73     }
    74     #contains(CONFIG, stl) {
    74     qtlibraries.pkg_prerules += "(0x2002af5f), 0, 5, 0, {\"sqlite3\"}"
    75     #    qtlibraries.pkg_prerules += "(0x2000F866), 1, 0, 0, {\"Standard C++ Library Common\"}"
       
    76     #}
       
    77     #qtlibraries.pkg_prerules += "(0x2002af5f), 0, 5, 0, {\"sqlite3\"}"
       
    78 
    75 
    79     !contains(QT_CONFIG, no-jpeg): imageformats_plugins.sources += qjpeg$${QT_LIBINFIX}.dll
    76     !contains(QT_CONFIG, no-jpeg): imageformats_plugins.sources += qjpeg$${QT_LIBINFIX}.dll
    80     !contains(QT_CONFIG, no-gif):  imageformats_plugins.sources += qgif$${QT_LIBINFIX}.dll
    77     !contains(QT_CONFIG, no-gif):  imageformats_plugins.sources += qgif$${QT_LIBINFIX}.dll
    81     !contains(QT_CONFIG, no-mng):  imageformats_plugins.sources += qmng$${QT_LIBINFIX}.dll
    78     !contains(QT_CONFIG, no-mng):  imageformats_plugins.sources += qmng$${QT_LIBINFIX}.dll
    82     !contains(QT_CONFIG, no-tiff): imageformats_plugins.sources += qtiff$${QT_LIBINFIX}.dll
    79     !contains(QT_CONFIG, no-tiff): imageformats_plugins.sources += qtiff$${QT_LIBINFIX}.dll