Merge 5.13 into 5.13.2

Change-Id: Id8852e90bfc5e4bd3e344435195992c5c7a0ab86

3 files changed, 13 insertions, 4 deletions

diff --git a/tests/auto/gui/image/qmovie/tst_qmovie.cpp b/tests/auto/gui/image/qmovie/tst_qmovie.cpp
index 4e9e9b8115..c8217b2cec 100644
--- a/tests/auto/gui/image/qmovie/tst_qmovie.cpp
+++ b/tests/auto/gui/image/qmovie/tst_qmovie.cpp
@@ -62,6 +62,7 @@ private slots:
 #ifndef QT_NO_WIDGETS
     void infiniteLoop();
 #endif
+    void emptyMovie();
 };
 
 // Testing get/set functions
@@ -220,5 +221,13 @@ void tst_QMovie::infiniteLoop()
 }
 #endif
 
+void tst_QMovie::emptyMovie()
+{
+    QMovie movie;
+    movie.setCacheMode(QMovie::CacheAll);
+    movie.jumpToFrame(100);
+    QCOMPARE(movie.currentFrameNumber(), -1);
+}
+
 QTEST_MAIN(tst_QMovie)
 #include "tst_qmovie.moc"
diff --git a/tests/auto/network/ssl/qdtls/tst_qdtls.cpp b/tests/auto/network/ssl/qdtls/tst_qdtls.cpp
index 6a94eee389..4dfdf14e5b 100644
--- a/tests/auto/network/ssl/qdtls/tst_qdtls.cpp
+++ b/tests/auto/network/ssl/qdtls/tst_qdtls.cpp
@@ -1131,7 +1131,7 @@ void tst_QDtls::handshakeReadyRead()
     QUdpSocket *socket = qobject_cast<QUdpSocket *>(sender());
     Q_ASSERT(socket);
 
-    if (!socket->pendingDatagramSize())
+    if (socket->pendingDatagramSize() <= 0)
         return;
 
     const bool isServer = socket == &serverSocket;
diff --git a/tests/auto/network/ssl/qdtlscookie/tst_qdtlscookie.cpp b/tests/auto/network/ssl/qdtlscookie/tst_qdtlscookie.cpp
index c90e9cb2c8..a273ceaa17 100644
--- a/tests/auto/network/ssl/qdtlscookie/tst_qdtlscookie.cpp
+++ b/tests/auto/network/ssl/qdtlscookie/tst_qdtlscookie.cpp
@@ -352,7 +352,7 @@ void tst_QDtlsCookie::receiveMessage(QUdpSocket *socket, QByteArray *message,
 {
     Q_ASSERT(socket && message);
 
-    if (!socket->pendingDatagramSize())
+    if (socket->pendingDatagramSize() <= 0)
         testLoop.enterLoopMSecs(handshakeTimeoutMS);
 
     QVERIFY(!testLoop.timeout());
@@ -377,7 +377,7 @@ void tst_QDtlsCookie::serverReadyRead()
 {
     Q_ASSERT(clientsToWait);
 
-    if (!serverSocket.pendingDatagramSize())
+    if (serverSocket.pendingDatagramSize() <= 0)
         return;
 
     QByteArray hello;
@@ -410,7 +410,7 @@ void tst_QDtlsCookie::clientReadyRead()
     QUdpSocket *clientSocket = qobject_cast<QUdpSocket *>(sender());
     Q_ASSERT(clientSocket);
 
-    if (!clientSocket->pendingDatagramSize())
+    if (clientSocket->pendingDatagramSize() <= 0)
         return;
 
     QDtls *handshake = nullptr;