summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-318-8/+39
|\
| * Updated WebKit to c58dc2f491a824ac56e31c440fcf7fe16dab09c4Simon Hausmann2010-05-318-8/+39
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-3125-11/+93
|\ \
| * | Fix QT_NO_TEXTHTMLPARSERTasuku Suzuki2010-05-312-0/+26
| * | Fix QT_NO_DOMTasuku Suzuki2010-05-312-6/+6
| * | Fix QT_NO_TEXTDATE compilation errors.Andreas Aardal Hanssen2010-05-315-1/+16
| |\ \
| | * | Fix QT_NO_TEXTDATETasuku Suzuki2010-05-255-1/+16
| * | | Fix QT_NO_TEXTSTREAM compilation errors.Tasuku Suzuki2010-05-317-0/+17
| * | | Fix QT_NO_VALIDATOR compilation.Tasuku Suzuki2010-05-313-1/+12
| * | | Doc: correcting docs in QDrag::execMorten Engvoldsen2010-05-311-1/+1
| * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Morten Engvoldsen2010-05-311-1/+2
| |\ \ \
| | * | | Revert behavior of QTextLayout::boundingRect() when line width is setEskil Abrahamsen Blomfeldt2010-05-311-1/+2
| | * | | Fix unreasonably large width of QTextLayout::boundingRect()Eskil Abrahamsen Blomfeldt2010-05-311-1/+1
| * | | | Doc: Adding note about QDrag::exec()Morten Engvoldsen2010-05-311-1/+3
| |/ / /
| * | | Fix QT_NO_DIRMODEL build error in QtDeclarative.Tasuku Suzuki2010-05-313-0/+10
| * | | Revert "Added native key support to QSharedMemory API."Andreas Aardal Hanssen2010-05-316-104/+58
| * | | Revert "Improved documentation for QSharedMemory's key/setKey functions."Andreas Aardal Hanssen2010-05-311-37/+27
| * | | Fix a simple mistake in QXmlStreamReader::atEnd() docs.Robin Burchell2010-05-311-1/+1
| * | | Improved documentation for QSharedMemory's key/setKey functions.Andreas Aardal Hanssen2010-05-311-27/+37
| * | | Added native key support to QSharedMemory API.Mirko Damiani2010-05-316-58/+104
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-313-226/+174
|\ \ \ \
| * \ \ \ Merge remote branch 'staging/4.7' into HEADAaron McCarthy2010-05-3167-436/+1074
| |\ \ \ \
| * | | | | Fix multithreaded use of bearer management on Symbian.Aaron McCarthy2010-05-312-80/+52
| * | | | | Fix up cancelling of active object.Aaron McCarthy2010-05-311-44/+34
| * | | | | Fix locking after merge from Qt Mobility.Aaron McCarthy2010-05-313-102/+88
* | | | | | Add notifier for PathPercent.valueYann Bodson2010-05-312-2/+5
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-31149-1515/+3976
|\ \ \ \ \ \
| * | | | | | Rename example layoutItem -> layoutitem and improve docsBea Lam2010-05-311-5/+6
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-315-3/+129
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Add selection methods to TextEditWarwick Allison2010-05-305-3/+129
| * | | | | | Updated WebKit to 531b0d7cd2af830f0d17b83b6e4a489794481539Simon Hausmann2010-05-3010-11/+202
| * | | | | | Updated WebKit to eb07c6f9bd50d0d74e9ac19ade4a2fbd5cece7c7Simon Hausmann2010-05-2915-74/+221
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-2931-102/+594
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-2831-102/+594
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-2831-102/+594
| | | |\ \ \ \
| | | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-2731-102/+594
| | | | |\ \ \ \
| | | | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-2731-102/+594
| | | | | |\ \ \ \
| | | | | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-2631-102/+594
| | | | | | |\ \ \ \
| | | | | | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-2631-102/+594
| | | | | | | |\ \ \ \
| | | | | | | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-2631-102/+594
| | | | | | | | |\ \ \ \
| | | | | | | | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-2631-102/+594
| | | | | | | | | |\ \ \ \
| | | | | | | | | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-2531-102/+594
| | | | | | | | | | |\ \ \ \
| | | | | | | | | | | * | | | Updated WebKit to 807157e42add842605ec67d9363dd3f1861748caSimon Hausmann2010-05-2531-102/+594
| * | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-2925-794/+1724
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Fix location of QtMultimedia def filesShane Kearns2010-05-281-3/+0
| | * | | | | | | | | | | | | | Freeze 4.7 def files on top of 4.6.3Shane Kearns2010-05-287-113/+827
| | * | | | | | | | | | | | | | Update def files for 4.6.3Shane Kearns2010-05-285-752/+122
| | * | | | | | | | | | | | | | Add runtime_graphics_system flag to QApplicationPrivate.Jani Hautakangas2010-05-286-5/+12
| | * | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-2816-40/+882
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-2716-40/+882
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \