Merge remote-tracking branch 'origin/5.8' into 5.9

Conflicts:
	src/corelib/plugin/qlibrary_unix.cpp
	src/plugins/platforms/xcb/qxcbconnection.cpp
	tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp

Change-Id: I632c400d909f8c204f55743aadc7886af2f15dfb

1 files changed, 4 insertions, 2 deletions

diff --git a/tests/auto/corelib/thread/qsemaphore/tst_qsemaphore.cpp b/tests/auto/corelib/thread/qsemaphore/tst_qsemaphore.cpp
index f1eb32a282..2970b2e118 100644
--- a/tests/auto/corelib/thread/qsemaphore/tst_qsemaphore.cpp
+++ b/tests/auto/corelib/thread/qsemaphore/tst_qsemaphore.cpp
@@ -367,16 +367,18 @@ public:
     void run();
 };
 
+static const int Timeout = 60 * 1000; // 1min
+
 void Producer::run()
 {
     for (int i = 0; i < DataSize; ++i) {
-        freeSpace.acquire();
+        QVERIFY(freeSpace.tryAcquire(1, Timeout));
         buffer[i % BufferSize] = alphabet[i % AlphabetSize];
         usedSpace.release();
     }
     for (int i = 0; i < DataSize; ++i) {
         if ((i % ProducerChunkSize) == 0)
-            freeSpace.acquire(ProducerChunkSize);
+            QVERIFY(freeSpace.tryAcquire(ProducerChunkSize, Timeout));
         buffer[i % BufferSize] = alphabet[i % AlphabetSize];
         if ((i % ProducerChunkSize) == (ProducerChunkSize - 1))
             usedSpace.release(ProducerChunkSize);