diff options
| author | Mike Krus <mike.krus@kdab.com> | 2020-11-20 17:26:26 +0000 |
|---|---|---|
| committer | Mike Krus <mike.krus@kdab.com> | 2021-01-05 16:03:03 +0000 |
| commit | 090ea5502eac39565e33b3882f2173dd5eae473d (patch) | |
| tree | e79db00cd7cc50e83bbce5adc06ddda59aa30224 /src/core/resources/qresourcemanager_p.h | |
| parent | 173be1a93699c54d9680d809ca5a56ce0ccccd9a (diff) | |
Enable compiling non-QML API against Qt 5.15
Built with QtQuick disabled.
- C++17 required
- minor issues with QList vs QVector
- QMutexLocker templated vs not
- moc forward declaration handling
Change-Id: I5540625e74e2c009e528f56203e4b88be8d54599
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/core/resources/qresourcemanager_p.h')
| -rw-r--r-- | src/core/resources/qresourcemanager_p.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/core/resources/qresourcemanager_p.h b/src/core/resources/qresourcemanager_p.h index 954f7b5e4..32d8d081c 100644 --- a/src/core/resources/qresourcemanager_p.h +++ b/src/core/resources/qresourcemanager_p.h @@ -165,7 +165,11 @@ public : } private: +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) QMutexLocker<QMutex> m_locker; +#else + QMutexLocker m_locker; +#endif }; private: |