summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-1335-230/+610
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-134-79/+10
| |\
| | * Use the stream operation for the SSE2 implementation of memfill32Benjamin Poulain2010-09-131-4/+4
| | * Remove the memory safety for the first scanline of the SSSE3 blendingBenjamin Poulain2010-09-131-72/+3
| | * Assertion calledEmitUpdated fails in QGraphicsScene.Bjørn Erik Nilsen2010-09-131-1/+1
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-09-1329-85/+507
| | |\
| | * | Linux: Fix mispositioned, misclipped glyphs in large fonts (QStaticText)Eskil Abrahamsen Blomfeldt2010-09-131-2/+2
| * | | When using complex transformations rendering goes easily off by one pixel.Jani Hautakangas2010-09-131-66/+92
| * | | Remove compiler warning in qapplication.cpp.Jason Barron2010-09-131-0/+1
| | |/ | |/|
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-136-10/+24
| |\ \
| | * | When onDoubleClicked: is handled don't emit a second onPressed/onClickedMartin Jones2010-09-132-7/+16
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-09-1318-71/+473
| | |\ \
| | * | | Ensure flickable velocity is updated when view is moved by setCurrentIndexMartin Jones2010-09-134-3/+8
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-133-1/+7
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Fix compilation of QEgl with EGL 1.1 and older.Rhys Weatherley2010-09-123-1/+7
| | | |/ | | |/|
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-132-3/+3
| |\ \ \ | | | |/ | | |/|
| | * | Fix slot naming clashMartin Jones2010-09-122-3/+3
| | |/
| * | Updated WebKit to 715b53069911a31a559aa0b3d94ffc6a5ac20988Simon Hausmann2010-09-1218-71/+473
| |/
* | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-113-5/+16
|\ \ | |/
| * 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-upstream' into 4.7-docA-Team2010-09-1027-31/+1100
|\ \ \ | |/ /
| * | 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-upstream' into 4.7-docA-Team2010-09-0989-4712/+5406
|\ \ \ | |/ /
| * | 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