summaryrefslogtreecommitdiffstats
path: root/config.profiles/symbian
diff options
context:
space:
mode:
authorGuoqing Zhang <guoqing.zhang@nokia.com>2011-04-05 11:29:44 (GMT)
committerGuoqing Zhang <guoqing.zhang@nokia.com>2011-04-05 11:29:44 (GMT)
commitbb5bf52e3d8660ee15aec9e959730e265b81eda4 (patch)
tree548df7f6c522ae077d6b3313456042b3e3922a4c /config.profiles/symbian
parent8a72b97df7cec679a82d6aa93307350fe03cc145 (diff)
parentc3e903409b96fede96cb4a7b95ba308663c88879 (diff)
downloadQt-bb5bf52e3d8660ee15aec9e959730e265b81eda4.zip
Qt-bb5bf52e3d8660ee15aec9e959730e265b81eda4.tar.gz
Qt-bb5bf52e3d8660ee15aec9e959730e265b81eda4.tar.bz2
Merge remote branch 'qt-master/master'
Diffstat (limited to 'config.profiles/symbian')
-rw-r--r--config.profiles/symbian/layers.sysdef.xml6
-rw-r--r--config.profiles/symbian/package_definition.xml14
2 files changed, 0 insertions, 20 deletions
diff --git a/config.profiles/symbian/layers.sysdef.xml b/config.profiles/symbian/layers.sysdef.xml
index 4c1b6f9..19d8662 100644
--- a/config.profiles/symbian/layers.sysdef.xml
+++ b/config.profiles/symbian/layers.sysdef.xml
@@ -30,12 +30,6 @@
<module name="qtexamples">
<unit unitID="qtdo.qt.examples" mrp="" bldFile="&layer_real_source_path;/examples" name="qtexamples" proFile="examples.pro" qmakeArgs="-r" filter="qtexamples"/>
</module>
- <module name="qttestsauto">
- <unit unitID="qtdo.qt.testsauto" mrp="" bldFile="&layer_real_source_path;/tests/auto" name="qttestsauto" proFile="qtpauto.pro" qmakeArgs="-r" filter="qttestsauto"/>
- </module>
- <module name="qttestsbenchmarks">
- <unit unitID="qtdo.qt.testsbenchmarks" mrp="" bldFile="&layer_real_source_path;/tests/benchmarks" name="qttestsbenchmarks" proFile="benchmarks.pro" qmakeArgs="-r" filter="qttestsbenchmarks"/>
- </module>
</layer>
</systemModel>
</SystemDefinition>
diff --git a/config.profiles/symbian/package_definition.xml b/config.profiles/symbian/package_definition.xml
index 1c3c1d3..bfca907 100644
--- a/config.profiles/symbian/package_definition.xml
+++ b/config.profiles/symbian/package_definition.xml
@@ -36,19 +36,5 @@
<unit bldFile="examples" qt:proFile="examples.pro"/>
</component>
</collection>
- <collection id="qt_tests" name="Qt Tests" level="app">
- <component id="qttestsauto" name="Qt Automated Tests" introduced="^2" filter="s60,qttestsauto,test,build_as_app">
- <meta rel="qttestsauto">
- <group name="qtdemos"/>
- </meta>
- <unit bldFile="tests/auto" qt:proFile="qtpauto.pro"/>
- </component>
- <component id="qttestsbenchmarks" name="Qt Benchmarks Tests" introduced="^2" filter="s60,qttestsbenchmarks,test,build_as_app">
- <meta rel="testbuild">
- <group name="qttestsbenchmarks"/>
- </meta>
- <unit bldFile="tests/benchmarks" qt:proFile="benchmarks.pro"/>
- </component>
- </collection>
</package>
</SystemDefinition>