Merge remote-tracking branch 'origin/5.14' into 5.15

Change-Id: I5224b5071f216cfc8e7a92a5c47f0ddc0551071b

7 files changed, 88 insertions, 60 deletions

diff --git a/config.tests/ntddmodm/main.cpp b/config.tests/ntddmodm/main.cpp
deleted file mode 100644
index a881f874..00000000
--- a/config.tests/ntddmodm/main.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 Denis Shienkov <denis.shienkov@gmail.com>
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtSerialPort module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <windows.h>
-#include <ntddmodm.h>
-
-int main(int, char**)
-{
-    GUID guid = GUID_DEVINTERFACE_MODEM;
-    return 0;
-}
diff --git a/config.tests/ntddmodm/ntddmodm.pro b/config.tests/ntddmodm/ntddmodm.pro
deleted file mode 100644
index abb9ba83..00000000
--- a/config.tests/ntddmodm/ntddmodm.pro
+++ /dev/null
@@ -1,4 +0,0 @@
-CONFIG -= qt
-CONFIG += console
-
-SOURCES += main.cpp
diff --git a/configure.json b/configure.json
index 16857005..fdfda244 100644
--- a/configure.json
+++ b/configure.json
@@ -1,4 +1,5 @@
 {
-    "module": "serialport",
-    "condition": "!config.integrity && !config.vxworks && !config.winrt && !config.uikit && !config.wasm"
+    "subconfigs": [
+         "src/serialport"
+    ]
 }
diff --git a/dist/changes-5.12.5 b/dist/changes-5.12.5
new file mode 100644
index 00000000..e8be9316
--- /dev/null
+++ b/dist/changes-5.12.5
@@ -0,0 +1,20 @@
+Qt 5.12.5 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.12.0 through 5.12.4.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+https://doc.qt.io/qt-5/index.html
+
+The Qt version 5.12 series is binary compatible with the 5.11.x series.
+Applications compiled for 5.11 will continue to run with 5.12.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+ - This release contains only minor code improvements.
diff --git a/dist/changes-5.13.1 b/dist/changes-5.13.1
new file mode 100644
index 00000000..57ebdbeb
--- /dev/null
+++ b/dist/changes-5.13.1
@@ -0,0 +1,20 @@
+Qt 5.13.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.13.0.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+https://doc.qt.io/qt-5/index.html
+
+The Qt version 5.13 series is binary compatible with the 5.12.x series.
+Applications compiled for 5.12 will continue to run with 5.13.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+ - This release contains only minor code improvements.
diff --git a/src/serialport/configure.json b/src/serialport/configure.json
new file mode 100644
index 00000000..f0e6c76e
--- /dev/null
+++ b/src/serialport/configure.json
@@ -0,0 +1,42 @@
+{
+    "module": "serialport",
+    "condition": "!config.integrity && !config.vxworks && !config.winrt && !config.uikit && !config.wasm",
+    "depends": [
+            "core"
+    ],
+    "condition": "module.core",
+
+    "tests": {
+        "ntddmodm": {
+            "label": "ntddmodm",
+            "type": "compile",
+            "test": {
+                "include": [ "windows.h", "ntddmodm.h"],
+                "main": [
+                    "GUID guid = GUID_DEVINTERFACE_MODEM;"
+                ]
+            }
+        }
+    },
+
+    "features": {
+        "ntddmodm": {
+            "label": "ntddmodm",
+            "disable": "input.ntddmodm == 'no'",
+            "condition": "tests.ntddmodm",
+            "output": [
+                "privateFeature",
+                { "type": "define", "negative": true, "name": "QT_NO_REDEFINE_GUID_DEVINTERFACE_MODEM" }
+            ]
+        }
+    },
+
+    "summary": [
+        {
+            "section": "Serial Port",
+            "entries": [
+                "ntddmodm"
+            ]
+        }
+    ]
+}
diff --git a/src/serialport/qwinoverlappedionotifier.cpp b/src/serialport/qwinoverlappedionotifier.cpp
index 233ee696..615dacc9 100644
--- a/src/serialport/qwinoverlappedionotifier.cpp
+++ b/src/serialport/qwinoverlappedionotifier.cpp
@@ -129,7 +129,6 @@ public:
     HANDLE hSemaphore = nullptr;
     HANDLE hResultsMutex = nullptr;
     QAtomicInt waiting;
-    QAtomicInt pendingNotifications;
     QQueue<IOResult> results;
 };
 
@@ -396,17 +395,14 @@ void QWinOverlappedIoNotifierPrivate::notify(DWORD numberOfBytes, DWORD errorCod
     results.enqueue(IOResult(numberOfBytes, errorCode, overlapped));
     ReleaseMutex(hResultsMutex);
     ReleaseSemaphore(hSemaphore, 1, NULL);
-    if (!waiting && pendingNotifications-- == 0)
+    if (!waiting)
         emit q->_q_notify();
 }
 
 void QWinOverlappedIoNotifierPrivate::_q_notified()
 {
-    int n = pendingNotifications.fetchAndStoreAcquire(0);
-    while (--n >= 0) {
-        if (WaitForSingleObject(hSemaphore, 0) == WAIT_OBJECT_0)
-            dispatchNextIoResult();
-    }
+    if (WaitForSingleObject(hSemaphore, 0) == WAIT_OBJECT_0)
+        dispatchNextIoResult();
 }
 
 OVERLAPPED *QWinOverlappedIoNotifierPrivate::dispatchNextIoResult()