Merge remote branch 'qt/4.7' into 4.7
authorShane Kearns <shane.kearns@accenture.com>
Tue, 30 Mar 2010 11:28:02 +0000 (12:28 +0100)
committerShane Kearns <shane.kearns@accenture.com>
Tue, 30 Mar 2010 11:28:02 +0000 (12:28 +0100)
commit753ce0f7a2f16dd0303f6ad5493e9ce6bfc13fd7
treefc1467525883912cc603174cbb55174d9201e4da
parent9181ba917aa4f842e5c3e8febebe363f4dc11c6f
parent3ac354b885dcaf7186cf8bafdfc2bdc0c6d8dbd0
Merge remote branch 'qt/4.7' into 4.7

Conflicts:
tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir