summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-02-282-30/+21
|\
| * Prevent stroking zero length lines in qstroker.cppSamuel Rødal2011-02-251-19/+21
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-teamaavit2011-02-251-11/+0
| |\
| | * Stop using XLFD as fontconfig matching fallbackJiang Jiang2011-02-241-11/+0
* | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-02-261-0/+1
|\ \ \
| * \ \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-02-251-0/+1
| |\ \ \
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-02-241-0/+1
| | |\ \ \
| | | * | | QRuntimeWindowSystem: Track window size properlySami Kyostila2011-02-241-0/+1
* | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-02-2512-54/+130
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | |
| * | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-02-242-7/+7
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-02-231-6/+6
| | |\ \ \
| | | * | | Remove Qt dependancy to SYMBIAN_GRAPHICS_WSERV_QT_EFFECTSJani Hautakangas2011-02-231-6/+6
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-231-1/+1
| | |\ \ \ \
| | | * | | | Fix QPlainTextEdit corruption/crash with scrollingmae2011-02-231-1/+1
| * | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-2310-47/+123
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-02-221-0/+7
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | Prevent infinite loop in raster engine on zero dash pattern length.Samuel Rødal2011-02-221-0/+7
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-int...Qt Continuous Integration System2011-02-224-6/+12
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | Cocoa: Sheets looses focus when moving parent windowRichard Moe Gustavsen2011-02-221-0/+4
| | | * | | | Cocoa: fix crash when using a drawer with a focus widgetRichard Moe Gustavsen2011-02-181-1/+1
| | | * | | | Fix crash in KPackageKitGabriel de Dietrich2011-02-151-5/+6
| | | * | | | Merge branch '4.7-upstream' into 4.7Gabriel de Dietrich2011-02-1516-109/+168
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch '4.7-upstream' into 4.7Gabriel de Dietrich2011-02-0823-81/+156
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-02-0412-58/+57
| | | | |\ \ \ \ \
| | | | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-review into 4.7David Boddie2011-01-3112-58/+57
| | | | | |\ \ \ \ \
| | | * | | \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2011-02-0113-54/+479
| | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | |/| | | | | |
| | | * | | | | | | | Plug memory leak when using qt_mac_set_dock_menu() on CocoaAndy Shaw2011-01-261-0/+1
| | * | | | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt into 4.7Joona Petrell2011-02-2228-156/+211
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-02-211-0/+1
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Wheel delta is always zero in QEventTransition's eventDean Dettman2011-02-211-0/+1
| | | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-182-0/+4
| | | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Forward mouse events from TextInput and TextEdit to QInputContext.Andrew den Exter2011-02-212-41/+99
| | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Update the input context when the pre-edit cursor position changes.Andrew den Exter2011-02-162-0/+4
* | | | | | | | | | | | | Merge remote branch 'qt-mainline/master'aavit2011-02-2410-20/+46
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
| * | | | | | | | | | | Fix "array subscript out of bounds" warning with GCC 4.5 in QtOpenGLThiago Macieira2011-02-212-6/+6
| * | | | | | | | | | | Fix warning about parentheses about && in ||Thiago Macieira2011-02-211-1/+1
| * | | | | | | | | | | Fix silly warnings about initialising in the wrong orderThiago Macieira2011-02-211-4/+4
| * | | | | | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-02-181-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-02-181-1/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | / / | | | | |_|_|_|_|_|/ / | | | |/| | | | | | |
| | | * | | | | | | | QImage crash when invalid XPM is read.Niklas Kurkisuo2011-02-181-1/+1
| * | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-175-8/+34
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-152-4/+18
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | * | | | | | | | Fix inheritance of widget input contexts.Andrew den Exter2011-02-152-4/+18
| | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-02-141-2/+2
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | |
| | | * | | | | | | | Fix for ARMV6 drawhelper blendingJani Hautakangas2011-02-141-2/+2
| | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-02-141-1/+1
| | |\ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / | | | |/| | | | | | |
| | | * | | | | | | | QStyleSheetStyle: dont crash in PE_WIDGET when widget is nullOlivier Goffart2011-02-141-1/+1
| | | | |_|_|_|/ / / | | | |/| | | | | |
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-02-141-1/+13
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | / / / / | | | |_|_|/ / / / | | |/| | | | | |
| | | * | | | | | Worked around a SC issue in S60 3.x vs 5.0 versions.axis2011-02-141-1/+13
* | | | | | | | | Check engine existence before increasing reference countJiang Jiang2011-02-231-3/+6