summaryrefslogtreecommitdiffstats
path: root/src/testlib/qbenchmarkevent_p.h
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-03-18 14:08:26 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-03-18 14:08:26 (GMT)
commit8d2b0c0c41ca862ea943277f67cce71a32fb4c37 (patch)
tree8e7c9bbc4913c3deedae7828abf69b2747e41445 /src/testlib/qbenchmarkevent_p.h
parentf43c00902e9ff6a314836c6955769e941ea33277 (diff)
parenta762bb1ead644e00290b2f4c023e96f5ef765d43 (diff)
downloadQt-8d2b0c0c41ca862ea943277f67cce71a32fb4c37.zip
Qt-8d2b0c0c41ca862ea943277f67cce71a32fb4c37.tar.gz
Qt-8d2b0c0c41ca862ea943277f67cce71a32fb4c37.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (147 commits) Add missing semicolons. moc was confused and positionViewAtIndex not invokable. Use the correct base URL in resolveUri Remove timing sensitivity. Optimize id checking. Fix examples after 47fb07c9fdf47584ae55f3412102bbeef5576b04. Don't use QScriptValueIterator to iterate over arrays. Skip test, to be fixed. Only release the binding once we're finished with its memory Make it harder to accidentally delete a binding Adjust test now that redundant contexts are not create due Block modifications to internal QDeclarativeContexts Don't destroy cookie jar until while someone may be using it. Fix tests after 47fb07c9fdf47584ae55f3412102bbeef5576b04. Another fix to find Improve implicit "." import Fix auto test Fix type lookup with url Fix default values on Textinput Add an implicit import "." to types loaded from a local url Fix crash ...
Diffstat (limited to 'src/testlib/qbenchmarkevent_p.h')
0 files changed, 0 insertions, 0 deletions