diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-10-08 09:58:41 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-10-08 12:16:49 (GMT) |
| commit | f8596b2269631b9522e51bb0a68d86588d4696c7 (patch) | |
| tree | bb2457f515a44e3a51a2346999eafd8025903488 /mkspecs/features/symbian | |
| parent | 269821d9a1eda2893f84fdeff76edef576f9847d (diff) | |
| download | Qt-f8596b2269631b9522e51bb0a68d86588d4696c7.zip Qt-f8596b2269631b9522e51bb0a68d86588d4696c7.tar.gz Qt-f8596b2269631b9522e51bb0a68d86588d4696c7.tar.bz2 | |
Align .pro with qmake: s/\.sources/.files/.
Complement previous commit by aligning Qt itself to use .files
consistently for DEPLOYMENT as well as INSTALLS.
This excludes changes to webkit.
Task-number: QTBUG-3216
Reviewed-by: axis
Diffstat (limited to 'mkspecs/features/symbian')
| -rw-r--r-- | mkspecs/features/symbian/application_icon.prf | 6 | ||||
| -rw-r--r-- | mkspecs/features/symbian/data_caging_paths.prf | 4 | ||||
| -rw-r--r-- | mkspecs/features/symbian/default_post.prf | 2 | ||||
| -rw-r--r-- | mkspecs/features/symbian/run_on_phone.prf | 3 | ||||
| -rw-r--r-- | mkspecs/features/symbian/sis_targets.prf | 3 |
5 files changed, 10 insertions, 8 deletions
diff --git a/mkspecs/features/symbian/application_icon.prf b/mkspecs/features/symbian/application_icon.prf index 2948811..f43ec3d 100644 --- a/mkspecs/features/symbian/application_icon.prf +++ b/mkspecs/features/symbian/application_icon.prf @@ -23,9 +23,9 @@ contains(CONFIG, no_icon) { regZDir = $$resourceZDir } - default_resource_deployment.sources += $$resourceZDir/$${baseTarget}.rsc + default_resource_deployment.files += $$resourceZDir/$${baseTarget}.rsc default_resource_deployment.path = $$APP_RESOURCE_DIR - default_reg_deployment.sources += $$regZDir/$${baseTarget}_reg.rsc + default_reg_deployment.files += $$regZDir/$${baseTarget}_reg.rsc default_reg_deployment.path = $$REG_RESOURCE_IMPORT_DIR !isEmpty(ICON) { @@ -70,7 +70,7 @@ contains(CONFIG, no_icon) { RSS_RULES.number_of_icons = $$size(ICON_backslashed) RSS_RULES.icon_file = $$APP_RESOURCE_DIR/$${baseTarget}.mif - default_resource_deployment.sources += $$resourceZDir/$${baseTarget}.mif + default_resource_deployment.files += $$resourceZDir/$${baseTarget}.mif } } diff --git a/mkspecs/features/symbian/data_caging_paths.prf b/mkspecs/features/symbian/data_caging_paths.prf index 2f03128..7f5420c 100644 --- a/mkspecs/features/symbian/data_caging_paths.prf +++ b/mkspecs/features/symbian/data_caging_paths.prf @@ -13,7 +13,7 @@ # # # These variables are mostly useful when specifying deployment # -# myLib.sources = myLib.dll +# myLib.files = myLib.dll # myLib.path = $$SHARED_LIB_DIR # DEPLOYMENT += myLib # @@ -21,7 +21,7 @@ # # $$QT_PUBLIC_PLUGINS_BASE specifies the public base directory for Qt # # plugin stubs: # -# myPublicImageFormatPlugin.sources = myImageFormat.dll +# myPublicImageFormatPlugin.files = myImageFormat.dll # myPublicImageFormatPlugin.path = $$QT_PLUGINS_BASE_DIR/imageformats # DEPLOYMENT += myPublicImageFormatPlugin # diff --git a/mkspecs/features/symbian/default_post.prf b/mkspecs/features/symbian/default_post.prf index a9b6d0e..548fd51 100644 --- a/mkspecs/features/symbian/default_post.prf +++ b/mkspecs/features/symbian/default_post.prf @@ -10,7 +10,7 @@ contains(TEMPLATE, ".*app") { QMAKE_LIBS += $$QMAKE_LIBS_QT_ENTRY } - default_bin_deployment.sources += $$symbianRemoveSpecialCharacters($$basename(TARGET)).exe + default_bin_deployment.files += $$symbianRemoveSpecialCharacters($$basename(TARGET)).exe default_bin_deployment.path += /sys/bin load(application_icon.prf) diff --git a/mkspecs/features/symbian/run_on_phone.prf b/mkspecs/features/symbian/run_on_phone.prf index d845277..ba88a66 100644 --- a/mkspecs/features/symbian/run_on_phone.prf +++ b/mkspecs/features/symbian/run_on_phone.prf @@ -5,7 +5,8 @@ GENERATE_RUN_TARGETS = false contains(TEMPLATE, app): GENERATE_RUN_TARGETS = true else:!equals(DEPLOYMENT, default_deployment) { for(dep_item, $$list($$DEPLOYMENT)) { - dep_item_sources = $$eval($${dep_item}.sources) + ### Qt 5: remove .sources, inconsistent with INSTALLS + dep_item_sources = $$eval($${dep_item}.files) $$eval($${dep_item}.sources) !isEmpty(dep_item_sources): GENERATE_RUN_TARGETS = true } } diff --git a/mkspecs/features/symbian/sis_targets.prf b/mkspecs/features/symbian/sis_targets.prf index e838e10..e5a33cb 100644 --- a/mkspecs/features/symbian/sis_targets.prf +++ b/mkspecs/features/symbian/sis_targets.prf @@ -4,7 +4,8 @@ GENERATE_SIS_TARGETS = false contains(TEMPLATE, app): GENERATE_SIS_TARGETS = true else:!equals(DEPLOYMENT, default_deployment) { for(dep_item, $$list($$DEPLOYMENT)) { - dep_item_sources = $$eval($${dep_item}.sources) + ### Qt 5: remove .sources, inconsistent with INSTALLS + dep_item_sources = $$eval($${dep_item}.files) $$eval($${dep_item}.sources) !isEmpty(dep_item_sources): GENERATE_SIS_TARGETS = true } } |