summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Move QVGFontGlyphCache from source file into a separate headerJason Barron2010-07-124-20/+87
* Make cacheGlyphs() function (and the destructor) virtual.Jason Barron2010-07-121-2/+2
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-07-1059-160/+979
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-07-1059-160/+979
| |\
| | * Updated WebKit to ad96ca2f9b57271da4ea7432022ac686ee0981c2Simon Hausmann2010-07-0959-160/+979
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-07-1022-72/+3356
|\ \ \
| * | | Linux runonphone - tell the user which driver to loadShane Kearns2010-07-091-6/+45
| * | | Fix USB serial port detection of the Nokia N95 on linuxShane Kearns2010-07-094-9/+59
| * | | Fix license headers on new files imported from Qt CreatorShane Kearns2010-07-096-84/+156
| * | | Implement just in time debug feature for runonphoneShane Kearns2010-07-083-3/+186
| * | | Merge tools/runonphone/symbianutils from qtcreator src/shared/symbianutilsShane Kearns2010-07-0813-54/+2980
| * | | Add exception barrier to QCertificateRetriever::RunL()Shane Kearns2010-07-082-3/+9
| * | | Set QThreads to be process critical automatically on Symbian OSShane Kearns2010-07-081-0/+8
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-07-100-0/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-07-080-0/+0
| |\ \ \ | | |_|/ | |/| |
| | * | Merge commit 'v4.7.0-beta2' into 4.7Jason McDonald2010-07-080-0/+0
| | |\ \
| | | * | Fixed a broken merge.v4.7.0-beta2Denis Dzyubenko2010-06-302-66/+0
| | | * | Changed the way we detect touch screen on Windows.Denis Dzyubenko2010-06-302-32/+36
| | | * | Fix s60main linking issue with gcce applicationsMiikka Heikkinen2010-06-301-0/+4
| | | * | don't complain multiple times about same abuse of //% meta stringsOswald Buddenhagen2010-06-304-0/+30
| | | * | Fixed device context leak in QGLWidget on Windows.Kim Motoyoshi Kalland2010-06-301-0/+3
| | | * | Provide Qml plugins with UID3s on SymbianAlessandro Portale2010-06-244-0/+4
| | | * | Fix "missing store_build" errorsMiikka Heikkinen2010-06-231-0/+6
| | | * | Updated UIDs for spectrum demoGareth Stockwell2010-06-233-3/+3
| | | * | Assigning 0xA UID3s to the new standalone qml demosAlessandro Portale2010-06-227-7/+7
| | | * | Update 4.7-beta2 def filesShane Kearns2010-06-226-6/+39
| | | * | Fix a possible crash with the EVR video renderer in windowsThierry Bastian2010-06-211-7/+9
| | | * | Stopping a flick resulted in the next click being consumed.Martin Jones2010-06-181-0/+1
| | | * | clearFocus() shouldn't mess with focus if it doesn't have focusMartin Jones2010-06-181-1/+2
| | | * | Fixed infinite recursion when drawing very large painter paths.Kim Motoyoshi Kalland2010-06-183-9/+14
| | | * | Fix autoScroll implementationAlan Alpert2010-06-183-36/+54
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-0923-347/+672
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix qdoc warning.Jason McDonald2010-07-091-1/+1
| * | | | Fix subfocus when reparenting panels.Andreas Aardal Hanssen2010-07-082-0/+52
| * | | | Add three new style-hints to QFont to match CSS' generic font familiesTor Arne Vestbø2010-07-086-1/+34
| * | | | The forward declaration should have been in the namespace for QImageDataBenjamin Poulain2010-07-081-2/+2
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-0814-345/+585
| |\ \ \ \ |/ / / / /
| * | | | Fixes the sqlite driver bug QTBUG-11904 (pointer aliasing)Charles Yin2010-07-081-22/+25
| * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-07-0727-780/+859
| |\ \ \ \
| | * | | | Add test and fix style for the SSE2 implementation of ARGB32 conversionBenjamin Poulain2010-07-073-4/+66
| | * | | | Build fix, the header of QImageData did not declare QImageWriter.Benjamin Poulain2010-07-071-0/+2
| | * | | | SSE2 implementation of convert_ARGB_to_ARGB_PM_inplace for QImageJohn Brooks2010-07-078-14/+144
| | * | | | Moved primitive SSE2 painting utilities to qdrawingprimitive_sse2_p.hJohn Brooks2010-07-073-157/+218
| | * | | | Move logic for building SIMD extensions to gui.proJohn Brooks2010-07-072-145/+133
| | |/ / /
| * | | | Fix text drawing into alpha pixmap with opengl engineEskil Abrahamsen Blomfeldt2010-07-072-6/+0
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-07-0819-31/+107
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| |
| * | | Use lower case for including system header filesGareth Stockwell2010-07-076-6/+6
| * | | Added trace statements to Phonon MMF backendGareth Stockwell2010-07-071-0/+17
| * | | MMF Phonon backend: call winId() from VideoWidget constructorGareth Stockwell2010-07-072-4/+2
| * | | Fixed crash which occurs when switching between video clipsGareth Stockwell2010-07-072-13/+32