summaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/qdeclarativebehaviors/data/parent.qml
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-07-29 19:59:03 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-07-29 19:59:03 (GMT)
commit91119eaa185934d568d0c83e25129b0028b5a607 (patch)
tree89f350ae6614aa0d76c3ecc4f114bddde45b05c8 /tests/auto/declarative/qdeclarativebehaviors/data/parent.qml
parent12e5d8897fbd60def1dd38608c1cd3f0d1d4317b (diff)
parente62f0aec863147682fcfcb651d13e0e7cff6d363 (diff)
downloadQt-91119eaa185934d568d0c83e25129b0028b5a607.zip
Qt-91119eaa185934d568d0c83e25129b0028b5a607.tar.gz
Qt-91119eaa185934d568d0c83e25129b0028b5a607.tar.bz2
Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( d521d7d81e8f0297c94be9ebd8af67ee130d0edb ) Workaround for QTBUG-8013: Do not return an ascent of 0 Fix crash when all the items in a QListView are hidden Removed QEXPECT_FAIL macros from test cases which now pass Ensure backing store is deleted before top-level window One more .pro fix for deprecated INCPATH Fix Rhys' qmake warnings Fixed QVideoSurfaceFormat::isValid()
Diffstat (limited to 'tests/auto/declarative/qdeclarativebehaviors/data/parent.qml')
0 files changed, 0 insertions, 0 deletions