Changeset 846 for trunk/demos/symbianpkgrules.pri

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• demos/symbianpkgrules.pri (modified) (2 diffs)

trunk/demos/symbianpkgrules.pri

@@ -3 +3 @@
 RSS_RULES ="group_name=\"QtDemos\";"
 
+
 vendorinfo = \
     "; Localised Vendor name" \
-    "%{\"Nokia, Qt\"}" \
+    "%{}" \
     " " \
     "; Unique Vendor name" \
-    ":\"Nokia, Qt\"" \
+    ":\"\"" \
     " "
 
@@ -14 +15 @@
 DEPLOYMENT += demos_deployment
 
-isEmpty(ICON):ICON = $$QT_SOURCE_TREE/src/s60installs/qt.svg
+isEmpty(ICON):contains(TEMPLATE, ".*app"):contains(QT, gui):contains(CONFIG, qt):!contains(CONFIG, "no_icon") {
+    ICON = $$QT_SOURCE_TREE/src/s60installs/qt.svg
+}