summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-09-1318-71/+473
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-132-3/+3
| |\
| * | Updated WebKit to 715b53069911a31a559aa0b3d94ffc6a5ac20988Simon Hausmann2010-09-1218-71/+473
* | | Ensure flickable velocity is updated when view is moved by setCurrentIndexMartin Jones2010-09-134-3/+8
| |/ |/|
* | Fix slot naming clashMartin Jones2010-09-122-3/+3
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-09-103-5/+16
|\
| * 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
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-1020-8/+1017
|\ \ | |/ |/|
| * 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-101-1/+1
| * Force MeeGo touch to use native graphics system for now.Samuel Rødal2010-09-101-0/+24
| * Use QFactoryLoader to ensure we get the correct graphics system plugin.Samuel Rødal2010-09-103-8/+20
| * 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-103-13/+18
| |\
| | * 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-101-2/+1
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-09-101-4/+7
|\ \ \
| * | | Fixed crash in input methods when using symbols menu and numbers onlyaxis2010-09-101-4/+7
| | |/ | |/|
* | | 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
| |/
* | Autotest for QTBUG-13454.Yann Bodson2010-09-101-2/+1
* | 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-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
| | * QSslSocketPrivate::systemCaCertificates() hangs sometimes on SymbianJuha Turunen2010-09-092-134/+136
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-095-11/+57
|\ \ \ | |/ / |/| |
| * | QList::toVector()/QVector::toStdVector()/QVector::fromStdVector(): use reserve()Marc Mutz2010-09-091-2/+2
| * | When a move is completed, report the source and destination correctly.Stephen Kelly2010-09-092-8/+51
| * | Fixed the scrolling of text in QLineEdit with right alignmentThierry Bastian2010-09-091-0/+4
| * | Removing Q_ENUMS declaration in QTransformJørgen Lind2010-09-091-1/+0
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-0916-3895/+3840
|\ \ \
| * | | Update running animations if a SmoothedAnimation is changedAlan Alpert2010-09-092-1/+20
| * | | Fix SmoothedAnimation test and docsAlan Alpert2010-09-091-1/+7
| * | | Fix reversingModes of QDeclarativeSmoothedAnimationAlan Alpert2010-09-091-2/+3
| * | | Recreate Qt 4.7.0 def files over Qt 4.6.3Joona Petrell2010-09-0914-3891/+3810
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-0919-498/+493
|\ \ \ \ | |_|/ / |/| | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-0819-498/+493
| |\ \ \
| | * | | Work around a compiler bug on 64-bit.Thiago Macieira2010-09-081-3/+6