summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-11-052-1/+4
|\
| * Fix compilation issue for the Carbon build.Fabien Freling2010-11-042-1/+4
* | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-11-043-34/+40
|\ \ | |/ |/|
| * Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-11-043-34/+40
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-031-4/+6
| | |\
| | | * The lastCenterPoint should be equal to centerPoint for new gestures.Frederik Gladhorn2010-11-031-3/+5
| | | * PinchGesture: lastRotationAngle should start at 0.Frederik Gladhorn2010-11-031-1/+1
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integrationQt Continuous Integration System2010-11-032-30/+34
| | |\ \
| | | * \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-013-6/+6
| | | |\ \ | | | | |/
| | | * | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-301-0/+3
| | | |\ \
| | | * \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-298-12/+104
| | | |\ \ \
| | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-2728-48/+98
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-259-26/+150
| | | |\ \ \ \ \
| | | * | | | | | Doc: Moved QFileSystemModel example code to the class documentation.David Boddie2010-10-212-30/+34
* | | | | | | | | Update the offsets of the QToolBars insideFabien Freling2010-11-044-8/+36
|/ / / / / / / /
* | | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-11-034-3/+25
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-11-034-3/+25
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Qt/Symbian: QInputDialog layout and size are wrongSami Merila2010-11-034-3/+25
| | | |_|_|_|_|/ | | |/| | | | |
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-11-0323-46/+149
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Add member-swap to shared datatypes that don't have it.Marc Mutz2010-11-0321-0/+96
| * | | | | | | Containers: add member-swapMarc Mutz2010-11-032-0/+17
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2aavit2010-11-02111-126/+11425
| |\ \ \ \ \ \ \
| * | | | | | | | Fixes: Reading and writing PNG iTXt international text chunksaavit2010-11-021-27/+31
| * | | | | | | | Fixes: corruption of whitespace in text fields when reading PNG imagesaavit2010-10-291-19/+5
* | | | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-11-023-6/+6
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | / / / / / / | | |/ / / / / / | |/| | | | | |
| * | | | | | | Fix poor English in QStyle::polish documentation.Jason McDonald2010-11-011-4/+4
| * | | | | | | Fix a few typos in comments and docs.Jason McDonald2010-11-012-2/+2
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Make use of the fast image paths for CompositionMode_Source as well.Samuel Rødal2010-11-012-5/+13
* | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-311-0/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-10-301-0/+3
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Fix Windows compilation.Samuel Rødal2010-10-271-0/+1
| | * | | | | Fixed race condition in raster paint engine.Samuel Rødal2010-10-271-0/+2
* | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-308-12/+104
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Avoid being killed by graphics out-of-memory monitor.Jason Barron2010-10-291-0/+11
| * | | | | | Support tactile feeedback from QS60Style for QWidgetsSami Merila2010-10-294-2/+81
| * | | | | | Do not crash on SymbianAlessandro Portale2010-10-282-3/+9
| * | | | | | Fixed crash with QClipboard in Symbian^3Titta Heikkala2010-10-281-7/+3
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into...Qt Continuous Integration System2010-10-29105-109/+11305
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Fix the license in files for LighthouseJørgen Lind2010-10-2811-0/+451
| * | | | | Add missing QT_MODULE macros.Paul Olav Tvete2010-10-281-0/+2
| * | | | | Fix qt_defaultDpi, but not use Q_DECL_IMPORT but Q_GUI_EXPORTJørgen Lind2010-10-281-2/+2
| * | | | | Compile fix for RVCT 4Jørgen Lind2010-10-281-2/+2
| * | | | | Fix QT_BLITTER_RASTEROVERLAY and namespace errorJørgen Lind2010-10-271-1/+2
| * | | | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-271-1/+20
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-2673-1405/+926
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-2266-250/+966
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote branch 'lighthouse/4.7' into lighthouse-masterPaul Olav Tvete2010-10-221-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Lighthouse on OS X.Morten Johan Sørvig2010-10-201-1/+1
| * | | | | | | | | Add keycodes for some additional multimedia keysPaul Olav Tvete2010-10-111-0/+7
| * | | | | | | | | Merge branch 'lighthouse-4.7' into lighthouse-masterPaul Olav Tvete2010-10-061-1/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /