Merge branch '4.8-upstream' into master-water

3 files changed, 55 insertions, 0 deletions

diff --git a/tests/auto/qgroupbox/tst_qgroupbox.cpp b/tests/auto/qgroupbox/tst_qgroupbox.cpp
index f1388bc..f3d26ef 100644
--- a/tests/auto/qgroupbox/tst_qgroupbox.cpp
+++ b/tests/auto/qgroupbox/tst_qgroupbox.cpp
@@ -83,6 +83,7 @@ private slots:
     void toggledVsClicked();
     void childrenAreDisabled();
     void propagateFocus();
+    void task_QTBUG_19170_ignoreMouseReleseEvent();
 
 private:
     bool checked;
@@ -473,5 +474,27 @@ void tst_QGroupBox::propagateFocus()
     QTRY_COMPARE(qApp->focusWidget(), static_cast<QWidget*>(&lineEdit));
 }
 
+void tst_QGroupBox::task_QTBUG_19170_ignoreMouseReleseEvent()
+{
+    QGroupBox box;
+    box.setCheckable(true);
+    box.setChecked(false);
+    box.setTitle("This is a test for QTBUG-19170");
+    box.show();
+
+    QStyleOptionGroupBox option;
+    option.initFrom(&box);
+    option.subControls = QStyle::SubControls(QStyle::SC_All);
+    QRect rect = box.style()->subControlRect(QStyle::CC_GroupBox, &option,
+                                             QStyle::SC_GroupBoxCheckBox, &box);
+
+    QTest::mouseClick(&box, Qt::LeftButton, 0, rect.center());
+    QCOMPARE(box.isChecked(), true);
+
+    box.setChecked(false);
+    QTest::mouseRelease(&box, Qt::LeftButton, 0, rect.center());
+    QCOMPARE(box.isChecked(), false);
+}
+
 QTEST_MAIN(tst_QGroupBox)
 #include "tst_qgroupbox.moc"
diff --git a/tests/auto/qintvalidator/tst_qintvalidator.cpp b/tests/auto/qintvalidator/tst_qintvalidator.cpp
index d537635..7e36093 100644
--- a/tests/auto/qintvalidator/tst_qintvalidator.cpp
+++ b/tests/auto/qintvalidator/tst_qintvalidator.cpp
@@ -168,6 +168,15 @@ void tst_QIntValidator::validate_data()
     QTest::newRow("8.9") << -1 << 100 << QString("5") << ACC;
     QTest::newRow("8.10") << -1 << 100 << QString("+") << INT;
     QTest::newRow("8.11") << -1 << 100 << QString("+50") << ACC;
+
+    QTest::newRow("9.0") << -10 << 10 << QString("000") << ACC;
+    QTest::newRow("9.1") << -10 << 10 << QString("008") << ACC;
+    QTest::newRow("9.2") << -10 << 10 << QString("-008") << ACC;
+    QTest::newRow("9.3") << -10 << 10 << QString("00010") << ACC;
+    QTest::newRow("9.4") << -10 << 10 << QString("-00010") << ACC;
+    QTest::newRow("9.5") << -10 << 10 << QString("00020") << INV;
+    QTest::newRow("9.6") << -10 << 10 << QString("-00020") << INV;
+
 }
 
 void tst_QIntValidator::validateArabic()
diff --git a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
index 9df820a..14ad6a9 100644
--- a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
@@ -368,6 +368,7 @@ private Q_SLOTS:
     void qtbug15311doubleContentLength();
 
     void qtbug18232gzipContentLengthZero();
+    void nb279420gzipNoContentLengthEmptyContentDisconnect();
 
     void synchronousRequest_data();
     void synchronousRequest();
@@ -6139,6 +6140,28 @@ void tst_QNetworkReply::qtbug18232gzipContentLengthZero()
     QCOMPARE(reply->readAll(), QByteArray());
 }
 
+// Reproduced a crash in QHttpNetworkReplyPrivate::gunzipBodyPartiallyEnd
+// where zlib inflateEnd was called for uninitialized zlib stream
+void tst_QNetworkReply::nb279420gzipNoContentLengthEmptyContentDisconnect()
+{
+    // Response with no Content-Length in header and empty content
+    QByteArray response("HTTP/1.0 200 OK\r\nContent-Encoding: gzip\r\n\r\n");
+    MiniHttpServer server(response);
+    server.doClose = true;
+
+    QNetworkRequest request(QUrl("http://localhost:" + QString::number(server.serverPort())));
+    QNetworkReplyPtr reply = manager.get(request);
+
+    connect(reply, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop()));
+    QTestEventLoop::instance().enterLoop(10);
+    QVERIFY(!QTestEventLoop::instance().timeout());
+    QVERIFY(reply->isFinished());
+    QCOMPARE(reply->error(), QNetworkReply::NoError);
+    QCOMPARE(reply->size(), qint64(0));
+    QVERIFY(!reply->header(QNetworkRequest::ContentLengthHeader).isValid());
+    QCOMPARE(reply->readAll(), QByteArray());
+}
+
 void tst_QNetworkReply::synchronousRequest_data()
 {
     QTest::addColumn<QUrl>("url");