summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-04-06 01:09:18 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-04-06 01:09:18 (GMT)
commitaf60a29d79bca27dde9441b6b8fc0eae185f08d5 (patch)
tree880665c4b49db6d6c3ba66670825962d69382e39 /src/declarative/qml
parentdb9bfd3653de23693db67ec5a0534e4d4ac97f7d (diff)
parent3155d38a5fa83301d08a777c254c1afbbe4bcc22 (diff)
downloadQt-af60a29d79bca27dde9441b6b8fc0eae185f08d5.zip
Qt-af60a29d79bca27dde9441b6b8fc0eae185f08d5.tar.gz
Qt-af60a29d79bca27dde9441b6b8fc0eae185f08d5.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Empty commit to trigger rebuilding in the CI system. Make it possible to build QtDBus and its tools on Windows CE. Reapply 69e873e2bfae3fc028c21d93112a75008c3bb58b now that QLibrary is fixed
Diffstat (limited to 'src/declarative/qml')
0 files changed, 0 insertions, 0 deletions