summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-int...Qt Continuous Integration System2011-06-220-0/+0
|\
| * Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-06-20163-826/+8547
| |\
* | \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-06-212-4/+5
|\ \ \ | |_|/ |/| |
| * | Fix crash in PropertyChanges.Michael Brasser2011-06-211-2/+3
| * | Scroll correctly when cursorPosition is changed within onTextChanged.Andrew den Exter2011-06-201-2/+2
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-int...Qt Continuous Integration System2011-06-168-51/+294
|\ \ \ | | |/ | |/|
| * | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-06-106-42/+201
| |\ \
| | * | Fixes to how resize event and layout request are posted.Jan-Arve Saether2011-06-106-42/+201
| * | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-05-272-2/+74
| |\ \ \ | | |/ /
| | * | Fixed move a QGraphicsWidget and invalidate its layout at the same timeJohn Tapsell2011-05-272-2/+74
| * | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-05-278018-132856/+156679
| |\ \ \ | | |/ /
| | * | Fix infinite recursion when changing geometry on MacGabriel de Dietrich2011-05-262-7/+19
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-06-101-2/+5
|\ \ \ \
| * | | | Fixing OpenGL module build error on SolarisMartin Pejcoch2011-06-101-2/+5
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-06-102-2/+7
|\ \ \ \ \
| * | | | | Fix dialog position adjustment regression in SymbianMiikka Heikkinen2011-06-101-0/+5
| * | | | | SSL readbuffer 16->32 kBJaakko Koskenkorva2011-06-101-2/+2
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-06-092-0/+28
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Add missing freeTexture() from fix for QTBUG-19180Jani Hautakangas2011-06-092-0/+28
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-06-092-7/+61
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Limit the cookies count per domain to 50.Jocelyn Turcotte2011-06-092-7/+61
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-06-0914-291/+198
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Last word inputted was duplicated after input method hints changedSami Merila2011-06-091-0/+1
| * | | | | Simplify texture pooling logic in GL graphics system.Jani Hautakangas2011-06-0913-291/+197
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-06-081-0/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Update internal state before emitting configurationChanged() signals.Xizhi Zhu2011-06-081-0/+1
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-06-085-15/+15
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Fixed qmlshadersplugin manual test shaders on SGX family GPU:s.Marko Niemelä2011-06-084-5/+5
| * | | | | Fixed qmlshadersplugin on windows VC2008 toolchain.Marko Niemelä2011-06-081-10/+10
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-06-071-0/+5
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Reset input context in Symbian when another window is opened.Miikka Heikkinen2011-06-071-0/+5
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-06-071-0/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | KERN-EXEC 3 panic in QCoeFepInputContext::translateInputWidget()Sami Merila2011-06-071-0/+2
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-06-066-0/+29
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Close context menus during orientation change.Laszlo Agocs2011-06-061-0/+7
| * | | | | Have -small-screen enabled in certain examples on Symbian always.Laszlo Agocs2011-06-065-0/+22
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-06-067-168/+274
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Update Japanese translations.Takumi ASAKI2011-06-067-168/+274
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-06-041-7/+7
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Fix for winscw QtGui.defJani Hautakangas2011-06-021-7/+7
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-06-045-36/+16
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Revert some of "Make QMLViewer startup animation stop after a while"Alan Alpert2011-06-033-36/+0
| * | | | | Add private method for flushing the pixmap cache.Michael Brasser2011-06-022-0/+16
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-06-015-8/+30
|\ \ \ \ \ \
| * | | | | | Avoid buffer overrun in QMacPixmapData resizingJiang Jiang2011-05-311-1/+1
| * | | | | | Fix glyph metrics with QStaticText/Freetype/raster and light/no hintingEskil Abrahamsen Blomfeldt2011-05-311-0/+9
| * | | | | | Missing glyphs transforming QStaticText on X11/raster with subpixel AAEskil Abrahamsen Blomfeldt2011-05-302-7/+11
| * | | | | | Fixed clipping errors for non-extended paint engines.Samuel Rødal2011-05-301-0/+9
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-06-011-0/+20
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Fix QTreeWidget autotest cases on Symbian/VGASami Merila2011-06-011-0/+20