summaryrefslogtreecommitdiffstats
path: root/examples/animation
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-04-10 01:49:02 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-04-10 01:49:02 (GMT)
commit7690bab57ef7ae6d669c6df23e9de72fd8a85d62 (patch)
tree3015d651d56e78e20862a20353a6a8261b718563 /examples/animation
parent19a566f82a7c684423331a8caab70ec594afd1ce (diff)
parent501a80b1dc9df816a3de25bd1af5b55cdc0fcbce (diff)
downloadQt-7690bab57ef7ae6d669c6df23e9de72fd8a85d62.zip
Qt-7690bab57ef7ae6d669c6df23e9de72fd8a85d62.tar.gz
Qt-7690bab57ef7ae6d669c6df23e9de72fd8a85d62.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: (26 commits) Regressions in Global Object prototype access Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 14feb62c96ffe2c37e3e2fdac4e370fdbc76ef62 ) Autotest: fix paths on the test server after update. Fix typo in docs. Corruption in data captured by QAudioInput Just one (static) waveInCriticalSection but multiple QAudioInput to Mismatch between reported and actual supported sample rates in Remove qWait functions as it is used in QTRY_* macros. Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( e3dc4ef2b801d91e115c54f833fa7766d392ceda ) Fix crash for multiscript text in QTextEngine::boundingBox() Fixed modal dialog not to have automatic "Exit" right softkey in S60. Remove qWait functions as it is used in QTRY_* macros. QAudioInput: possible change of state without emitting stateChange() Did not include updated repaint number for parent item in revert. Implementing QFontEngineS60::getSfntTableData() Fix doc for deprecated QGridLayout::colSpacing: point to existing method qDebug() << myPointF would remove spaces in following arguments. Fix crash in the fileiconprovider for Windows Partially revert "Remove qWait functions as it is used in QTRY_* macros." Remove qWait functions as it is used in QTRY_* macros. ...
Diffstat (limited to 'examples/animation')
0 files changed, 0 insertions, 0 deletions