Changeset 769 for trunk/demos/embedded/fluidlauncher/fluidlauncher.pro
- Timestamp:
- Aug 2, 2010, 9:27:30 PM (15 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/vendor/nokia/qt/4.6.3 (added) merged: 768 /branches/vendor/nokia/qt/current merged: 767 /branches/vendor/nokia/qt/4.6.2 removed
- Property svn:mergeinfo changed
-
trunk/demos/embedded/fluidlauncher/fluidlauncher.pro
r651 r769 98 98 contains(QT_CONFIG, phonon) { 99 99 reg_resource.sources += $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/qmediaplayer_reg.rsc 100 } 101 102 contains(QT_CONFIG, multimedia) { 103 reg_resource.sources += $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/spectrum_reg.rsc 100 104 } 101 105 … … 165 169 $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/anomaly.mif 166 170 167 # Since Fluidlauncher itself doesn't link webkit, we won't get dependency automatically 168 executables.pkg_prerules += \ 169 "; Dependency to Qt Webkit" \ 170 "(0x200267C2), $${QT_MAJOR_VERSION}, $${QT_MINOR_VERSION}, $${QT_PATCH_VERSION}, {\"QtWebKit\"}" 171 isEmpty(QT_LIBINFIX) { 172 # Since Fluidlauncher itself doesn't link webkit, we won't get dependency automatically 173 executables.pkg_prerules += \ 174 "; Dependency to Qt Webkit" \ 175 "(0x200267C2), $${QT_MAJOR_VERSION}, $${QT_MINOR_VERSION}, $${QT_PATCH_VERSION}, {\"QtWebKit\"}" 176 } 171 177 } 172 178 … … 176 182 mifs.sources += \ 177 183 $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/qmediaplayer.mif 184 } 185 186 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 178 191 } 179 192
Note:
See TracChangeset
for help on using the changeset viewer.