From cdd6a1f1384a43dbf2627c4d1cade6508e5762bb Mon Sep 17 00:00:00 2001 From: Giuseppe D'Angelo Date: Sun, 2 May 2021 02:18:57 +0200 Subject: [PATCH] QLibrary: fix some implicit QFlags->int conversions Either be explicit, or just use QFlags directly. Change-Id: I18cbea4eaa1a0a4bce7665b735e7d785f7a196b2 Reviewed-by: Thiago Macieira --- src/corelib/plugin/qlibrary.cpp | 4 ++-- src/corelib/plugin/qlibrary_unix.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/corelib/plugin/qlibrary.cpp b/src/corelib/plugin/qlibrary.cpp index c625269ada..adac2f41da 100644 --- a/src/corelib/plugin/qlibrary.cpp +++ b/src/corelib/plugin/qlibrary.cpp @@ -500,7 +500,7 @@ inline void QLibraryStore::releaseLibrary(QLibraryPrivate *lib) QLibraryPrivate::QLibraryPrivate(const QString &canonicalFileName, const QString &version, QLibrary::LoadHints loadHints) : fileName(canonicalFileName), fullVersion(version), pluginState(MightBeAPlugin) { - loadHintsInt.storeRelaxed(loadHints); + loadHintsInt.storeRelaxed(loadHints.toInt()); if (canonicalFileName.isEmpty()) errorString = QLibrary::tr("The shared library was not found."); } @@ -521,7 +521,7 @@ void QLibraryPrivate::mergeLoadHints(QLibrary::LoadHints lh) if (pHnd.loadRelaxed()) return; - loadHintsInt.storeRelaxed(lh); + loadHintsInt.storeRelaxed(lh.toInt()); } QFunctionPointer QLibraryPrivate::resolve(const char *symbol) diff --git a/src/corelib/plugin/qlibrary_unix.cpp b/src/corelib/plugin/qlibrary_unix.cpp index 0be3d43e3d..05b2c92284 100644 --- a/src/corelib/plugin/qlibrary_unix.cpp +++ b/src/corelib/plugin/qlibrary_unix.cpp @@ -142,7 +142,7 @@ bool QLibraryPrivate::load_sys() suffixes = suffixes_sys(fullVersion); } int dlFlags = 0; - int loadHints = this->loadHints(); + auto loadHints = this->loadHints(); if (loadHints & QLibrary::ResolveAllSymbolsHint) { dlFlags |= RTLD_NOW; } else {