1 files changed, 101 insertions, 31 deletions
diff --git a/patches/0008-Moved-symbianpkgrules-profiles-to-be-feature-profile.patch b/patches/0008-Moved-symbianpkgrules-profiles-to-be-feature-profile.patch
index d527fb2..1462df5 100644
--- a/patches/0008-Moved-symbianpkgrules-profiles-to-be-feature-profile.patch
+++ b/patches/0008-Moved-symbianpkgrules-profiles-to-be-feature-profile.patch
@@ -1,46 +1,116 @@
-From 56b58823a3b39eb30652a1339b3deee32bb2d29e Mon Sep 17 00:00:00 2001
+From 33756c1d5fa770eb7e00e7301e9296cff4a93bd8 Mon Sep 17 00:00:00 2001
 From: axis <qt-info@nokia.com>
 Date: Tue, 16 Nov 2010 14:31:27 +0100
 Subject: [PATCH] Moved symbianpkgrules profiles to be feature profiles.
 
 ---
- .../features/symbian/qt_demo.prf}                  |    2 --
- .../features/symbian/qt_example.prf}               |    3 ---
- 2 files changed, 0 insertions(+), 5 deletions(-)
- rename qtbase/{demos/symbianpkgrules.pri => mkspecs/features/symbian/qt_demo.prf} (88%)
- rename qtbase/{examples/symbianpkgrules.pri => mkspecs/features/symbian/qt_example.prf} (88%)
+ qtbase/demos/symbianpkgrules.pri               |   19 -------------------
+ qtbase/examples/symbianpkgrules.pri            |   20 --------------------
+ qtbase/mkspecs/features/symbian/qt_demo.prf    |   17 +++++++++++++++++
+ qtbase/mkspecs/features/symbian/qt_example.prf |   17 +++++++++++++++++
+ 4 files changed, 34 insertions(+), 39 deletions(-)
+ delete mode 100644 qtbase/demos/symbianpkgrules.pri
+ delete mode 100644 qtbase/examples/symbianpkgrules.pri
+ create mode 100644 qtbase/mkspecs/features/symbian/qt_demo.prf
+ create mode 100644 qtbase/mkspecs/features/symbian/qt_example.prf
 
-diff --git a/qtbase/demos/symbianpkgrules.pri b/qtbase/mkspecs/features/symbian/qt_demo.prf
-similarity index 88%
-rename from qtbase/demos/symbianpkgrules.pri
-rename to qtbase/mkspecs/features/symbian/qt_demo.prf
-index ef6dfd8..9c4d96c 100644
+diff --git a/qtbase/demos/symbianpkgrules.pri b/qtbase/demos/symbianpkgrules.pri
+deleted file mode 100644
+index ef6dfd8..0000000
 --- a/qtbase/demos/symbianpkgrules.pri
-+++ b/qtbase/mkspecs/features/symbian/qt_demo.prf
-@@ -1,5 +1,3 @@
++++ /dev/null
+@@ -1,19 +0,0 @@
 -!symbian: error(Only include this file for Symbian platforms)
 -
- RSS_RULES ="group_name=\"QtDemos\";"
- 
- nokiaVendor = "Nokia, Qt"
-diff --git a/qtbase/examples/symbianpkgrules.pri b/qtbase/mkspecs/features/symbian/qt_example.prf
-similarity index 88%
-rename from qtbase/examples/symbianpkgrules.pri
-rename to qtbase/mkspecs/features/symbian/qt_example.prf
-index fe9b487..8c523fb 100644
+-RSS_RULES ="group_name=\"QtDemos\";"
+-
+-nokiaVendor = "Nokia, Qt"
+-vendorinfo = \
+-    "; Localised Vendor name" \
+-    "%{$$addLanguageDependentPkgItem(nokiaVendor)}" \
+-    " " \
+-    "; Unique Vendor name" \
+-    ":\"$$nokiaVendor\"" \
+-    " "
+-
+-demos_deployment.pkg_prerules += vendorinfo
+-DEPLOYMENT += demos_deployment
+-
+-isEmpty(ICON):contains(TEMPLATE, ".*app"):contains(QT, gui):contains(CONFIG, qt):!contains(CONFIG, "no_icon") {
+-    ICON = $$QT_SOURCE_TREE/src/s60installs/qt.svg
+-}
+diff --git a/qtbase/examples/symbianpkgrules.pri b/qtbase/examples/symbianpkgrules.pri
+deleted file mode 100644
+index fe9b487..0000000
 --- a/qtbase/examples/symbianpkgrules.pri
-+++ b/qtbase/mkspecs/features/symbian/qt_example.prf
-@@ -1,5 +1,3 @@
++++ /dev/null
+@@ -1,20 +0,0 @@
 -!symbian: error(Only include this file for Symbian platforms)
 -
- RSS_RULES ="group_name=\"QtExamples\";"
- 
- nokiaVendor = "Nokia, Qt"
-@@ -17,4 +15,3 @@ DEPLOYMENT += examples_deployment
- isEmpty(ICON):contains(TEMPLATE, ".*app"):contains(QT, gui):contains(CONFIG, qt):!contains(CONFIG, "no_icon") {
-     ICON = $$QT_SOURCE_TREE/src/s60installs/qt.svg
- }
+-RSS_RULES ="group_name=\"QtExamples\";"
 -
+-nokiaVendor = "Nokia, Qt"
+-vendorinfo = \
+-    "; Localised Vendor name" \
+-    "%{$$addLanguageDependentPkgItem(nokiaVendor)}" \
+-    " " \
+-    "; Unique Vendor name" \
+-    ":\"$$nokiaVendor\"" \
+-    " "
+-
+-examples_deployment.pkg_prerules += vendorinfo
+-DEPLOYMENT += examples_deployment
+-
+-isEmpty(ICON):contains(TEMPLATE, ".*app"):contains(QT, gui):contains(CONFIG, qt):!contains(CONFIG, "no_icon") {
+-    ICON = $$QT_SOURCE_TREE/src/s60installs/qt.svg
+-}
+-
+diff --git a/qtbase/mkspecs/features/symbian/qt_demo.prf b/qtbase/mkspecs/features/symbian/qt_demo.prf
+new file mode 100644
+index 0000000..9c4d96c
+--- /dev/null
++++ b/qtbase/mkspecs/features/symbian/qt_demo.prf
+@@ -0,0 +1,17 @@
++RSS_RULES ="group_name=\"QtDemos\";"
++
++nokiaVendor = "Nokia, Qt"
++vendorinfo = \
++    "; Localised Vendor name" \
++    "%{$$addLanguageDependentPkgItem(nokiaVendor)}" \
++    " " \
++    "; Unique Vendor name" \
++    ":\"$$nokiaVendor\"" \
++    " "
++
++demos_deployment.pkg_prerules += vendorinfo
++DEPLOYMENT += demos_deployment
++
++isEmpty(ICON):contains(TEMPLATE, ".*app"):contains(QT, gui):contains(CONFIG, qt):!contains(CONFIG, "no_icon") {
++    ICON = $$QT_SOURCE_TREE/src/s60installs/qt.svg
++}
+diff --git a/qtbase/mkspecs/features/symbian/qt_example.prf b/qtbase/mkspecs/features/symbian/qt_example.prf
+new file mode 100644
+index 0000000..8c523fb
+--- /dev/null
++++ b/qtbase/mkspecs/features/symbian/qt_example.prf
+@@ -0,0 +1,17 @@
++RSS_RULES ="group_name=\"QtExamples\";"
++
++nokiaVendor = "Nokia, Qt"
++vendorinfo = \
++    "; Localised Vendor name" \
++    "%{$$addLanguageDependentPkgItem(nokiaVendor)}" \
++    " " \
++    "; Unique Vendor name" \
++    ":\"$$nokiaVendor\"" \
++    " "
++
++examples_deployment.pkg_prerules += vendorinfo
++DEPLOYMENT += examples_deployment
++
++isEmpty(ICON):contains(TEMPLATE, ".*app"):contains(QT, gui):contains(CONFIG, qt):!contains(CONFIG, "no_icon") {
++    ICON = $$QT_SOURCE_TREE/src/s60installs/qt.svg
++}
 -- 
-1.7.3.2.343.g7d43d
+1.7.3.4