summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-2115-208/+114
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-06-2113-95/+421
| |\
| | * Fix for a leak in the mac style.Denis Dzyubenko2010-06-211-1/+1
| | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Andy Shaw2010-06-2185-604/+1291
| | |\
| | | * Fix compiler warnings in QtGui (text,painting).Friedemann Kleint2010-06-213-8/+7
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-213-23/+26
| | | |\
| | * | | Make sure that <br/> is seen as a valid tag in Qt::mightBeRichText()Andy Shaw2010-06-211-0/+2
| * | | | Doc: Relicensed the documentation under the GNU FDL version 1.3.David Boddie2010-06-217-176/+78
| | |_|/ | |/| |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-06-1816-36/+101
| |\ \ \
| | * | | Fix for emitting changed signal in QClipboardDenis Dzyubenko2010-06-181-2/+2
| * | | | Merge commit 'refs/merge-requests/691' of git://gitorious.org/qt/qt into inte...David Boddie2010-06-181-20/+23
| |\ \ \ \
| | * | | | Documentation changes to QTextLayout.Robin Burchell2010-06-151-20/+23
| * | | | | Doc: Fixed documentation errors.David Boddie2010-06-181-1/+1
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-211-1/+28
|\ \ \ \ \ \
| * | | | | | Fix for TLS problem which causes apps to crash in the S60 portmread2010-06-211-1/+28
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-06-212-3/+14
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-202-3/+14
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Fixed device context leak in QGLWidget on Windows.Kim Motoyoshi Kalland2010-06-181-0/+3
| | * | | | Fix possible crash in QTextLayout for glyphless itemsEskil Abrahamsen Blomfeldt2010-06-171-3/+11
* | | | | | Start the implementation of in-place recoding for imagesBenjamin Poulain2010-06-204-95/+399
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-175-7/+28
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Don't do opaque detection when copying a sub-rect of a QPixmap.Samuel Rødal2010-06-171-1/+1
| * | | | | Optimized QPixmap::fromImage for raster pixmaps.Samuel Rødal2010-06-171-3/+16
| * | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Geir Vattekar2010-06-1745-271/+376
| |\ \ \ \ \
| | * | | | | Typo in qcleanlooksstyle.cppOlivier Goffart2010-06-171-1/+1
| | * | | | | Speed up calls to QPainter::setCompositionMode when the mode is unchangedSimon Hausmann2010-06-171-0/+2
| * | | | | | Doc: Small change to QAbstractItemDelegate::editorEvent()Geir Vattekar2010-06-171-2/+8
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-172-5/+11
|\ \ \ \ \ \ \
| * | | | | | | Allocate the memory for QtFontSize when count > 1Benjamin Poulain2010-06-161-1/+1
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-162-5/+11
| |\ \ \ \ \ \ \
| | * | | | | | | Make sure only started gestures can cause cancellationsThomas Zander2010-06-161-1/+2
| | | |_|_|/ / / | | |/| | | | |
| | * | | | | | Reduce the memory consumption of QtFontStyleBenjamin Poulain2010-06-161-4/+9
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-171-1/+2
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-1723-181/+164
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| * | | | | | | clearFocus() shouldn't mess with focus if it doesn't have focusMartin Jones2010-06-171-1/+2
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-178-17/+35
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Fix crash on Mac OS X when drawing text with Qt::TextBypassShaping setTor Arne Vestbø2010-06-161-1/+2
| * | | | | | | Fixed infinite recursion when drawing very large painter paths.Kim Motoyoshi Kalland2010-06-163-9/+14
| * | | | | | | Fixed full-rule on clipped painter paths.Kim Motoyoshi Kalland2010-06-161-0/+4
| * | | | | | | Removed unnecessary lines of code.Kim Motoyoshi Kalland2010-06-161-4/+0
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-163-3/+15
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Fixed problem with wrong size hints when items were removed.Jan-Arve Sæther2010-06-163-3/+15
| | |/ / / / /
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-1623-181/+164
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-1623-181/+164
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-1523-181/+164
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-1523-181/+164
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-1223-181/+164
| | | | |\ \ \ \ \ | | | | | |_|_|/ / | | | | |/| | | |
| | | | | * | | | Fix QSystemTrayIcon::supportsMessages() on Windowsminiak2010-06-117-22/+31
| | | | | * | | | Use NIM_SETVERSION to get the latest behaviorminiak2010-06-111-16/+71
| | | | | * | | | Cleanup obsolete stuffminiak2010-06-112-58/+4