diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-25 00:56:02 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-25 00:56:02 (GMT) |
| commit | a4b3fb256c25ce7b6e8b9fd162ee11ae4338fa76 (patch) | |
| tree | 8e17cd4d67ae958e75e4b31ee0e87d2d7c1f463d | |
| parent | a65184db9f0811c6d5367d7bdcd4250ac8386c45 (diff) | |
| parent | 9db46237ca5ed55fa6294f9637d208343f69676d (diff) | |
| download | Qt-a4b3fb256c25ce7b6e8b9fd162ee11ae4338fa76.zip Qt-a4b3fb256c25ce7b6e8b9fd162ee11ae4338fa76.tar.gz Qt-a4b3fb256c25ce7b6e8b9fd162ee11ae4338fa76.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging:
Removed old autotest references from Symbian build files
| -rw-r--r-- | config.profiles/symbian/layers.sysdef.xml | 6 | ||||
| -rw-r--r-- | config.profiles/symbian/package_definition.xml | 14 |
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> |