summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Expand)AuthorAgeFilesLines
* 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 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
| * | | 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/qt into qt-4.7-from-4.6Simon Hausmann2010-06-1614-60/+134
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-06-154-14/+59
| |\ \ \ \
| | * \ \ \ Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-06-144-14/+59
| | |\ \ \ \
| | | * | | | Prospective S60 build fixSimon Hausmann2010-06-132-4/+4
| | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-133-10/+55
| | | |\ \ \ \
| | | | * \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-06-122-2/+2
| | | | |\ \ \ \
| | | | | * | | | Allow to build Qt in static with mingwThierry Bastian2010-06-112-2/+2
| | | | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-06-113-12/+57
| | | | |\ \ \ \ \ | | | | | |/ / / / | | | | |/| | | |
| | | | | * | | | Thread safety for QFontEngineS60Shane Kearns2010-06-113-12/+57
* | | | | | | | | 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
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Reduce the memory consumption of QtFontStyleBenjamin Poulain2010-06-161-4/+9
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | 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