1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QLibrary: fix some implicit QFlags->int conversions

Browse Source 
Either be explicit, or just use QFlags directly.

Change-Id: I18cbea4eaa1a0a4bce7665b735e7d785f7a196b2
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Giuseppe D'Angelo 2021-05-02 02:18:57 +02:00
parent a3d7028a0e
commit cdd6a1f138
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/plugin/qlibrary.cpp
View File

@ -500,7 +500,7 @@ inline void QLibraryStore::releaseLibrary(QLibraryPrivate *lib)
QLibraryPrivate::QLibraryPrivate(const QString &canonicalFileName, const QString &version, QLibrary::LoadHints loadHints) QLibraryPrivate::QLibraryPrivate(const QString &canonicalFileName, const QString &version, QLibrary::LoadHints loadHints)
: fileName(canonicalFileName), fullVersion(version), pluginState(MightBeAPlugin) : fileName(canonicalFileName), fullVersion(version), pluginState(MightBeAPlugin)
{ {
loadHintsInt.storeRelaxed(loadHints); loadHintsInt.storeRelaxed(loadHints.toInt());
if (canonicalFileName.isEmpty()) if (canonicalFileName.isEmpty())
errorString = QLibrary::tr("The shared library was not found."); errorString = QLibrary::tr("The shared library was not found.");
} }
@ -521,7 +521,7 @@ void QLibraryPrivate::mergeLoadHints(QLibrary::LoadHints lh)
if (pHnd.loadRelaxed()) if (pHnd.loadRelaxed())
return; return;
loadHintsInt.storeRelaxed(lh); loadHintsInt.storeRelaxed(lh.toInt());
} }
QFunctionPointer QLibraryPrivate::resolve(const char *symbol) QFunctionPointer QLibraryPrivate::resolve(const char *symbol)

2
src/corelib/plugin/qlibrary_unix.cpp
View File

@ -142,7 +142,7 @@ bool QLibraryPrivate::load_sys()
suffixes = suffixes_sys(fullVersion); suffixes = suffixes_sys(fullVersion);
} }
int dlFlags = 0; int dlFlags = 0;
int loadHints = this->loadHints(); auto loadHints = this->loadHints();
if (loadHints & QLibrary::ResolveAllSymbolsHint) { if (loadHints & QLibrary::ResolveAllSymbolsHint) {
dlFlags |= RTLD_NOW; dlFlags |= RTLD_NOW;
} else { } else {