diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-28 03:02:25 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-28 03:02:31 +0200 |
| commit | e32b4856308c0c9c7566031022242594fd5425bf (patch) | |
| tree | f0c61b6e13c7cb0c906b681c07a7e7f6e72a0db8 /src/serialport/qserialport_win.cpp | |
| parent | e491b2ce3f1ece9959a66624b934bf41428b2d76 (diff) | |
| parent | e3f090032bf0492162713fd61268a42f591e2986 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"
Diffstat (limited to 'src/serialport/qserialport_win.cpp')
| -rw-r--r-- | src/serialport/qserialport_win.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/serialport/qserialport_win.cpp b/src/serialport/qserialport_win.cpp index da1e7aae..c0061fc9 100644 --- a/src/serialport/qserialport_win.cpp +++ b/src/serialport/qserialport_win.cpp @@ -246,7 +246,7 @@ bool QSerialPortPrivate::open(QIODevice::OpenMode mode) { { QMutexLocker locker(&helper()->mutex); - static bool symbolsResolved = resolveSymbols(&helper()->ntLibrary); + static bool symbolsResolved = resolveNtdllSymbols(&helper()->ntLibrary); if (!symbolsResolved) { setError(QSerialPortErrorInfo(QSerialPort::OpenError, helper()->ntLibrary.errorString())); |