summaryrefslogtreecommitdiffstats
path: root/src/plugins/bearer
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-03-23 23:23:07 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-03-23 23:23:07 (GMT)
commitf5812ae1b669daa921eeabc903ec0eafcfe0c030 (patch)
treec974794591a8ac041c8cba650a2d3d44efdf6b0c /src/plugins/bearer
parent20c6b8ffcf90602127e9b524f3828dc6b6e0f59b (diff)
parenta5c3c11e3e2204da6c8be9af98b38929366fafb8 (diff)
downloadQt-f5812ae1b669daa921eeabc903ec0eafcfe0c030.zip
Qt-f5812ae1b669daa921eeabc903ec0eafcfe0c030.tar.gz
Qt-f5812ae1b669daa921eeabc903ec0eafcfe0c030.tar.bz2
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Fixed drawImage() not to attempt drawing null images on openvg. QS60Style: Update placeholder texture to real one Text bounding rect calculated incorrectly if non-top aligned. Bump Qt version to 4.7.4 Return SV_S60_5_2 / SV_SF_3 for next gen Symbian platform. Remove incorrect check in qpixmap autotest. Change the pooled QGLPixmapData to be backed by QVolatileImage. Started changes-4.7.4 file Fix endianness detection with gcc 4.6 -flto -fwhole-program remove redundand validateModes() call Changed s60 style not to rely on QPixmapData::toNativeType(). Add missing bitmap locking to QVGPixmapData::fromNativeType. Don't crash calling QTextDocument::blockBoundingRect on invalid block Prepare fromSymbianCFbsBitmap autotest for 16 bpp format. Fix writing to an attached property from script. fixes/improvements for new QML right-to-left docs Fix license headers in example code Write Qt Quick 1.1 right-to-left documentation and examples Doc fix - QtQuick 1.1 scheduling
Diffstat (limited to 'src/plugins/bearer')
0 files changed, 0 insertions, 0 deletions