Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Changed various DEPLOYMENT variable ".sources" suffixes to ".files"

5 files changed, 8 insertions, 8 deletions

diff --git a/mkspecs/features/symbian/default_post.prf b/mkspecs/features/symbian/default_post.prf
index ec6ecd0..a2ac377 100644
--- a/mkspecs/features/symbian/default_post.prf
+++ b/mkspecs/features/symbian/default_post.prf
@@ -10,11 +10,11 @@ contains(TEMPLATE, ".*app") {
     }
 
     contains(DESTDIR, "/.*") {
-        default_bin_deployment.sources += $$DESTDIR/$$symbianRemoveSpecialCharacters($$basename(TARGET)).exe
+        default_bin_deployment.files += $$DESTDIR/$$symbianRemoveSpecialCharacters($$basename(TARGET)).exe
     } else:isEmpty(DESTDIR) {
-        default_bin_deployment.sources += $$OUT_PWD/$$symbianRemoveSpecialCharacters($$basename(TARGET)).exe
+        default_bin_deployment.files += $$OUT_PWD/$$symbianRemoveSpecialCharacters($$basename(TARGET)).exe
     } else {
-        default_bin_deployment.sources += $$OUT_PWD/$$DESTDIR/$$symbianRemoveSpecialCharacters($$basename(TARGET)).exe
+        default_bin_deployment.files += $$OUT_PWD/$$DESTDIR/$$symbianRemoveSpecialCharacters($$basename(TARGET)).exe
     }
     default_bin_deployment.path += /sys/bin
 
diff --git a/qmake/generators/symbian/symbiancommon.cpp b/qmake/generators/symbian/symbiancommon.cpp
index 602bcc2..01a59b0 100644
--- a/qmake/generators/symbian/symbiancommon.cpp
+++ b/qmake/generators/symbian/symbiancommon.cpp
@@ -408,8 +408,8 @@ void SymbianCommonGenerator::generatePkgFile(const QString &iconFile,
     // ### FIXME: remove epocBuild check once makefile based mkspecs support localized resource generation
     if (epocBuild && symbianLocalizationList.size()) {
         // Add localized resources to DEPLOYMENT if default resource deployment is done
-        addLocalizedResourcesToDeployment("default_resource_deployment.sources", symbianLocalizationList);
-        addLocalizedResourcesToDeployment("default_reg_deployment.sources", symbianLocalizationList);
+        addLocalizedResourcesToDeployment("default_resource_deployment.files", symbianLocalizationList);
+        addLocalizedResourcesToDeployment("default_reg_deployment.files", symbianLocalizationList);
     }
 
     // deploy files specified by DEPLOYMENT variable
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro
index fc364bc..0710b53 100644
--- a/src/s60installs/s60installs.pro
+++ b/src/s60installs/s60installs.pro
@@ -88,7 +88,7 @@ symbian: {
     }
 
     !contains(S60_VERSION, 3.1):!contains(S60_VERSION, 3.2) {
-        feedback_plugin.sources = $$QT_BUILD_TREE/plugins/s60/feedback/qtactilefeedback$${QT_LIBINFIX}.dll
+        feedback_plugin.files = $$QT_BUILD_TREE/plugins/s60/feedback/qtactilefeedback$${QT_LIBINFIX}.dll
         feedback_plugin.path = c:$$QT_PLUGINS_BASE_DIR/feedback
         DEPLOYMENT += feedback_plugin
     }
diff --git a/tests/benchmarks/script/sunspider/sunspider.pro b/tests/benchmarks/script/sunspider/sunspider.pro
index 431505b..aab4cdb 100644
--- a/tests/benchmarks/script/sunspider/sunspider.pro
+++ b/tests/benchmarks/script/sunspider/sunspider.pro
@@ -9,7 +9,7 @@ QT = core script
 !symbian:DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 wince*|symbian: {
-testFiles.sources = tests
+testFiles.files = tests
 testFiles.path = .
 DEPLOYMENT += testFiles
 }
diff --git a/tests/benchmarks/script/v8/v8.pro b/tests/benchmarks/script/v8/v8.pro
index e55fd7f..f36bda5 100644
--- a/tests/benchmarks/script/v8/v8.pro
+++ b/tests/benchmarks/script/v8/v8.pro
@@ -9,7 +9,7 @@ QT = core script
 !symbian:DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 wince*|symbian: {
-testFiles.sources = tests
+testFiles.files = tests
 testFiles.path = .
 DEPLOYMENT += testFiles
 }