summaryrefslogtreecommitdiffstats
path: root/src/gui/painting/qpaintengine_p.h
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-03-14 19:12:13 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-03-14 19:12:13 (GMT)
commitb1494900fd45c38e8c21f30311a642981c0fd795 (patch)
treef0b7fe9d51f1a07ac7e19954e04ecfd8aad81854 /src/gui/painting/qpaintengine_p.h
parent5ab400b3b9c905b1cb2aeaa38534329588259c09 (diff)
parentcdd52ad8acff0af2ecca1cef982228c6bb489feb (diff)
downloadQt-b1494900fd45c38e8c21f30311a642981c0fd795.zip
Qt-b1494900fd45c38e8c21f30311a642981c0fd795.tar.gz
Qt-b1494900fd45c38e8c21f30311a642981c0fd795.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QNAM HTTP: error() in case connection is closed unexpectedly SSL: Fix certification loading on Mac OS X 10.5
Diffstat (limited to 'src/gui/painting/qpaintengine_p.h')
0 files changed, 0 insertions, 0 deletions