diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-09-17 08:32:43 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-09-17 08:32:43 +0200 |
| commit | d49d076431d7579ecb33147187fe07eb148112ba (patch) | |
| tree | 668370fb9a2eec50000e371125136921ef4518ab /src/gui/image/qimagereader.cpp | |
| parent | b01e69684b9b36492cc43472edeb72058be9f706 (diff) | |
| parent | 35cdcddd605d8823b7b57129e8d7279133a3ca89 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Ic1fd51143f903b7e9086fc19ca960dfd9654ee00
Diffstat (limited to 'src/gui/image/qimagereader.cpp')
| -rw-r--r-- | src/gui/image/qimagereader.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/image/qimagereader.cpp b/src/gui/image/qimagereader.cpp index 6a0763e696..dff24b449a 100644 --- a/src/gui/image/qimagereader.cpp +++ b/src/gui/image/qimagereader.cpp @@ -150,7 +150,7 @@ // factory loader #include <qcoreapplication.h> #include <private/qfactoryloader_p.h> -#include <QMutexLocker> +#include <QtCore/private/qlocking_p.h> // for qt_getImageText #include <private/qimage_p.h> @@ -186,8 +186,8 @@ static QImageIOHandler *createReadHandlerHelper(QIODevice *device, QByteArray suffix; #ifndef QT_NO_IMAGEFORMATPLUGIN - static QMutex mutex; - QMutexLocker locker(&mutex); + static QBasicMutex mutex; + const auto locker = qt_scoped_lock(mutex); typedef QMultiMap<int, QString> PluginKeyMap; |