diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-26 12:03:04 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-26 12:03:04 (GMT) |
commit | dbfc08cf8de75439f78f2b10a6b487ff23735f69 (patch) | |
tree | a9aaa06873a938eda1ae933410738bd4e240819c /doc | |
parent | 4a7b3a10da5b3bd63b6f8a6c0cc53ee22c60fe60 (diff) | |
parent | 180e6ca43cde0c80dd6e3f9539236ffd259d2bdb (diff) | |
download | Qt-dbfc08cf8de75439f78f2b10a6b487ff23735f69.zip Qt-dbfc08cf8de75439f78f2b10a6b487ff23735f69.tar.gz Qt-dbfc08cf8de75439f78f2b10a6b487ff23735f69.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixed more CI-errors caused by qmlshadersplugin addition.
Fixed CI-errors caused by qmlshadersplugin addition.
Fixing Linux compatibility issues for Symbian
Update the detection of is_using_gnupoc for S3.
Backported QML ShaderEffectItem from QML2.0 into Qt Quick 1.1
Revert "Fixing Linux compatibility issues for Symbian"
sockets: limit buffer size of the internal sockets in proxy engines
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions