summaryrefslogtreecommitdiffstats
path: root/LGPL_EXCEPTION.txt
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-09-17 17:07:55 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-09-17 17:07:55 (GMT)
commit4f33dbd5361c0875f39518b762a764478f04dd30 (patch)
tree0ac6715405dba0e08cefa5a3d07241fe01a93445 /LGPL_EXCEPTION.txt
parent502f0e852b7e4ef00162246568d7cb7e2dfcae58 (diff)
parentfa373ee165b32b712690656a5f69f862292a2c1e (diff)
downloadQt-4f33dbd5361c0875f39518b762a764478f04dd30.zip
Qt-4f33dbd5361c0875f39518b762a764478f04dd30.tar.gz
Qt-4f33dbd5361c0875f39518b762a764478f04dd30.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Export qt_directfb_.* functions in plugin as well Added autotest for QPixmap::size() with null pixmaps. Update Symbian def files. QGraphicsItem::childrenBoundingRect behavior breaks QGraphicsEffect::sourceBoundingRect(). Wrong bounding rect returned by QGraphicsEffect::boundingRect(). Compile on Mac Ensure building of WebKit and QtConcurrent are disabled with SunCC.
Diffstat (limited to 'LGPL_EXCEPTION.txt')
0 files changed, 0 insertions, 0 deletions