Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Mon, 17 Jan 2011 13:22:37 +0000 (23:22 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 17 Jan 2011 13:22:37 +0000 (23:22 +1000)
commitae0455673c4d9721d8a26a3a01a1b56c7e5fac8f
tree0e55c64668c4cc51c8c31ea99e0f2f5da5a6277d
parent77c4df1325c4bae10c99978a325febada9fd82d0
parente7907b32c323400562607253ec293e814c015f7a
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging:
  Fix QScriptValueIterator::hasNext and QScriptValueIterator::hasPrevious
src/script/api/qscriptvalueiterator.cpp
tests/auto/qscriptvalueiterator/tst_qscriptvalueiterator.cpp