summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-masteraxis2011-02-2458-277/+608
|\
| * 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
| * | | | | Merge branch earth-team/master into earth-stagingJoão Abecasis2011-02-165-15/+62
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote branch 'qt/master' into earth-team-stagingJoão Abecasis2011-02-1626-174/+212
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-02-141-33/+19
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-02-111-33/+19
| | | |\ \ \ \ \ \ | | | | | |/ / / / | | | | |/| | | |
| | | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-02-101-33/+19
| | | | |\ \ \ \ \ | | | | | | |/ / / | | | | | |/| | |
| | | | | * | | | Fix QFileDialog Symbian native file dialog filename filtering.Miikka Heikkinen2011-02-101-33/+19
| | * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast...Qt Continuous Integration System2011-02-144-18/+28
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Cocoa/Alien: bugfix corner cases with popups and enter/leaveRichard Moe Gustavsen2011-02-144-18/+28
| | * | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-1021-123/+165
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-02-101-0/+4
| | | |\ \ \ \ \ \
| | | | * | | | | | Stop focus propagation of touch events when flag is set.Niklas Kurkisuo2011-02-091-0/+4
| | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-02-093-4/+42
| | | |\ \ \ \ \ \ \ | | | | | |_|/ / / / | | | | |/| | | | |
| | | | * | | | | | Fix build failureGareth Stockwell2011-02-092-6/+6
| | | | * | | | | | Recreate Symbian raster backing store when WA_TranslucentBackground setGareth Stockwell2011-02-093-4/+42
| | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-093-16/+15
| | | |\ \ \ \ \ \ \ | | | | | |_|_|_|_|/ | | | | |/| | | | |
| | | | * | | | | | Use same values for Text.lineHeightMode and QTextBlock::lineHeightMode from m...Yann Bodson2011-02-092-4/+8
| | | | * | | | | | Don't clear pre-edit text when a graphics items loses focus.Andrew den Exter2011-02-091-12/+7
| | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-02-083-31/+16
| | | |\ \ \ \ \ \ \ | | | | | |_|/ / / / | | | | |/| | | | |
| | | | * | | | | | Check that _POSIX_THREAD_SAFE_FUNCTIONS is larger than zero.Thiago Macieira2011-02-081-1/+1
| | | | * | | | | | Use an increasing size for the getpwuid_r buffer.Thiago Macieira2011-02-081-1/+12
| | | | * | | | | | Make sure we use at least 1024 bytes when calling getpwuid_r.Thiago Macieira2011-02-081-1/+1
| | | | * | | | | | Revert "Improved performance of mapFromGlobal/mapToGlobal on X11"Denis Dzyubenko2011-02-071-28/+0
| | | | * | | | | | Don't crash when BMP color table is brokenHarald Fernengel2011-02-041-0/+2
| | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-02-082-15/+36
| | | |\ \ \ \ \ \ \ | | | | | |_|/ / / / | | | | |/| | | | |
| | | | * | | | | | Fix native child window Symbian decoration handling.Jani Hautakangas2011-02-062-15/+23
| | | | * | | | | | Fixed a bug where the softkeys would leave a see-through "hole".axis2011-02-041-0/+13
| | | * | | | | | | Doc: Fixed warnings and other problems found while fixing markup.David Boddie2011-02-071-3/+3
| | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-02-0413-23/+141
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2011-01-282-4/+18
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | Doc: Fixed confusing wording of a sentence.David Boddie2011-01-271-2/+2
| | | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-01-2616-63/+647
| | | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Doc: fixing bugs and typos based on feedbackMorten Engvoldsen2011-01-252-2/+2
| | | * | | | | | | | | | Merge branch '4.7' of ../qt into 4.7David Boddie2011-01-131147-1391/+1497
| | | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Doc: Changed description to prevent confusion about managed widgets.David Boddie2011-01-101-3/+3