diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2009-07-22 11:58:34 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2009-07-22 11:58:34 (GMT) |
| commit | b0c5020c11913ad1de442ab0ef7e10dec225aec1 (patch) | |
| tree | 6cbfe6c69f7616680d4329dd8517303ce8e653f7 | |
| parent | 656127dcbf2f5d08979872debf98a1d119399627 (diff) | |
| download | Qt-b0c5020c11913ad1de442ab0ef7e10dec225aec1.zip Qt-b0c5020c11913ad1de442ab0ef7e10dec225aec1.tar.gz Qt-b0c5020c11913ad1de442ab0ef7e10dec225aec1.tar.bz2 | |
Fixed fluidlauncher deployment when webkit is not build.
FluidLauncher used deployment statements to deploy anomaly browser
always. This crated the Symbian .pkg files with those files. Since the
dependencies were not built, the makesis failed.
| -rw-r--r-- | demos/embedded/fluidlauncher/fluidlauncher.pro | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/demos/embedded/fluidlauncher/fluidlauncher.pro b/demos/embedded/fluidlauncher/fluidlauncher.pro index 11d8a8c..0d83945 100644 --- a/demos/embedded/fluidlauncher/fluidlauncher.pro +++ b/demos/embedded/fluidlauncher/fluidlauncher.pro @@ -72,8 +72,10 @@ symbian { desktopservices.exe \ fridgemagnets.exe \ drilldown.exe \ - softkeys.exe \ - anomaly.exe + softkeys.exe + contains(QT_CONFIG, webkit) { + executables.sources += anomaly.exe + } executables.path = /sys/bin @@ -89,12 +91,13 @@ symbian { $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/desktopservices_reg.rsc \ $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/fridgemagnets_reg.rsc \ $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/drilldown_reg.rsc \ - $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/softkeys_reg.rsc \ - $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/anomaly_reg.rsc + $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/softkeys_reg.rsc + contains(QT_CONFIG, webkit) { + reg_resource.sources += $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/anomaly_reg.rsc + } reg_resource.path = $$REG_RESOURCE_IMPORT_DIR - resource.sources = \ $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/embeddedsvgviewer.rsc \ $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/styledemo.rsc \ @@ -107,8 +110,10 @@ symbian { $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/desktopservices.rsc \ $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/fridgemagnets.rsc \ $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/drilldown.rsc \ - $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/softkeys.rsc \ - $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/anomaly.rsc + $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/softkeys.rsc + contains(QT_CONFIG, webkit) { + resource.sources += $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/anomaly.rsc + } resource.path = $$APP_RESOURCE_DIR |