summaryrefslogtreecommitdiffstats
path: root/src/gui
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-06-012-17/+24
|\
| * Added environment variable graphicssystem switch.Andreas Hartmetz2010-06-011-3/+14
| * Fix bug in QGraphicsItem::scroll() when called with no QRectF argument.Andreas Aardal Hanssen2010-06-011-13/+6
| * Avoid unnecessary detach / deep copy in QGraphicsItem::scroll().Andreas Aardal Hanssen2010-06-011-1/+4
* | Ensure text color set by S60 input method works for QML ItemsMartin Jones2010-06-011-8/+33
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-312-2/+5
|\
| * 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
| |/
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-2916-40/+886
|\ \
| * | 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-2815-40/+879
| |\ \ | | |/ | |/|
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-2715-40/+879
| | |\
| | | * Merge commit 'origin/4.7' into symbian47Thomas Zander2010-05-2730-202/+409
| | | |\
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-2715-40/+879
| | | |\ \
| | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-2615-40/+879
| | | | |\ \
| | | | | * \ Merge branch '4.7' of scm.dev.troll.no:qt/qt into 4.7Shane Kearns2010-05-261-4/+33
| | | | | |\ \
| | | | | * | | Fix for QRuntimePixmapData serial number setting.Jani Hautakangas2010-05-251-1/+3
| | | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-2516-46/+895
| | | | | |\ \ \
| | | | | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-2416-46/+895
| | | | | | |\ \ \
| | | | | | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-2216-46/+895
| | | | | | | |\ \ \
| | | | | | | | * | | Enable QTouchEvent for S60 5.0Shane Kearns2010-05-213-12/+45
| | | | | | | | * | | Add missing license header.Jason McDonald2010-05-211-0/+41
| | | | | | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-2015-34/+809
| | | | | | | | |\ \ \
| | | | | | | | | * \ \ Merge branch '4.7' of scm.dev.troll.no:qt/qt-s60-public into 4.7Jani Hautakangas2010-05-2095-923/+1461
| | | | | | | | | |\ \ \
| | | | | | | | | * | | | QRuntimeGraphicsSystemJani Hautakangas2010-05-2015-34/+809
* | | | | | | | | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-05-282-4/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-05-272-4/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| | * | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-05-251-4/+4
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Don't use QAtomicInt in statics because they are non-POD.Thiago Macieira2010-05-251-4/+4
| | * | | | | | | | | | | | Qt app draws background incorrectly when animated wallpaper is usedSami Merila2010-05-251-0/+8
| | |/ / / / / / / / / / /
* | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-283-84/+104
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-273-84/+104
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Wrong QGraphicsItem::childrenBoundingRect() when applying effects.Bjørn Erik Nilsen2010-05-271-3/+3
| | * | | | | | | | | | | | Replace memmove with memcpyEskil Abrahamsen Blomfeldt2010-05-271-6/+6
| | * | | | | | | | | | | | Optimize initialization of QStaticTextEskil Abrahamsen Blomfeldt2010-05-272-81/+101
| | | |_|/ / / / / / / / / | | |/| | | | | | | | | |
* | | | | | | | | | | | | Removed unused variableThorbjørn Lindeijer2010-05-271-1/+0
|/ / / / / / / / / / / /
* | | | | | | | | | | | Update documentation for the -font command line optionBradley T. Hughes2010-05-271-1/+2
* | | | | | | | | | | | Fixed a crash when creating QGtkStyle before QApplicationJens Bache-Wiig2010-05-272-2/+2
| |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge remote branch 'origin/4.7' into oslo-staging-1Aaron McCarthy2010-05-273-2/+39
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Redraw issues when removing a fully transparent QGraphicsItem from the scene.Bjørn Erik Nilsen2010-05-261-0/+18
| * | | | | | | | | | Fixes a proxymodel sorting odity.Pierre Rossi2010-05-261-1/+1
| | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Update the state of the keyboard modifiers on drop events.David Faure2010-05-261-1/+20
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-2530-202/+409
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Dont crash when assigning the same input context twice.Denis Dzyubenko2010-05-252-4/+10
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-2530-198/+399
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-2430-198/+399
| | |\ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | | * | | | | | Merge remote branch 'origin/4.7' into oslo-staging-1Aaron McCarthy2010-05-2414-176/+99
| | | |\ \ \ \ \ \ | | | | | |/ / / / | | | | |/| | | |