Ticket #296: 296.diff

File 296.diff, 1.5 KB (added by Silvan Scherrer, 10 years ago)

diff for ssl problem and a gcc 473 fix qtgui4

  • src/gui/painting/qwindowsurface_pm.cpp

     
    11991199
    12001200    if (DiveAcquireFrameBuffer(d->hDive, &rclDst) == DIVE_SUCCESS) {
    12011201        // take each visible rectangle and blit it
    1202         for (ULONG i = 0; i < d->setup.ulNumDstRects; ++i) {
    1203             RECTL rcl = d->setup.pVisDstRects[i];
     1202        for (ULONG j = 0; j < d->setup.ulNumDstRects; ++j) {
     1203            RECTL rcl = d->setup.pVisDstRects[j];
    12041204
    12051205            if (rcl.xLeft < src.left())
    12061206              rcl.xLeft = src.left();
  • src/network/ssl/qsslconfiguration.cpp

     
    213213*/
    214214QSsl::SslProtocol QSslConfiguration::protocol() const
    215215{
    216     return d ? d->protocol : QSsl::SslV3;
     216    return d ? d->protocol : QSsl::TlsV1;
    217217}
    218218
    219219/*!
  • src/network/ssl/qsslconfiguration_p.h

     
    8080{
    8181public:
    8282    QSslConfigurationPrivate()
    83         : protocol(QSsl::SslV3),
     83        : protocol(QSsl::TlsV1),
    8484          peerVerifyMode(QSslSocket::AutoVerifyPeer),
    8585          peerVerifyDepth(0)
    8686    { }