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

QCoreApplicationPrivate: make cachedApplicationFilePath non-static

Browse Source 
I don't see why it needed to be static, given that the setter checks for
!self and prints a warning.

Pick-to: 6.9
Change-Id: I2d4b632db7d7c9fac21dfffd3f302b5a7aac2e89
Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
This commit is contained in:
Thiago Macieira 2025-01-13 08:27:36 -08:00
parent c82ad28125
commit e6f483c0e8
2 changed files with 6 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -200,8 +200,6 @@ QString QCoreApplicationPrivate::appVersion() const
} }
#endif // !Q_OS_WIN || QT_BOOTSTRAPPED #endif // !Q_OS_WIN || QT_BOOTSTRAPPED
Q_CONSTINIT QString *QCoreApplicationPrivate::cachedApplicationFilePath = nullptr;
bool QCoreApplicationPrivate::checkInstance(const char *function) bool QCoreApplicationPrivate::checkInstance(const char *function)
{ {
bool b = (qApp != nullptr); bool b = (qApp != nullptr);
@ -467,7 +465,6 @@ QCoreApplicationPrivate::~QCoreApplicationPrivate()
#if defined(Q_OS_WIN) && !defined(QT_BOOTSTRAPPED) #if defined(Q_OS_WIN) && !defined(QT_BOOTSTRAPPED)
cleanupDebuggingConsole(); cleanupDebuggingConsole();
#endif #endif
QCoreApplicationPrivate::clearApplicationFilePath();
} }
#ifndef QT_NO_QOBJECT #ifndef QT_NO_QOBJECT
@ -2340,20 +2337,6 @@ QString QCoreApplication::translate(const char *context, const char *sourceText,
#endif //QT_NO_TRANSLATION #endif //QT_NO_TRANSLATION
#ifndef QT_BOOTSTRAPPED #ifndef QT_BOOTSTRAPPED
// Makes it possible to point QCoreApplication to a custom location to ensure
// the directory is added to the patch, and qt.conf and deployed plugins are
// found from there. This is for use cases in which QGuiApplication is
// instantiated by a library and not by an application executable, for example,
// Active X servers.
void QCoreApplicationPrivate::setApplicationFilePath(const QString &path)
{
if (QCoreApplicationPrivate::cachedApplicationFilePath)
*QCoreApplicationPrivate::cachedApplicationFilePath = path;
else
QCoreApplicationPrivate::cachedApplicationFilePath = new QString(path);
}
/*! /*!
Returns the directory that contains the application executable. Returns the directory that contains the application executable.
@ -2443,13 +2426,13 @@ QString QCoreApplication::applicationFilePath()
static QByteArray procName = QByteArray(d->argv[0]); static QByteArray procName = QByteArray(d->argv[0]);
if (procName != QByteArrayView(d->argv[0])) { if (procName != QByteArrayView(d->argv[0])) {
// clear the cache if the procname changes, so we reprocess it. // clear the cache if the procname changes, so we reprocess it.
QCoreApplicationPrivate::clearApplicationFilePath(); d->cachedApplicationFilePath = QString();
procName.assign(d->argv[0]); procName.assign(d->argv[0]);
} }
} }
if (QCoreApplicationPrivate::cachedApplicationFilePath) if (!d->cachedApplicationFilePath.isNull())
return *QCoreApplicationPrivate::cachedApplicationFilePath; return d->cachedApplicationFilePath;
QString absPath = qAppFileName(); QString absPath = qAppFileName();
if (absPath.isEmpty() && !arguments().isEmpty()) { if (absPath.isEmpty() && !arguments().isEmpty()) {
@ -2478,8 +2461,7 @@ QString QCoreApplication::applicationFilePath()
absPath = QFileInfo(absPath).canonicalFilePath(); absPath = QFileInfo(absPath).canonicalFilePath();
if (!absPath.isEmpty()) { if (!absPath.isEmpty()) {
QCoreApplicationPrivate::setApplicationFilePath(absPath); return d->cachedApplicationFilePath = absPath;
return *QCoreApplicationPrivate::cachedApplicationFilePath;
} }
return QString(); return QString();
} }

7
src/corelib/kernel/qcoreapplication_p.h
View File

@ -135,11 +135,6 @@ public:
Type application_type = Tty; Type application_type = Tty;
QString cachedApplicationDirPath;
static QString *cachedApplicationFilePath;
static void setApplicationFilePath(const QString &path);
static inline void clearApplicationFilePath() { delete cachedApplicationFilePath; cachedApplicationFilePath = nullptr; }
#ifndef QT_NO_QOBJECT #ifndef QT_NO_QOBJECT
void execCleanup(); void execCleanup();
@ -162,6 +157,8 @@ public:
static inline bool testAttribute(uint flag) { return attribs & (1 << flag); } static inline bool testAttribute(uint flag) { return attribs & (1 << flag); }
void processCommandLineArguments(); void processCommandLineArguments();
QString cachedApplicationDirPath;
QString cachedApplicationFilePath;
QString qmljs_debug_arguments; // a string containing arguments for js/qml debugging. QString qmljs_debug_arguments; // a string containing arguments for js/qml debugging.
inline QString qmljsDebugArgumentsString() const { return qmljs_debug_arguments; } inline QString qmljsDebugArgumentsString() const { return qmljs_debug_arguments; }