summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'mainline/4.8'Casper van Donderen2011-08-3044-248/+373
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-08-281-2/+1
| |\
| | * Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-08-2328-119/+252
| | |\
| | * | Fix warning about missing qs60keycapture_p.h header in guiMiikka Heikkinen2011-08-101-2/+1
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-08-286-15/+25
| |\ \ \
| | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-teamaavit2011-08-246-15/+25
| | |\ \ \
| | | * | | Revert "Include trailing space width in RTL text line width"Eskil Abrahamsen Blomfeldt2011-08-241-5/+1
| | | * | | Fix justification of RTL textEskil Abrahamsen Blomfeldt2011-08-241-1/+2
| | | * | | Use CoreText for font rendering on uikit.Eike Ziller2011-08-244-9/+22
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast...Qt Continuous Integration System2011-08-272-3/+6
| |\ \ \ \ \
| | * | | | | Check if bridge plugin vector is still valid.Frederik Gladhorn2011-08-261-1/+1
| | * | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-08-253-6/+44
| | |\ \ \ \ \
| | * | | | | | QWindowsStyle: fix bug in eventFilter on KeyPressed event with alt pressed: i...peterpa2011-08-251-2/+5
| | | |/ / / / | | |/| | | |
| * | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-08-2713-137/+62
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Merge branch 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-08-2613-137/+62
| | |\ \ \ \ \
| | | * | | | | Crash when creating scroll bar skin graphics on S60 (debug only)Sami Merila2011-08-251-3/+3
| | | * | | | | QS60Style omits drawing theme background in some Symbian SDKsSami Merila2011-08-251-2/+6
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-08-2410-119/+30
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-241-1/+1
| | | |\ \ \ \ \ \
| | | | * | | | | | In landscape mode QComboboBox popup can not be showed completelySami Merila2011-08-231-1/+1
| | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-08-241-12/+22
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Make it easier to select words at the start of a line.Andrew den Exter2011-08-241-12/+22
| * | | | | | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-08-253-6/+44
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | / / / / | | |_|_|_|_|/ / / / | |/| | | | | | | |
| | * | | | | | | | Merge branch 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-08-233-6/+44
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...v4.7.4Qt Continuous Integration System2011-08-231-1/+32
| | | |\ \ \ \ \ \ \ | | | | | |_|/ / / / | | | | |/| | | | |
| | | | * | | | | | Fix problem with grabWindow on Mac OS X 10.6 with CocoaAndy Shaw2011-08-221-3/+2
| | | | * | | | | | Fix compile issue with Mac OS X 10.5Andy Shaw2011-08-191-2/+8
| | | | * | | | | | Fix QPixmap::grabWindow() on Mac OS X LionAndy Shaw2011-08-191-1/+27
| | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-225-19/+59
| | | |\ \ \ \ \ \ \ | | | | | |_|/ / / / | | | | |/| | | | |
| | | | * | | | | | Symbian: Not possible to catch RequestSoftwareInputPanel in eventFilterSami Merila2011-08-221-4/+0
| | | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Mrudul Pendharkar2011-08-222-7/+40
| | | | |\ \ \ \ \ \
| | | | | * | | | | | Exact word bubble doesn't disappear when screen is tapped (fix part 2)Sami Merila2011-08-192-4/+11
| | | | * | | | | | | Make text rendering working outside the gui thread on Symbian.Laszlo Agocs2011-08-163-11/+48
| | | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-08-182-2/+4
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Doc: Fixed \since declarations.David Boddie2011-06-301-2/+2
| | | | * | | | | | | | Doc: Added more appropriate links to help reduce confusion.David Boddie2011-06-161-0/+2
| | | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-181-0/+4
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / | | | | |/| | | | | | |
| | | | * | | | | | | | Exact word bubble doesn't disappear when screen is tappedSami Merila2011-08-181-0/+4
| * | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-08-243-38/+43
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | |
| | * | | | | | | | | | Fixed lost flushes in raster window surface.Samuel Rødal2011-08-221-10/+11
| | * | | | | | | | | | Correctly position aliased lines with flat capsLars Knoll2011-08-192-28/+32
| * | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into mast...Qt Continuous Integration System2011-08-241-0/+5
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/4.8' into 4.8-tools-stagingJoerg Bornemann2011-08-231-3/+23
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | |
| | * | | | | | | | | | | Fix compilation of qjpeg on MinGW with GCC 4.6Thiago Macieira2011-08-191-0/+5
| * | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast...Qt Continuous Integration System2011-08-238-17/+60
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-08-183-7/+9
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-08-171-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Add a QApplication::queryKeyboardModifiers() method.David Faure2011-08-178-17/+60
| * | | | | | | | | | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-08-191-3/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / | |/| | | | | / / / / / / / / | | | |_|_|_|/ / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-08-181-3/+23
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / | | | |/| | | | | | | | | |