summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-1346-246/+697
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-09-131-0/+1
| |\
| | * Fix compile error for runonphone on linux/gcc4.4.3Adenilson Cavalcanti da Silva2010-09-131-0/+1
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-1310-95/+46
| |\ \
| | * | 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
| | * | tests: fix compilation with sunccOlivier Goffart2010-09-135-16/+16
| | * | Assertion calledEmitUpdated fails in QGraphicsScene.Bjørn Erik Nilsen2010-09-132-1/+21
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-09-1333-85/+557
| | |\ \
| | * | | Linux: Fix mispositioned, misclipped glyphs in large fonts (QStaticText)Eskil Abrahamsen Blomfeldt2010-09-131-2/+2
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-09-132-66/+93
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/|
| | * | 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-1310-10/+74
| |\ \
| | * | When onDoubleClicked: is handled don't emit a second onPressed/onClickedMartin Jones2010-09-134-7/+62
| | * | Add test for view velocity update on setCurrentIndex()Martin Jones2010-09-132-0/+4
| | * | 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
| | |/
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-09-1218-71/+473
| |\ \ | | |/ | |/|
| | * Updated WebKit to 715b53069911a31a559aa0b3d94ffc6a5ac20988Simon Hausmann2010-09-1218-71/+473
| |/
* | 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