summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' into qt-4.8-from-4.7Liang Qi2011-06-0610-44/+41
|\
| * 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 remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7Liang Qi2011-06-068-234/+192
|\ \ \ \ \
| * | | | | drop the SysV semaphores -specific code out from QWSSignalHandlerRitt Konstantin2011-06-014-54/+54
| * | | | | minor refactoring of the QWSLock classRitt Konstantin2011-06-012-68/+47
| * | | | | simplify the code by using the EINTR_LOOP macroRitt Konstantin2011-06-011-36/+36
| * | | | | simplify the semaphores initializationRitt Konstantin2011-06-011-17/+6
| * | | | | minor refactoring of the QLock classRitt Konstantin2011-06-011-82/+46
| * | | | | add a warning on an incorrect usage of QLockRitt Konstantin2011-06-011-0/+2
| * | | | | make sure we really clear all locksRitt Konstantin2011-06-011-1/+1
| * | | | | fix build with QT_NO_QWS_SIGNALHANDLERRitt Konstantin2011-06-014-5/+29
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-05-313-8/+8
| |\ \ \ \ \
| | * | | | | Fix build in C++0x modeBernhard Rosenkraenzer2011-05-313-8/+8
* | | | | | | Merge remote branch 'origin/4.7' into 4.8-from-4.7Rohan McGovern2011-06-015-45/+37
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | 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-013-17/+8
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | 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-311-12/+3
* | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-3147-153/+3008
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-304-29/+39
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Fix for BCM2727 chip detection on SymbianJani Hautakangas2011-05-304-28/+38
| | * | | | | Fix QMenuBar autotest failures for SymbianSami Merila2011-05-301-1/+1
| * | | | | | 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
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-287-11/+50
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Documented Symbian peculiarity about QDesktopWidget::availableGeometryMiikka Heikkinen2011-05-271-0/+10
| | * | | | | Fix non-Symbian builds broken by previous commit.Miikka Heikkinen2011-05-273-6/+6
| | * | | | | Fix SYMBIAN_VERSION_* ifdeffingMiikka Heikkinen2011-05-274-9/+9
| | * | | | | Predictive text is not committed when writing in a QLineEditSami Merila2011-05-262-2/+31
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-2714-108/+38
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Remove unnecessary QtQuick 1.1 effectiveLayoutDirection, effectiveHorizontalA...Joona Petrell2011-05-2714-108/+38
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-2623-8/+2892
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Fixed more CI-errors caused by qmlshadersplugin addition.Marko Niemelä2011-05-261-1/+1
| | * | | | | Fixed CI-errors caused by qmlshadersplugin addition.Marko Niemelä2011-05-264-9/+9
| | * | | | | Fixing Linux compatibility issues for SymbianTomi Vihria2011-05-254-27/+39
| | * | | | | Backported QML ShaderEffectItem from QML2.0 into Qt Quick 1.1Marko Niemelä2011-05-2516-0/+2855
| | * | | | | Revert "Fixing Linux compatibility issues for Symbian"Laszlo Agocs2011-05-257-32/+45
| | * | | | | sockets: limit buffer size of the internal sockets in proxy enginesShane Kearns2011-05-242-0/+4