diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-19 11:25:51 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-19 11:25:51 (GMT) |
| commit | d28057dc6f282c2cc129eae40a4fb1555fef455c (patch) | |
| tree | 6e37acce5af0c4f3728ce4ceed0bc9512d1e3541 /doc/src/snippets/sqldatabase/sqldatabase.cpp | |
| parent | 1c8de8076f611f6514fc85451ef23f2fde2be1ee (diff) | |
| parent | 1bf469497cb9b92faee25f398ae6568193d26e01 (diff) | |
| download | Qt-d28057dc6f282c2cc129eae40a4fb1555fef455c.zip Qt-d28057dc6f282c2cc129eae40a4fb1555fef455c.tar.gz Qt-d28057dc6f282c2cc129eae40a4fb1555fef455c.tar.bz2 | |
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (48 commits)
Fix CI by recreating reference bitmaps for text comparison
tst_qdeclarativetext: Regenerate the baselines after the merge.
Giving Qt a default app server when Avkon is removed
TextInput autoscroll now scrolls when the cursor moves
Fix samegame tutorial js
Make minehunt less cheerful
Add new behavior example.
Fix autotest on windows
Added --remove-destination to qmake_emulator_deployment.flm
Fix worker ListModels to property emit countChanged()
Update color type docs to mention transparency
Update reference bitmaps used in bitmap comparison tests to follow changes in Text painting
Fix alignment bugs in Text element
Remove debug code added by 650a0078e2cef43eff107fe8d2505f64a0bfedf0
Compile on WinCE
Remove obsolete tweak in QFontEngineS60::alphaMapForGlyph
Optimize QFontEngineS60::recalcAdvances()
Delete qtdemoapps.iby.
Added bearer plugin deployment to qt.iby
Implement QFontEngineS60::emSquareSize()
...
Diffstat (limited to 'doc/src/snippets/sqldatabase/sqldatabase.cpp')
0 files changed, 0 insertions, 0 deletions