summaryrefslogtreecommitdiffstats
path: root/src/gui/egl
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-04-14 03:47:08 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-04-14 03:47:08 (GMT)
commit4af9cc043370846c52ec21cf874696ee650394c1 (patch)
treed3ac24631fb9e759e399042c65000fa5f0ee6ea9 /src/gui/egl
parent0def696a8d569f0895010706fb989e78b25c13c1 (diff)
parentd2d4be2901ef1e377ea77b447632fe29d3adac33 (diff)
downloadQt-4af9cc043370846c52ec21cf874696ee650394c1.zip
Qt-4af9cc043370846c52ec21cf874696ee650394c1.tar.gz
Qt-4af9cc043370846c52ec21cf874696ee650394c1.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: Revert change 07c347f54 from 4.6. Implement some changes to the AIX xlC mkspec suggested by IBM. Fixed app freeze if switching to offline in middle of HTTP transaction. Document Symbian platform security requirements on Qt APIs Fixed app freeze if switching to offline in middle of HTTP transaction. CSS: fixes border only affecting the first widget. Removed QtDeclarative.dll deployment from qt.iby in 4.6 branch. fix closing state in QLocalSocket on Windows Fix segfault, if QPixmap::loadFromData() fails Don't build QtXmlPatterns' command line tools on Symbian.
Diffstat (limited to 'src/gui/egl')
0 files changed, 0 insertions, 0 deletions