summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-3131-36/+143
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-05-3142-384/+375
| |\
| | * 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-312-1/+27
| | |\ \
| | | * | Revert behavior of QTextLayout::boundingRect() when line width is setEskil Abrahamsen Blomfeldt2010-05-312-1/+15
| | | * | Fix unreasonably large width of QTextLayout::boundingRect()Eskil Abrahamsen Blomfeldt2010-05-312-1/+13
| | * | | Doc: Adding note about QDrag::exec()Morten Engvoldsen2010-05-311-1/+3
| | |/ /
| | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Morten Engvoldsen2010-05-314-1/+11
| | |\ \
| | | * | Fix compilation with stricts compilers.Olivier Goffart2010-05-311-1/+1
| | | * | Fix QT_NO_DIRMODEL build error in QtDeclarative.Tasuku Suzuki2010-05-313-0/+10
| | * | | Doc: replacing old imageMorten Engvoldsen2010-05-311-0/+0
| | |/ /
| | * | Revert "Added native key support to QSharedMemory API."Andreas Aardal Hanssen2010-05-317-123/+65
| | * | 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-317-65/+123
| | * | Make test work with shadow builds again.Andreas Aardal Hanssen2010-05-311-4/+4
| * | | Doc: Fixed an off-by-one error in an example.David Boddie2010-05-311-1/+1
| * | | Doc: Removed a misleading sentence about a class constructor.David Boddie2010-05-311-4/+2
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-05-28233-1772/+3159
| |\ \ \
| * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-05-276-99/+114
| |\ \ \ \
| * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-05-264-1/+98
| |\ \ \ \ \
| * | | | | | Doc: Corrected the documentation about the compression threshold.David Boddie2010-05-261-19/+21
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-311-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Remove stray debugThomas Zander2010-05-311-1/+1
* | | | | | | | 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-31198-1507/+2441
| |\ \ \ \ \ \ \ \
| * | | | | | | | | 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
* | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-313-3/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add notifier for PathPercent.valueYann Bodson2010-05-312-2/+5
| * | | | | | | | | | Fix exampleBea Lam2010-05-311-1/+1
* | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-3129-798/+1034
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-31366-4855/+8988
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Rename QGraphics...Layout classes/QML items to Graphics...LayoutBea Lam2010-05-318-64/+64
| | * | | | | | | | | | File shouldn't be in repositoryBea Lam2010-05-311-0/+0
| | * | | | | | | | | | Implement removeAt() for layout classes to clean up item removal. AlsoBea Lam2010-05-318-36/+70
| | * | | | | | | | | | Split graphicsLayouts example into qgraphicslinearlayout andBea Lam2010-05-3117-593/+773
| | * | | | | | | | | | Rename example layoutItem -> layoutitem and improve docsBea Lam2010-05-317-11/+12
| |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-3113-5/+476
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add selection methods to TextEditWarwick Allison2010-05-3013-5/+476
* | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-3010-11/+202
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Updated WebKit to 531b0d7cd2af830f0d17b83b6e4a489794481539Simon Hausmann2010-05-3010-11/+202
|/ / / / / / / / / / / /