From a3ef6e080980e242dd7703c48a628ad821549991 Mon Sep 17 00:00:00 2001
From: Janne Anttila <janne.anttila@digia.com>
Date: Mon, 5 Oct 2009 12:36:32 +0300
Subject: Changed Qt package name in pkg and generated sis files for Symbian.

It was decided on weekly telco that Symbian pkg and sis files can use
plain Qt name, since it is already clear that user is installing
"Qt for Symbian" version of Qt.

Task-number: QT-772
Reviewed-by: Miikka Heikkinen
---
 mkspecs/features/symbian/qt.prf |  8 ++++----
 src/s60installs/s60installs.pro | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/mkspecs/features/symbian/qt.prf b/mkspecs/features/symbian/qt.prf
index 3b24355..0f5b08b 100644
--- a/mkspecs/features/symbian/qt.prf
+++ b/mkspecs/features/symbian/qt.prf
@@ -21,13 +21,13 @@ load(qt)
 #
 INCLUDEPATH = $$PREPEND_INCLUDEPATH $$INCLUDEPATH
 
-# Add dependency to QtLibs package to all other projects besides QtLibs.
-# Note: QtLibs with full capabilities has UID3 of 0x2001E61C, 
-#       while self-signed version typically has temporary UID3 of 0xE001E61C. 
+# Add dependency to Qt package to all other projects besides Qt libs.
+# Note: Qt libs with full capabilities has UID3 of 0x2001E61C,
+#       while self-signed version typically has temporary UID3 of 0xE001E61C.
 contains(CONFIG, qt):!contains(TARGET.UID3, 0x2001E61C):!contains(TARGET.UID3, 0xE001E61C) {
     default_deployment.pkg_prerules += \
         "; Default dependency to Qt libraries" \
-        "(0x2001E61C), $${QT_MAJOR_VERSION}, $${QT_MINOR_VERSION}, $${QT_PATCH_VERSION},  {\"QtLibs pre-release\"}"
+        "(0x2001E61C), $${QT_MAJOR_VERSION}, $${QT_MINOR_VERSION}, $${QT_PATCH_VERSION},  {\"Qt\"}"
 }
 
 isEmpty(TARGET.EPOCSTACKSIZE):TARGET.EPOCSTACKSIZE = 0x14000
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro
index d21c524..3aef05e 100644
--- a/src/s60installs/s60installs.pro
+++ b/src/s60installs/s60installs.pro
@@ -7,7 +7,7 @@ symbian: {
     SUBDIRS=
     # WARNING: Changing TARGET name will break Symbian SISX upgrade functionality
     # DO NOT TOUCH TARGET VARIABLE IF YOU ARE NOT SURE WHAT YOU ARE DOING
-    TARGET = "Qt for S60"
+    TARGET = "Qt"
     TARGET.UID3 = 0x2001E61C
     VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
 
@@ -29,12 +29,12 @@ symbian: {
         "ELSEIF package(0x102752AE)" \
         "   \"$${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET)/qts60plugin_3_2.dll\" - \"!:\\sys\\bin\\qts60plugin_3_2.dll\"" \
         "ELSEIF package(0x102032BE)" \
-        "   \"$${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET)/qts60plugin_3_1.dll\" - \"!:\\sys\\bin\\qts60plugin_3_1.dll\"" \        
-        "ELSE" \    
+        "   \"$${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET)/qts60plugin_3_1.dll\" - \"!:\\sys\\bin\\qts60plugin_3_1.dll\"" \
+        "ELSE" \
         "   \"$${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET)/qts60plugin_5_0.dll\" - \"!:\\sys\\bin\\qts60plugin_5_0.dll\"" \
-        "ENDIF"     
-    qtlibraries.pkg_postrules += qts60plugindeployment        
-        
+        "ENDIF"
+    qtlibraries.pkg_postrules += qts60plugindeployment
+
     sqlitedeployment = \
         "; EXISTS statement does not resolve !. Lets check the most common drives" \
         "IF NOT EXISTS(\"c:\\sys\\bin\\sqlite3.dll\") AND NOT EXISTS(\"e:\\sys\\bin\\sqlite3.dll\") AND NOT EXISTS(\"z:\\sys\\bin\\sqlite3.dll\")" \
-- 
cgit v0.12