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-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
| | | | | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-06-1177-330/+992
| | | | | |\
| | | | | | * Fixed a broken merge.Denis Dzyubenko2010-06-112-66/+0
| | | | | | * Changed the way we detect touch screen on Windows.Denis Dzyubenko2010-06-112-32/+36
| | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-1014-20/+56
| | | | | | |\
| | | | | | | * Updated leading whitespace to make indentation more consistentConstantin Makshin2010-06-101-1/+1
| | | | | | | * Updated project files so it is now possible to use "-system-zlib" configurati...Constantin Makshin2010-06-102-5/+14
| | | | | | | * use "win32-g++*" scope to match all MinGW makespecsMark Brand2010-06-101-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-0812-13/+41
| | | | | | | |\
| | | | | | | | * Fix a freetype link failure.Anders Bakken2010-06-081-1/+2
| | | | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-0811-12/+39
| | | | | | | | |\
| | | | | | | | | * Revert accidental commit of irrelevant stuff. Silly mondays..Andreas Kling2010-06-071-10/+0
| | | | | | | | | * Unbreak Linux build when qendian.h is included before qglobal.hAndreas Kling2010-06-071-0/+10
| | | | | | | | | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-s...Denis Dzyubenko2010-06-0770-217/+753
| | | | | | | | | |\
| | | | | | | | | | * Fix incorrect \since tagSimon Hausmann2010-06-071-1/+1
| | | | | | | | | | * add docu about pixmaps being invalidated on qapp destructionOswald Buddenhagen2010-06-071-0/+3
| | | | | | | | | | * remove somewhat misleading warning about x11 pixmap leakOswald Buddenhagen2010-06-071-4/+2
| | | | | | | | | | * Disabled item view items use incorrect background colorJens Bache-Wiig2010-06-072-3/+4
| | | | | | | | | | * Add convenience constructor to QTextOption::TabDavid Faure2010-06-042-2/+10
| | | | | | | | | * | Fix QApplication/QWidget to really take ownership of input contextsMichael Hasselmann2010-06-072-0/+3
| | | | | | | | | * | Added setting a hotspot on standard gesturesDenis Dzyubenko2010-06-071-0/+3
| | | | | | | | | * | Fixed GestureOverride event delivery in GraphicsView.Denis Dzyubenko2010-06-071-1/+8
| | | | | | | | | * | Reset gesture when in MayBeGesture state.Denis Dzyubenko2010-06-021-2/+6
| | | | | * | | | | | doc: Added DITA XML generatorMartin Smith2010-06-111-1/+0
* | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-1614-60/+134
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-1612-24/+55
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Fixed QImageReader::format() inconsistency.Samuel Rødal2010-06-155-18/+30
| | * | | | | | | | | Fixed missing stroke for flat ellipses.Samuel Rødal2010-06-153-4/+6