summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-06-08159-1526/+9423
|\
| * Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-06-081-0/+1
| |\
| | * 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 remote branch 'upstream/4.8' into qt-4.8-from-4.7Toby Tomkins2011-06-0857-1436/+500
| |\ \ \
| * \ \ \ Merge remote branch 'upstream/4.7' into qt-4.8-from-4.7Toby Tomkins2011-06-086-15/+20
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | 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 into qt-4.8-from-4.7Qt Continuous Integration System2011-06-077-0/+31
| |\ \ \ \ \ | | |/ / / /
| | * | | | 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 into qt-4.8-from-4.7Qt Continuous Integration System2011-06-067-168/+274
| |\ \ \ \ \ | | |/ / / /
| | * | | | 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' into qt-4.8-from-4.7Liang Qi2011-06-0611-44/+61
| |\ \ \ \ \ | | |/ / / /
| | * | | | 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
| * | | | | | | Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7Liang Qi2011-06-069-242/+204
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote branch 'origin/4.7' into 4.8-from-4.7Rohan McGovern2011-06-018-118/+46
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-06-012-28/+29
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | |
| | | * | | | | | QDeclarative: Fix QPerformanceTimer on SymbianKai Koehne2011-06-012-28/+29
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-06-016-91/+18
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Jaakko Koskenkorva2011-06-011-3/+3
| | | |\ \ \ \ \ \
| | | | * | | | | | Fix pixel metrics for Symbian VGA devicesSami Merila2011-05-311-3/+3
| | | * | | | | | | Increase SSL readbuffer 1 -> 16 kBJaakko Koskenkorva2011-05-311-2/+2
| | | |/ / / / / /
| | | * | | | | | Revert "Fix QNetworkConfigurationManager usage outside main thread first"Shane Kearns2011-05-313-86/+4
| | | * | | | | | Fix tst_QGraphicsItem::sorting() test case for SymbianMiikka Heikkinen2011-05-311-0/+9
| * | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-31114-204/+7808
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-306-30/+60
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Fix QHeaderView test case for VGA Symbian devices.Miikka Heikkinen2011-05-301-1/+11
| | | * | | | | | Fix for BCM2727 chip detection on SymbianJani Hautakangas2011-05-304-28/+38
| | | * | | | | | Fix QMenuBar autotest failures for SymbianSami Merila2011-05-302-1/+11
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-301-1/+1
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Fixed contains check casing in mmf.pro fileTomi Vihria2011-05-301-1/+1