Ticket #296: 296.diff

src/gui/painting/qwindowsurface_pm.cpp

@@ -1199 +1199 @@
 
     if (DiveAcquireFrameBuffer(d->hDive, &rclDst) == DIVE_SUCCESS) {
         // take each visible rectangle and blit it
-        for (ULONG i = 0; i < d->setup.ulNumDstRects; ++i) {
-            RECTL rcl = d->setup.pVisDstRects[i];
+        for (ULONG j = 0; j < d->setup.ulNumDstRects; ++j) {
+            RECTL rcl = d->setup.pVisDstRects[j];
 
             if (rcl.xLeft < src.left())
               rcl.xLeft = src.left();

src/network/ssl/qsslconfiguration.cpp

@@ -213 +213 @@
 */
 QSsl::SslProtocol QSslConfiguration::protocol() const
 {
-    return d ? d->protocol : QSsl::SslV3;
+    return d ? d->protocol : QSsl::TlsV1;
 }
 
 /*!

src/network/ssl/qsslconfiguration_p.h

@@ -80 +80 @@
 {
 public:
     QSslConfigurationPrivate()
-        : protocol(QSsl::SslV3),
+        : protocol(QSsl::TlsV1),
           peerVerifyMode(QSslSocket::AutoVerifyPeer),
           peerVerifyDepth(0)
     { }