summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-1110-112/+72
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-09-114-5/+20
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-09-104-5/+20
| | |\ | |/ /
| | * Fix crash in QRuntimeGraphicsSystem due to destruction order.Jason Barron2010-09-102-2/+6
| | * Fix crash in OpenVG when failing to allocate large VGImages.Jason Barron2010-09-101-3/+10
| | * Updated 4.7.0 changelogmread2010-09-101-0/+4
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-106-107/+52
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-106-107/+52
| | |\ \
| | | * | Autotests cleanup.Yann Bodson2010-09-106-107/+52
* | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-1047-46/+2534
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-1038-9/+2376
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Prevented crash in GL window surface when deleting native child widgets.Samuel Rødal2010-09-101-4/+8
| | * | | Fix a regression where setPreferredSize(QSize(100, -1)) did not work.Jan-Arve Sæther2010-09-102-1/+9
| | * | | Force MeeGo touch to use native graphics system for now.Samuel Rødal2010-09-101-0/+24
| | * | | Fixed compiler warnings in meego graphics system helper.Samuel Rødal2010-09-103-13/+13
| | * | | Added meego graphics system helper to features/qt.prf and syncqt.Samuel Rødal2010-09-103-3/+4
| | * | | Use QFactoryLoader to ensure we get the correct graphics system plugin.Samuel Rødal2010-09-106-26/+55
| | * | | Updated license headers for meego graphics system helper.Samuel Rødal2010-09-1012-84/+408
| | * | | Fixed compilation and API of meego graphics system helper.Samuel Rødal2010-09-1014-228/+224
| | * | | Renamed meego graphics system helper files.Samuel Rødal2010-09-1013-0/+0
| | * | | Imported meego graphics system helper sources.Samuel Rødal2010-09-1013-0/+1001
| | * | | Updated license headers for meego graphics system.Samuel Rødal2010-09-108-56/+272
| | * | | Fixed compilation and API of meego graphics system.Samuel Rødal2010-09-1013-148/+158
| | * | | Renamed meego graphics system files.Samuel Rødal2010-09-109-0/+0
| | * | | Imported meego graphics system sources.Samuel Rødal2010-09-109-0/+738
| | * | | Fix cache_cost initialization of QFontEngineMultiWinJiang Jiang2010-09-101-0/+3
| | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-09-104-27/+72
| | |\ \ \
| | | * | | Don't waste memory on the share widget in the GL window surface.Samuel Rødal2010-09-101-1/+4
| | * | | | Fix crash when using unprintable chars in QStaticTextEskil Abrahamsen Blomfeldt2010-09-102-2/+12
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-09-102-4/+28
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Merge branch '4.6-s60' into 4.7-s60axis2010-09-100-0/+0
| | |\ \ \ \
| | | * | | | Fixed crash in input methods when using symbols menu and numbers onlyaxis2010-09-102-4/+28
| | * | | | | Fixed crash in input methods when using symbols menu and numbers onlyaxis2010-09-102-4/+28
| | | |_|/ / | | |/| | |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-101-0/+13
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Read the data when the stream passed in is of type CArchiveStreamAndy Shaw2010-09-101-0/+13
| | | |/ / | | |/| |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-103-26/+68
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/|
| | * | Autotest for QTBUG-13454.Yann Bodson2010-09-102-16/+55
| | * | Changing the Image 'source' should not go through the 'Loading' state if the ...Yann Bodson2010-09-101-10/+13
| |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-095-7/+49
| |\ \
| | * | Make sure we blit to the correct FBO in the GL window surface.Samuel Rødal2010-09-091-1/+5
| | * | Some optimizations to the GL pixmap data.Samuel Rødal2010-09-094-6/+44
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2010-09-10217-5751/+9244
|\ \ \ \
| * | | | Doc: Added info on compression to rcc docsGeir Vattekar2010-09-101-1/+21
| * | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-09216-5750/+9223
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-09-095-138/+145
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-09-095-138/+145
| | | |\ \
| | | | * \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2010-09-091-2/+6
| | | | |\ \
| | | | | * | Change RLibrary handle in QS60PluginResolver to be process wideMiikka Heikkinen2010-09-091-2/+6
| | | | * | | Editable QComboBox popup immediately closes itself after a clickSami Merila2010-09-091-1/+2
| | | | |/ /
| | | | * | Cursor is misplaced in the editors text areaSami Merila2010-09-091-1/+1