summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-03-25 03:12:14 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-03-25 03:12:14 (GMT)
commit020249df9d920e1bf783dd802f66761c4b7e123c (patch)
tree9bb92d7cca2339465b79a6070584d2dca6e81c15 /mkspecs
parente15d5fc7e1a82da38b765e55d040edbdf8621ae2 (diff)
parenta20828a110ad35a7a98a6234ca0013203d9f8b61 (diff)
downloadQt-020249df9d920e1bf783dd802f66761c4b7e123c.zip
Qt-020249df9d920e1bf783dd802f66761c4b7e123c.tar.gz
Qt-020249df9d920e1bf783dd802f66761c4b7e123c.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: (76 commits) Qt.Infinite -> Animation.Infinite Doc fix. Skip tests for now Make autotest work on windows. Remove faulty assert - the precondition is checked for correctly later on Ensure currentIndex is updated when items inserted before currentIndex Replace Animation's repeat property with loops. Fix compile in namespace. Compile with qtnamespace Disallow the implicit QDeclarativeGuardedContextData copy constructor Doc Fix leak. StateChangeScript doc. A StateChangeScript should never be run when leaving the state. ScriptAction doc. Rename stateChangeScriptName to scriptName. Doc Document QML security considerations. Fix flicking views at boundary with StricthighlighRange Fix abort in flipable ...
Diffstat (limited to 'mkspecs')
0 files changed, 0 insertions, 0 deletions