diff options
| author | Karsten Heimrich <karsten.heimrich@qt.io> | 2020-10-23 09:43:49 +0200 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@qt.io> | 2020-11-09 22:08:31 +0200 |
| commit | 5f97dc372e26efc780aeb0e28416d227bde3d376 (patch) | |
| tree | 5fb3961b3f29e146e8a5a3cc4818079f14fd319b | |
| parent | 0b359afde6575f81b699f0baf80edbb2904a56b9 (diff) | |
Compile fix, update qtbase dependency6.0.0
Change-Id: Ic80537d02f8bf1ea19356dad5e4ea07992db7fa9
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| -rw-r--r-- | dependencies.yaml | 2 | ||||
| -rw-r--r-- | src/knx/dpt/qknxutf8string.cpp | 2 | ||||
| -rw-r--r-- | src/knx/ssl/qknxssl_openssl.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/dependencies.yaml b/dependencies.yaml index e02a885..fe67a86 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,4 +1,4 @@ dependencies: ../qtbase: - ref: 56f40cdca6b589beec5c2cb803633985ca4c59d1 + ref: e356ab2c32248838f70fce38b35294a151a7e278 required: true diff --git a/src/knx/dpt/qknxutf8string.cpp b/src/knx/dpt/qknxutf8string.cpp index bdeadc6..e4f20d7 100644 --- a/src/knx/dpt/qknxutf8string.cpp +++ b/src/knx/dpt/qknxutf8string.cpp @@ -139,7 +139,7 @@ bool QKnxUtf8String::setString(const char *string, int size) if (!toUtf16.isValid()) return false; - auto text = toUtf16(string, size); + auto text = toUtf16(QByteArrayView{ string, size }); if (toUtf16.hasError()) return false; return setString(text); diff --git a/src/knx/ssl/qknxssl_openssl.cpp b/src/knx/ssl/qknxssl_openssl.cpp index db07366..93bf4f2 100644 --- a/src/knx/ssl/qknxssl_openssl.cpp +++ b/src/knx/ssl/qknxssl_openssl.cpp @@ -58,7 +58,7 @@ bool QKnxOpenSsl::s_libraryLoaded = false; bool QKnxOpenSsl::s_libraryEnabled = false; Q_GLOBAL_STATIC(QKnxOpenSsl, qt_QKnxOpenSsl) -Q_GLOBAL_STATIC_WITH_ARGS(QMutex, qt_knxOpenSslInitMutex, (QMutex::Recursive)) +Q_GLOBAL_STATIC(QRecursiveMutex, qt_knxOpenSslInitMutex) /*! \internal @@ -69,7 +69,7 @@ bool QKnxOpenSsl::supportsSsl() if (!QKnxPrivate::q_resolveOpenSslSymbols()) return false; - const QMutexLocker locker(qt_knxOpenSslInitMutex); + const QMutexLocker<QRecursiveMutex> locker(qt_knxOpenSslInitMutex); if (!s_libraryLoaded) { s_libraryLoaded = true; |