diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2020-10-23 13:08:04 +0200 |
|---|---|---|
| committer | Mike Krus <mike.krus@kdab.com> | 2020-10-26 17:04:46 +0000 |
| commit | 2e089e74e5cb2337f801359157c842f24aa73f3d (patch) | |
| tree | 453be5aef82e1ef9b6d25bf50666d74535e070e4 | |
| parent | f852aa731e3fdc79a4045425bc424fbbd3a4e50a (diff) | |
Fix compilation with latest QMutexLocker changed
Change-Id: I0991a7df7b4c8444030bfb6a551a87ff94e7e2fa
Reviewed-by: Mike Krus <mike.krus@kdab.com>
| -rw-r--r-- | dependencies.yaml | 6 | ||||
| -rw-r--r-- | src/core/resources/qresourcemanager_p.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/dependencies.yaml b/dependencies.yaml index b28d78017..c4209e29b 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,10 +1,10 @@ dependencies: ../qtbase: - ref: b83225fcc3c6aa5655884cbf9e7391afe38b4392 + ref: f7f1a71ea41579c1ff86c08c16b82e4c84bc891f required: true ../qtdeclarative: - ref: aba1bf6fca24ec6ee21ffc4417ef05d5d2cfdfeb + ref: dac2c8aec4917742aed6e311cf542dc37da60809 required: false ../qtshadertools: - ref: 817057f133e1070f859291097ce4c55ce56165c7 + ref: 4aac7b606a0e587300d350d87a40ace64cc8d24f required: false diff --git a/src/core/resources/qresourcemanager_p.h b/src/core/resources/qresourcemanager_p.h index 82e8ad17f..954f7b5e4 100644 --- a/src/core/resources/qresourcemanager_p.h +++ b/src/core/resources/qresourcemanager_p.h @@ -165,7 +165,7 @@ public : } private: - QMutexLocker m_locker; + QMutexLocker<QMutex> m_locker; }; private: |