summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | | | | | | | * | | | | | | | | | | | | | | | | | Replace explicit surrogate handlers by inline methods of QChar classsuzuki toshiya2011-09-0717-111/+73
| | | | | | | | | | | | | | | | | | | | | | | | | * | Merge remote branch 'qt-fire-review/master'aavit2011-09-174-19/+171
| | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | * \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-09-164-19/+171
| | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | * | QGraphicsWidget::setLayoutDirection doesn't propagate to new childrenJohn Tapsell2011-09-162-3/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | * | Prevent unnecessary graphics item updates when graphics effect changes.Christophe Oosterlynck2011-09-162-16/+115
| | | | | | | | | | | | | | | | | | | | | | | | | * | | | Merge remote branch 'qt-fire-review/master'aavit2011-09-168-10/+112
| | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / | | | | | | | | | | | | |/| | | | | | | | | | | | | / / / | | | | | | | | | | | | | | | | | | | | | | | | | |/ / /
| | | | | | | | | | | | | | | | | | | | | | | | | * | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-09-168-10/+112
| | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | |/ /
| | | | | | | | | | | | | | | | | | | | | | | | | | * | Use more widely supported Unicode character representationJiang Jiang2011-09-161-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | * | Release font engine refcount when done using it in QTextEngineJiang Jiang2011-09-163-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | * | Fix - QGraphicsTextItem in a tab of QTabWidget cannot get focusKalle Viironen2011-09-152-1/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | * | Updated ChangelogLars Knoll2011-09-151-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | * | Do not put cursor at non-stop character positionsJiang Jiang2011-09-142-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | * | doc: Fix incorrect enum name in QRawFont::alphaMapForGlyph docsEskil Abrahamsen Blomfeldt2011-09-131-1/+2
| | | | | | | | | | | | * | | | | | | | | | | | | | | | Merge remote-tracking branch 'qt-fire-review/master'aavit2011-09-10227-1629/+4374
| | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | | | | | | | | | | | | | |/| | | | | | | | | | | | | |
| | | | | | | | | | | | | * | | | | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-09-10224-1623/+4364
| | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / | | | | | | | | | | | | | | |/| | | | | | | | | | | | |
| | | | | | | | | | | | | | * | | | | | | | | | | | | | Disable autotest broken by the change to QCache in 7ab0bedaavit2011-09-101-1/+3
| | | | | | | | | | | | | | * | | | | | | | | | | | | | Generate glyphs in un-transformed coordinate system.Samuel Rødal2011-09-091-3/+4
| | | | | | | | | | | | | | * | | | | | | | | | | | | | Use QT_MAX_CACHED_GLYPH_SIZE in QFontEngineFTAleksandar Stojiljkovic2011-09-091-2/+6
| | | | | | | | | | | | | | * | | | | | | | | | | | | | Reset trailingSpaces in relayoutJiang Jiang2011-09-091-0/+1
| | | | | | | | | | | | | | * | | | | | | | | | | | | | Prevent QPixmapCache potentially growing indefinitely.Samuel Rødal2011-09-092-2/+26
| | | | | | | | | | | | | | * | | | | | | | | | | | | | Allocate 16-byte aligned memory independent of platform for raster pool.Samuel Rødal2011-09-091-37/+17
| | | | | | | | | | | | | | * | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-teamaavit2011-09-083-5/+6
| | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | * | | | | | | | | | | | | | Fix trailing spaces problem by not adding it to QScriptLine.lengthJiang Jiang2011-09-083-5/+6
| | | | | | | | | | | | | | * | | | | | | | | | | | | | | Merge remote-tracking branch 'qt-mainline/4.8'aavit2011-09-08216-1573/+4301
| | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | |_|_|_|_|_|/ / / / / / / / / / / / / / / | | | | | | | | |/| | | | | | / / / / / / / / / / / / / / | | | | | | | | | | | | | | |/ / / / / / / / / / / / / /
| | | | | | | | * | | | | | | | | | | | | | | | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-09-085-2/+62
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / / / / / / / / / / / / / / /
| | | | | | | | * | | | | | | | | | | | | | | | | | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-09-075-2/+62
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | |_|_|_|_|_|/ / / / / / / / / / / / / | | | | | | | | | |/| | | | | | | | | | | | | | | | | |
| | | | | | | | | * | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-09-075-2/+62
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | | | | | | | | | |/| | | | | | | | | | | / / / / / / / | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|/ / / / / / / | | | | | | | | | | |/| | | | | | | | | | | | | | | |
| | | | | | | | | | * | | | | | | | | | | | | | | | | Dragging in nested views no longer works as expectedMartin Jones2011-09-071-1/+1
| | | | | | | | | | * | | | | | | | | | | | | | | | | Fix implicit height not growing when pre-edit text wraps.Andrew den Exter2011-09-062-1/+47
| | | | | | | | | | * | | | | | | | | | | | | | | | | Fix leak in State element.Michael Brasser2011-09-021-0/+12
| | | | | | | | | | * | | | | | | | | | | | | | | | | Fix leak in bindings created by PropertyChanges.Michael Brasser2011-09-011-0/+2
| | | | | | | * | | | | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-09-0712-7/+51
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | |_|_|/ / / / / / / / / / / / / / / / | | | | | | | | |/| | | | | | | | | | | | | | | | | |
| | | | | | | | * | | | | | | | | | | | | | | | | | | fix build for desktopKonstantin Ritt2011-09-072-2/+13
| | | | | | | | * | | | | | | | | | | | | | | | | | | Fix the build with -qtnamespace configure optionssuzuki toshiya2011-09-0610-5/+38
| | | | | | | * | | | | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master...Qt Continuous Integration System2011-09-0726-77/+364
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | |
| | | | | | | * | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'qt-air-review/master'Sergio Ahumada2011-09-0626-77/+364
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | |
| | | | | | | * | | | | | | | | | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-air-teamQt Continuous Integration System2011-09-0626-77/+364
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | * | | | | | | | | | | | | | | | | | | | Updated WebKit to a2bd2bb (qtwebkit-2.2-week35)Ademar de Souza Reis Jr2011-09-0626-77/+364
| | | | | * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master...Qt Continuous Integration System2011-09-067-6/+65
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'qt-air-review/master'Sergio Ahumada2011-09-067-6/+65
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | _ / / / / / / / / / / / / / / / / / / / / | | | | | | | | / / / / / / / / / / / / / / / / / / / /
| | | | | | * | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-air-teamQt Continuous Integration System2011-09-05315-4753/+20941
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | |/ / / / / / / / / / / / / / / / / / / / | | | | | | | |/| | | | | | | | | | | | | | | | | | | |
| | | | | | | * | | | | | | | | | | | | | | | | | | | | Updated WebKit to fb3b4700aa5abbb2db471b4f0eb7946ce4850cc4Ademar de Souza Reis Jr2011-08-307-6/+65
| | | | | * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-09-052-2/+1
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | _ / / / / / / / / / / / / / / / / / / | | | | | | | | | / / / / / / / / / / / / / / / / / /
| | | | | * | | | | | | | | | | | | | | | | | | | | | Removed the unnecessary dependency of the QtHelp module on the QtXml oneConstantin Makshin2011-09-052-2/+1
| | | | * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-09-0342-100/+415
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|/ / / / / / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7Liang Qi2011-09-0313-63/+521
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-09-039-202/+168
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast...Qt Continuous Integration System2011-09-0211-25/+521
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / | |_|_| / / / / / / / / / / / / / / / / / / / / / / / / |/| | | / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-09-01610-6034/+13579
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | Update license headersGabriel de Dietrich2011-09-013-54/+57