summaryrefslogtreecommitdiffstats
path: root/examples/testapp
diff options
context:
space:
mode:
authorTim Jenssen <tim.jenssen@digia.com>2013-02-19 20:18:01 +0100
committerKarsten Heimrich <karsten.heimrich@digia.com>2013-02-20 11:17:42 +0100
commit5c2d700cb134b34dbfb5b92e33ab86d1f6b03125 (patch)
tree4266cd94e3f185985ec9c048a9ab6b65e2a6bb53 /examples/testapp
parent5d9b4fe6360e261b40e54e1acbba55a921414e22 (diff)
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>
Diffstat (limited to 'examples/testapp')
-rw-r--r--examples/testapp/packages/com.nokia.testapp.subcomponent.virtual/meta/installscript.qs5
-rw-r--r--examples/testapp/packages/com.nokia.testapp.subcomponent.virtual/meta/package.xml1
2 files changed, 0 insertions, 6 deletions
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>