From 6330e20da815890a5282dbe7ce9c2363e4b4c3b4 Mon Sep 17 00:00:00 2001
From: Yann Bodson <yann.bodson@nokia.com>
Date: Tue, 9 Nov 2010 09:16:29 +1000
Subject: Fix QML ecmascript autotest.

---
 .../qdeclarativeecmascript/data/outerBindingOverridesInnerBinding.qml  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/outerBindingOverridesInnerBinding.qml b/tests/auto/declarative/qdeclarativeecmascript/data/outerBindingOverridesInnerBinding.qml
index 0a933e8..090c948 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/outerBindingOverridesInnerBinding.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/outerBindingOverridesInnerBinding.qml
@@ -1,13 +1,14 @@
 import Qt.test 1.0
 
 MyQmlObject {
+    id: obj
     property alias c1: myConstants.c1
     property alias c2: myConstants.c2
     property int c3: 0
 
     objectProperty: ConstantsOverrideBindings { 
         id: myConstants 
-        c2: c3
+        c2: obj.c3
     }
 
 }
-- 
cgit v0.12

on value='develop'>develop</option>
<option value='develop-readme'>develop-readme</option>
<option value='feature/1_12_recursive_ts_rw_lock'>feature/1_12_recursive_ts_rw_lock</option>
<option value='feature/alignment'>feature/alignment</option>
<option value='feature/async2'>feature/async2</option>
<option value='feature/ccio'>feature/ccio</option>
<option value='feature/coding_standards'>feature/coding_standards</option>
<option value='feature/de-hd'>feature/de-hd</option>
<option value='feature/h5detect'>feature/h5detect</option>
<option value='feature/h5f_get_obj_rework'>feature/h5f_get_obj_rework</option>
<option value='feature/indexing'>feature/indexing</option>
<option value='feature/new_datatypes'>feature/new_datatypes</option>
<option value='feature/onion_vfd'>feature/onion_vfd</option>
<option value='feature/parallel_h5repack'>feature/parallel_h5repack</option>
<option value='feature/refactor-h5t-cmp'>feature/refactor-h5t-cmp</option>
<option value='feature/select_io_chunk_cache'>feature/select_io_chunk_cache</option>
<option value='feature/select_io_tconv'>feature/select_io_tconv</option>
<option value='feature/vfd_swmr'>feature/vfd_swmr</option>
<option value='feature/vfd_swmr_beta_2'>feature/vfd_swmr_beta_2</option>
<option value='feature/vol_cap_flags'>feature/vol_cap_flags</option>
<option value='feature/vol_tools_tests'>feature/vol_tools_tests</option>
<option value='feature/werror-restrict'>feature/werror-restrict</option>
<option value='gh-pages'>gh-pages</option>
<option value='hdf5_1_10'>hdf5_1_10</option>
<option value='hdf5_1_10_10'>hdf5_1_10_10</option>
<option value='hdf5_1_10_11'>hdf5_1_10_11</option>
<option value='hdf5_1_10_9'>hdf5_1_10_9</option>
<option value='hdf5_1_12'>hdf5_1_12</option>
<option value='hdf5_1_12_2'>hdf5_1_12_2</option>
<option value='hdf5_1_12_3'>hdf5_1_12_3</option>
<option value='hdf5_1_13_2'>hdf5_1_13_2</option>
<option value='hdf5_1_13_3'>hdf5_1_13_3</option>
<option value='hdf5_1_14'>hdf5_1_14</option>
<option value='hdf5_1_14_0'>hdf5_1_14_0</option>
<option value='hdf5_1_14_1'>hdf5_1_14_1</option>
<option value='hdf5_1_14_2'>hdf5_1_14_2</option>
<option value='hdf5_1_14_3'>hdf5_1_14_3</option>
<option value='hdf5_1_6'>hdf5_1_6</option>
<option value='hdf5_1_8'>hdf5_1_8</option>
<option value='hdf5_1_8_23'>hdf5_1_8_23</option>
<option value='inactive/110_HDFFV-10808-h5pset_file_space_strategy'>inactive/110_HDFFV-10808-h5pset_file_space_strategy</option>
<option value='inactive/H5Ocompare'>inactive/H5Ocompare</option>
<option value='inactive/NPOESS'>inactive/NPOESS</option>
<option value='inactive/aio_vfd'>inactive/aio_vfd</option>
<option value='inactive/avoid_truncate'>inactive/avoid_truncate</option>
<option value='inactive/cu_dev'>inactive/cu_dev</option>
<option value='inactive/develop_subfiling'>inactive/develop_subfiling</option>
<option value='inactive/develop_subfiling_v1'>inactive/develop_subfiling_v1</option>
<option value='inactive/direct_io_2'>inactive/direct_io_2</option>
<option value='inactive/h5ocompare'>inactive/h5ocompare</option>
<option value='inactive/hdf5_daosm'>inactive/hdf5_daosm</option>
<option value='inactive/hdf5_ff'>inactive/hdf5_ff</option>
<option value='inactive/hdf5_ff_compactor'>inactive/hdf5_ff_compactor</option>
<option value='inactive/hdf5_rados'>inactive/hdf5_rados</option>
<option value='inactive/jpeg_converter'>inactive/jpeg_converter</option>
<option value='inactive/json_vol'>inactive/json_vol</option>
<option value='inactive/json_vol_old'>inactive/json_vol_old</option>
<option value='inactive/mdc_sl_opt'>inactive/mdc_sl_opt</option>
<option value='inactive/mds'>inactive/mds</option>
<option value='inactive/merge_metadata_journaling'>inactive/merge_metadata_journaling</option>
<option value='inactive/metadata_journaling'>inactive/metadata_journaling</option>
<option value='inactive/modify_dtype_filter'>inactive/modify_dtype_filter</option>
<option value='inactive/multi_rd_wd_coll_io'>inactive/multi_rd_wd_coll_io</option>
<option value='inactive/multi_rd_wd_coll_io_merge'>inactive/multi_rd_wd_coll_io_merge</option>
<option value='inactive/null_vfd'>inactive/null_vfd</option>
<option value='inactive/parallel_vds'>inactive/parallel_vds</option>
<option value='inactive/parallel_vds_develop'>inactive/parallel_vds_develop</option>
<option value='inactive/parallel_vds_testing'>inactive/parallel_vds_testing</option>
<option value='inactive/phdf5_metadata_opt'>inactive/phdf5_metadata_opt</option>
<option value='inactive/post_open_fix'>inactive/post_open_fix</option>
<option value='inactive/rados_vol'>inactive/rados_vol</option>
<option value='inactive/selection_io'>inactive/selection_io</option>
<option value='inactive/selection_io_with_subfiling_vfd'>inactive/selection_io_with_subfiling_vfd</option>
<option value='inactive/trunk_merge_coverity'>inactive/trunk_merge_coverity</option>
<option value='loricooperhdf-patch-1'>loricooperhdf-patch-1</option>
<option value='metadata_cache_macro_cleanup'>metadata_cache_macro_cleanup</option>
<option value='ossf-scorecard'>ossf-scorecard</option>
<option value='pr_484'>pr_484</option>
<option value='reduce-h5f-duplication'>reduce-h5f-duplication</option>
<option value='sel_io_chunk_cache'>sel_io_chunk_cache</option>
<option value='shell_script'>shell_script</option>
<option value='zzz-gitlab-ci'>zzz-gitlab-ci</option>
</select> <input type='submit' name='' value='switch'/></form></td></tr>
<tr><td class='sub'>Mirror from: https://github.com/HDFGroup/hdf5.git</td><td class='sub right'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/oss-git/hdf5.git/?h=architecture_docs'>summary</a><a href='/oss-git/hdf5.git/refs/?h=architecture_docs&amp;id=c561dc7183a5496efdbccd25a0fb2b31b6d9772d'>refs</a><a href='/oss-git/hdf5.git/log/tools/h5ls/h5ls.c?h=architecture_docs'>log</a><a href='/oss-git/hdf5.git/tree/tools/h5ls/h5ls.c?h=architecture_docs&amp;id=c561dc7183a5496efdbccd25a0fb2b31b6d9772d'>tree</a><a class='active' href='/oss-git/hdf5.git/commit/tools/h5ls/h5ls.c?h=architecture_docs&amp;id=c561dc7183a5496efdbccd25a0fb2b31b6d9772d'>commit</a><a href='/oss-git/hdf5.git/diff/tools/h5ls/h5ls.c?h=architecture_docs&amp;id=c561dc7183a5496efdbccd25a0fb2b31b6d9772d'>diff</a><a href='/oss-git/hdf5.git/stats/tools/h5ls/h5ls.c?h=architecture_docs'>stats</a></td><td class='form'><form class='right' method='get' action='/oss-git/hdf5.git/log/tools/h5ls/h5ls.c'>
<input type='hidden' name='h' value='architecture_docs'/><input type='hidden' name='id' value='c561dc7183a5496efdbccd25a0fb2b31b6d9772d'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='text' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/oss-git/hdf5.git/commit/?h=architecture_docs&amp;id=c561dc7183a5496efdbccd25a0fb2b31b6d9772d'>root</a>/<a href='/oss-git/hdf5.git/commit/tools?h=architecture_docs&amp;id=c561dc7183a5496efdbccd25a0fb2b31b6d9772d'>tools</a>/<a href='/oss-git/hdf5.git/commit/tools/h5ls?h=architecture_docs&amp;id=c561dc7183a5496efdbccd25a0fb2b31b6d9772d'>h5ls</a>/<a href='/oss-git/hdf5.git/commit/tools/h5ls/h5ls.c?h=architecture_docs&amp;id=c561dc7183a5496efdbccd25a0fb2b31b6d9772d'>h5ls.c</a></div><div class='content'><div class='cgit-panel'><b>diff options</b><form method='get' action='.'><input type='hidden' name='h' value='architecture_docs'/><input type='hidden' name='id' value='c561dc7183a5496efdbccd25a0fb2b31b6d9772d'/><table><tr><td colspan='2'/></tr><tr><td class='label'>context:</td><td class='ctrl'><select name='context' onchange='this.form.submit();'><option value='1'>1</option><option value='2'>2</option><option value='3' selected='selected'>3</option><option value='4'>4</option><option value='5'>5</option><option value='6'>6</option><option value='7'>7</option><option value='8'>8</option><option value='9'>9</option><option value='10'>10</option><option value='15'>15</option><option value='20'>20</option><option value='25'>25</option><option value='30'>30</option><option value='35'>35</option><option value='40'>40</option></select></td></tr><tr><td class='label'>space:</td><td class='ctrl'><select name='ignorews' onchange='this.form.submit();'><option value='0' selected='selected'>include</option><option value='1'>ignore</option></select></td></tr><tr><td class='label'>mode:</td><td class='ctrl'><select name='dt' onchange='this.form.submit();'><option value='0' selected='selected'>unified</option><option value='1'>ssdiff</option><option value='2'>stat only</option></select></td></tr><tr><td/><td class='ctrl'><noscript><input type='submit' value='reload'/></noscript></td></tr></table></form></div><table summary='commit info' class='commit-info'>
<tr><th>author</th><td>Jonathan Kim &lt;jkm@hdfgroup.org&gt;</td><td class='right'>2010-09-16 17:48:06 (GMT)</td></tr>
<tr><th>committer</th><td>Jonathan Kim &lt;jkm@hdfgroup.org&gt;</td><td class='right'>2010-09-16 17:48:06 (GMT)</td></tr>
<tr><th>commit</th><td colspan='2' class='sha1'><a href='/oss-git/hdf5.git/commit/tools/h5ls/h5ls.c?h=architecture_docs&amp;id=c561dc7183a5496efdbccd25a0fb2b31b6d9772d'>c561dc7183a5496efdbccd25a0fb2b31b6d9772d</a> (<a href='/oss-git/hdf5.git/patch/tools/h5ls/h5ls.c?id=c561dc7183a5496efdbccd25a0fb2b31b6d9772d'>patch</a>)</td></tr>
<tr><th>tree</th><td colspan='2' class='sha1'><a href='/oss-git/hdf5.git/tree/?h=architecture_docs&amp;id=c561dc7183a5496efdbccd25a0fb2b31b6d9772d'>d3fdeac2e0dcbc3ee219fec262b1ecc091e70891</a> /<a href='/oss-git/hdf5.git/tree/tools/h5ls/h5ls.c?h=architecture_docs&amp;id=c561dc7183a5496efdbccd25a0fb2b31b6d9772d'>tools/h5ls/h5ls.c</a></td></tr>
<tr><th>parent</th><td colspan='2' class='sha1'><a href='/oss-git/hdf5.git/commit/tools/h5ls/h5ls.c?h=architecture_docs&amp;id=1914737e0658d642c1ef2e48c6162fa7cc400c64'>1914737e0658d642c1ef2e48c6162fa7cc400c64</a> (<a href='/oss-git/hdf5.git/diff/tools/h5ls/h5ls.c?h=architecture_docs&amp;id=c561dc7183a5496efdbccd25a0fb2b31b6d9772d&amp;id2=1914737e0658d642c1ef2e48c6162fa7cc400c64'>diff</a>)</td></tr><tr><th>download</th><td colspan='2' class='sha1'><a href='/oss-git/hdf5.git/snapshot/hdf5-c561dc7183a5496efdbccd25a0fb2b31b6d9772d.zip'>hdf5-c561dc7183a5496efdbccd25a0fb2b31b6d9772d.zip</a><br/><a href='/oss-git/hdf5.git/snapshot/hdf5-c561dc7183a5496efdbccd25a0fb2b31b6d9772d.tar.gz'>hdf5-c561dc7183a5496efdbccd25a0fb2b31b6d9772d.tar.gz</a><br/><a href='/oss-git/hdf5.git/snapshot/hdf5-c561dc7183a5496efdbccd25a0fb2b31b6d9772d.tar.bz2'>hdf5-c561dc7183a5496efdbccd25a0fb2b31b6d9772d.tar.bz2</a><br/></td></tr></table>
<div class='commit-subject'>[svn-r19400] Purpose:<span class='decoration'></span></div><div class='commit-msg'> Fix for Bug1975 h5diff - support recursive comparison on group when specified as an object

Description:
 Compare member objects and groups recursively when two files or groups are specified to be compared. Support parallel diff and handling symbolic links accordingly.

Tested:
 jam, amani, heiwa
</div>