From 5c2d700cb134b34dbfb5b92e33ab86d1f6b03125 Mon Sep 17 00:00:00 2001
From: Tim Jenssen <tim.jenssen@digia.com>
Date: Tue, 19 Feb 2013 20:18:01 +0100
Subject: Make Virtual and Default tag mutually exclusive.

Call m_vars value function directly.
1; To prevent recursive calls in case of key "Default".
2; To avoid the extra function call to fetch values from m_vars in
   case of other values set in the object.

Change-Id: I8f40b53704d1f314071d7060d0c92829310c262d
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Reviewed-by: Niels Weber <niels.weber@digia.com>
---
 .../com.nokia.testapp.subcomponent.virtual/meta/installscript.qs     | 5 -----
 .../packages/com.nokia.testapp.subcomponent.virtual/meta/package.xml | 1 -
 2 files changed, 6 deletions(-)

(limited to 'examples')

diff --git a/examples/testapp/packages/com.nokia.testapp.subcomponent.virtual/meta/installscript.qs b/examples/testapp/packages/com.nokia.testapp.subcomponent.virtual/meta/installscript.qs
index 4ccf7a047..7907a268a 100644
--- a/examples/testapp/packages/com.nokia.testapp.subcomponent.virtual/meta/installscript.qs
+++ b/examples/testapp/packages/com.nokia.testapp.subcomponent.virtual/meta/installscript.qs
@@ -2,8 +2,3 @@
 function Component()
 {
 }
-
-Component.prototype.isDefault = function()
-{
-    return true;
-}
diff --git a/examples/testapp/packages/com.nokia.testapp.subcomponent.virtual/meta/package.xml b/examples/testapp/packages/com.nokia.testapp.subcomponent.virtual/meta/package.xml
index 3da78f49d..d60cf21f4 100644
--- a/examples/testapp/packages/com.nokia.testapp.subcomponent.virtual/meta/package.xml
+++ b/examples/testapp/packages/com.nokia.testapp.subcomponent.virtual/meta/package.xml
@@ -6,5 +6,4 @@
     <Name>com.nokia.testapp.subcomponent.virtual</Name>
     <Virtual>true</Virtual>
     <Script>installscript.qs</Script>
-    <Default>script</Default>
 </Package>
-- 
cgit v1.2.3