From 822151edc065dc89ed331e91e02fb8014ef3ecee Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Thu, 3 Feb 2011 15:33:41 +0200
Subject: Remove dependencies to pre-Symbian3 platforms from Symbian3 packages

Qt applications built against Symbian3 SDK will not run on older
devices, so remove the platform dependency to those devices so that
the user will get a proper warning if he tries to install incompatible
software to an older device.

Task-number: QTBUG-17187
Reviewed-by: Janne Koskinen
---
 mkspecs/features/symbian/default_post.prf | 14 ++++++++------
 src/s60installs/s60installs.pro           |  8 +-------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/mkspecs/features/symbian/default_post.prf b/mkspecs/features/symbian/default_post.prf
index ec6ecd0..126981e 100644
--- a/mkspecs/features/symbian/default_post.prf
+++ b/mkspecs/features/symbian/default_post.prf
@@ -53,14 +53,16 @@ isEmpty(TARGET.UID2) {
     }
 }
 
-# Supports S60 3.1, 3.2, 5.0, Symbian^3, and Symbian^4 by default
+# Supports Symbian^3 and Symbian^4 by default and also S60 3.1, 3.2, and 5.0 if built against any of those.
 platform_product_id = S60ProductID
 platform_product_id = $$addLanguageDependentPkgItem(platform_product_id)
 pkg_platform_dependencies = \
     "; Default HW/platform dependencies" \
-    "[0x102032BE],0,0,0,{$$platform_product_id}" \
-    "[0x102752AE],0,0,0,{$$platform_product_id}" \
-    "[0x1028315F],0,0,0,{$$platform_product_id}" \
     "[0x20022E6D],0,0,0,{$$platform_product_id}" \
-    "[0x20032DE7],0,0,0,{$$platform_product_id}" \
-    " "
+    "[0x20032DE7],0,0,0,{$$platform_product_id}"
+contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) {
+    pkg_platform_dependencies += \
+        "[0x102032BE],0,0,0,{$$platform_product_id}" \
+        "[0x102752AE],0,0,0,{$$platform_product_id}" \
+        "[0x1028315F],0,0,0,{$$platform_product_id}"
+}
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro
index 5c89338..c282b1e 100644
--- a/src/s60installs/s60installs.pro
+++ b/src/s60installs/s60installs.pro
@@ -77,19 +77,13 @@ symbian: {
             "ENDIF" \
             "   \"$$bearerStubZ\" - \"c:$$replace(QT_PLUGINS_BASE_DIR,/,\\)\\bearer\\qsymbianbearer$${QT_LIBINFIX}.qtplugin\"
     } else {
-        # Restrict deployment to Symbian3 and later platforms
-        default_deployment.pkg_prerules -= pkg_platform_dependencies
-        platform_dependency_rules.pkg_prerules = \
-            "[0x20022E6D],0,0,0,{\"S60ProductID\"}" \
-            "[0x20032DE7],0,0,0,{\"S60ProductID\"}"
-
         # No need to deploy plugins for older platform versions when building on Symbian3 or later
         qts60plugindeployment = \
             "   \"$$pluginLocations/qts60plugin_5_0$${QT_LIBINFIX}.dll\" - \"c:\\sys\\bin\\qts60plugin_5_0$${QT_LIBINFIX}.dll\""
 
         bearer_plugin.sources = $$QT_BUILD_TREE/plugins/bearer/qsymbianbearer$${QT_LIBINFIX}.dll
         bearer_plugin.path = c:$$QT_PLUGINS_BASE_DIR/bearer
-        DEPLOYMENT += bearer_plugin platform_dependency_rules
+        DEPLOYMENT += bearer_plugin
     }
 
     qtlibraries.pkg_postrules += qts60plugindeployment
-- 
cgit v0.12