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-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-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-152-36/+79
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | ComboBox popuplist is not correctly layouted in fullscreen modeSami Merila2010-06-151-10/+1
| * | | | | | | | | Stylus menu for Share (QT app) is different from native S60 appsSami Merila2010-06-151-31/+35
| * | | | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2010-06-1531-127/+303
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| * | | | | | | | | Stylus menu for Share (QT app) is different from native S60 appsSami Merila2010-06-112-19/+67
* | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-157-28/+74
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-147-28/+74
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| | * | | | | | | | Fixed error reporting in grayraster and reduced default pool size.Carolina Gomes2010-06-144-22/+35
| | * | | | | | | | Add QTextOption API to QStaticTextEskil Abrahamsen Blomfeldt2010-06-143-6/+39
* | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-124-11/+42
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-124-11/+42
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Do not keep flush timer running once no pixmaps are detached.Warwick Allison2010-06-111-11/+18
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-103-0/+24
| | |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-103-0/+24
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-083-0/+24
| | | | |\ \ \ \ \ \ \ | | | | | |_|_|/ / / / | | | | |/| | | | | |
| | | | | * | | | | | Cursor positioning in QTextDocument after undo()mae2010-06-083-0/+24
| | | | | | |_|/ / / | | | | | |/| | | |
* | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-123-60/+60
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | / / / / | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | Incorrectly named keys in QS60StyleEnums::SkinPartsSami Merila2010-06-113-60/+60
| |/ / / / / / /
* | | | | | | | Fixed an on-exit crash for apps using GL.Trond Kjernåsen2010-06-116-5/+14
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-1026-122/+289
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-1026-122/+289
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |