summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast...Qt Continuous Integration System2011-11-292-3/+78
|\
| * Merge branch '4.8-upstream' into master-waterWater-Team2011-11-182-5/+7
| |\
| * \ Merge branch '4.8-upstream' into master-waterWater-Team2011-11-172-110/+46
| |\ \
| * \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-11-164-29/+106
| |\ \ \
| * \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-11-154-26/+35
| |\ \ \ \
| * \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-11-135-10/+16
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-11-125-27/+54
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-11-111-1/+3
| |\ \ \ \ \ \ \
| * | | | | | | | QGraphicsLayoutItem - bound constraint the minimum and maximum sizeJohn Tapsell2011-11-081-2/+68
| * | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-11-033-14/+14
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-11-023-39/+136
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-10-288-29/+17
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Notify X11 of its resizable state through MWM Hints.Jan-Arve Saether2011-10-271-1/+10
* | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-11-284-4/+14
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'flex/master'Pasi Pentikainen2011-11-253-1/+14
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | New API to set AVKON flag to inputcontext in Qt/Symbian.Satyam Bandarapu2011-11-253-1/+14
| * | | | | | | | | | | | | Merge remote-tracking branch 'flex/master'Pasi Pentikainen2011-11-251-3/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | Fixing memory leak in QtGui qt_cleanupJani Hyvonen2011-11-221-3/+0
* | | | | | | | | | | | | | Merge remote-tracking branch 'qt-qa-review/master'Sergio Ahumada2011-11-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-teamQt Continuous Integration System2011-08-221-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Doc: Fixing typoSergio Ahumada2011-08-171-1/+1
* | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-11-248-131/+394
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Symbian: don't merge native clipboard, overwrite.Shane Kearns2011-11-221-0/+3
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Surviving out of memory in Qt Quick appmread2011-11-214-129/+164
| * | | | | | | | | | | | | | Export QtGui functions required by QtMultimediaKit backendGareth Stockwell2011-11-183-2/+227
| | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-11-232-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Move tga support from Qt3d to Qt.Sarah Smith2011-11-142-0/+11
* | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-11-231-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Hide png symbols in a namespace for -qt-libpngDaniel Teske2011-11-221-0/+1
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-11-172-5/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Allow setting the runtime graphicssystem via QT_DEFAULT_RUNTIME_SYSTEM.Robin Burchell2011-11-161-3/+7
| * | | | | | | | | | | | | Partially revert "Set the graphics system name in the graphics system factory."Robin Burchell2011-11-161-2/+0
| * | | | | | | | | | | | | Merge remote-tracking branch 'qt-mainline/4.8'aavit2011-11-1412-39/+74
| |\ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-11-152-110/+46
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Amend qfiledialog INTEGRITY patchHarald Fernengel2011-11-151-1/+1
| * | | | | | | | | | | | | | Update to latest INTEGRITY Framebuffer API.Rolland Dudemaine2011-11-151-110/+44
| * | | | | | | | | | | | | | Remove support for tilde expansion as there is no home on INTEGRITY.Rolland Dudemaine2011-11-151-0/+2
* | | | | | | | | | | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-11-151-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-11-151-1/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-11-151-1/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | Fix focusScopeItemChange setting crashDamian Jansen2011-11-151-1/+4
| | * | | | | | | | | | | | | | | Symbian - fix compile error when default configuredShane Kearns2011-11-071-3/+3
| | |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-11-153-28/+102
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Revert "Improved performance of mapFromGlobal/mapToGlobal on X11"Friedemann Kleint2011-11-141-28/+0
| * | | | | | | | | | | | | | Fix QDockWidget titlebar button positioning on Mac OS XPasi Matilainen2011-11-141-0/+101
| * | | | | | | | | | | | | | Fixed memory leak in Windows Vista style widgetsTero Ahola2011-11-141-0/+1
* | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-11-143-25/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / | |/| | | / / / / / / / / / / | |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix regression in styleName searchingJiang Jiang2011-11-092-24/+10
| * | | | | | | | | | | | | Fix styleName listing with the same QtFontStyle::Key valueJiang Jiang2011-11-081-14/+17
| * | | | | | | | | | | | | Fix localized font family access in OS XJiang Jiang2011-11-082-4/+24