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

QLibrary::setFileNameAndVersion: reset the tag after findOrCreate

Browse Source 
If the library we've found is already loaded, set the tag to Loaded.

Change-Id: I12a088d1ae424825abd3fffd171ce3831b884eee
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
(cherry picked from commit 54df3488aff977e0881b2591fff2e66f270e243e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Thiago Macieira 2022-10-10 19:41:54 -07:00 committed by Qt Cherry-pick Bot
parent c4405bc5d7
commit c2a92199b5
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -952,9 +952,10 @@ void QLibrary::setFileNameAndVersion(const QString &fileName, const QString &ver
if (d) {
lh = d->loadHints();
d->release();
d = {};
}
d = QLibraryPrivate::findOrCreate(fileName, version, lh);
QLibraryPrivate *dd = QLibraryPrivate::findOrCreate(fileName, version, lh);
d = dd;
d.setTag(isLoaded() ? Loaded : NotLoaded);
}
/*!