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

QLibrary: merge duplicated setFileName{,AndVersion} code

Browse Source 
The code was in triplicate. Once is enough.

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

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

@ -911,13 +911,7 @@ QLibrary::~QLibrary()
void QLibrary::setFileName(const QString &fileName) void QLibrary::setFileName(const QString &fileName)
{ {
QLibrary::LoadHints lh; setFileNameAndVersion(fileName, QString());
if (d) {
lh = d->loadHints();
d->release();
d = {};
}
d = QLibraryPrivate::findOrCreate(fileName, QString(), lh);
} }
QString QLibrary::fileName() const QString QLibrary::fileName() const
@ -940,13 +934,7 @@ QString QLibrary::fileName() const
*/ */
void QLibrary::setFileNameAndVersion(const QString &fileName, int verNum) void QLibrary::setFileNameAndVersion(const QString &fileName, int verNum)
{ {
QLibrary::LoadHints lh; setFileNameAndVersion(fileName, verNum >= 0 ? QString::number(verNum) : QString());
if (d) {
lh = d->loadHints();
d->release();
d = {};
}
d = QLibraryPrivate::findOrCreate(fileName, verNum >= 0 ? QString::number(verNum) : QString(), lh);
} }
/*! /*!