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

QCoreApplication: make libraryPathsLocked() file-static

Browse Source 
Amends 08ad96404b4c915eece1a547bf12e91664e7cdff.

There's no need to have it in QCoreApplication, if it isn't called from
anywhere outside of qcoreapplication.cpp and (now) doesn't require
access to any QCoreApplication privates.

Pick-to: 6.9
Change-Id: I60a929aed02f71d25e00fffdcd42d092d5533cc4
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
Thiago Macieira 2025-01-07 10:10:00 -03:00
parent 39b47431fd
commit 4074cc9424
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/kernel/qcoreapplication.cpp
View File

@ -2921,6 +2921,8 @@ void QCoreApplication::requestPermission(const QPermission &requestedPermission,
#endif // QT_CONFIG(permissions) #endif // QT_CONFIG(permissions)
#if QT_CONFIG(library) #if QT_CONFIG(library)
static QStringList libraryPathsLocked();
/*! /*!
Returns a list of paths that the application will search when Returns a list of paths that the application will search when
dynamically loading libraries. dynamically loading libraries.
@ -2959,7 +2961,7 @@ QStringList QCoreApplication::libraryPaths()
/*! /*!
\internal \internal
*/ */
QStringList QCoreApplication::libraryPathsLocked() static QStringList libraryPathsLocked()
{ {
QCoreApplicationData *d = coreappdata; QCoreApplicationData *d = coreappdata;
if (d->libPathsManuallySet()) if (d->libPathsManuallySet())

3
src/corelib/kernel/qcoreapplication.h
View File

@ -229,9 +229,6 @@ private:
static bool notifyInternal2(QObject *receiver, QEvent *); static bool notifyInternal2(QObject *receiver, QEvent *);
static bool forwardEvent(QObject *receiver, QEvent *event, QEvent *originatingEvent = nullptr); static bool forwardEvent(QObject *receiver, QEvent *event, QEvent *originatingEvent = nullptr);
#endif #endif
#if QT_CONFIG(library)
static QStringList libraryPathsLocked();
#endif
#if QT_VERSION >= QT_VERSION_CHECK(7, 0, 0) #if QT_VERSION >= QT_VERSION_CHECK(7, 0, 0)
static QBasicAtomicPointer<QCoreApplication> self; static QBasicAtomicPointer<QCoreApplication> self;