diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-11 18:35:41 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-11 18:35:41 (GMT) |
commit | 263bdc38f494e5d0be69b61c92ca6456fc4db330 (patch) | |
tree | c18351b345ff69c3d412ebd9d5802e00e91fb8c2 /mkspecs | |
parent | 0bbc19d5721c8c00f2b3c6cb28cca2d0adfda315 (diff) | |
parent | 319f4f07c80664d6e244daf22d9b4c13e5d4e69a (diff) | |
download | Qt-263bdc38f494e5d0be69b61c92ca6456fc4db330.zip Qt-263bdc38f494e5d0be69b61c92ca6456fc4db330.tar.gz Qt-263bdc38f494e5d0be69b61c92ca6456fc4db330.tar.bz2 |
Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (22 commits)
QSslSocket: fix security vulnerability with wildcard IP addresses
fix build for -no-qt3support
Fix handling of SSL certificates with wildcard domain names
Doc: typo fixed in qlibraryinfo.cpp
Fixes for combining multiple Qt::ImhXXXOnly with S60 FEP
fix compile error
Test code for input method hints
Make input methods work correctly with Symbian^3 FEP in numeric mode
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( bbff6182e525fcf58dbc7426a1fbbf8f31588214 )
Improving text coordinate rounding in the OpenVG paint engine
Add QDir::homePath() for the log file in QTestFileLogger in testlib on Symbian, both hardware and emulator.
Fixed test regression on Mac
Don't resolve GLSL extensions if no shaders
setUniformValue(QSize) was setting (w,w) not (w,h)
Fixed build break on Symbian versions earlier than S^3
Enabled tst_mediaobject::testPlayFromResource on Symbian
Added support to Phonon MMF backend for playback of Qt resource files
Updated tst_mediaobject resource playback test cases
Added support to Phonon MMF backend for playback of Qt resource files
Fix proxy widgets with the OpenVG paint engine.
...
Diffstat (limited to 'mkspecs')
0 files changed, 0 insertions, 0 deletions