From c15bfcd5c0649e48a5dd0dbd972b3ffc21331a9a Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Thu, 16 Jan 2025 19:34:24 -0800 Subject: [PATCH] QCoreApplication: clean up after {win,mac} removal from Bootstrap Amends commit bf8a5ab418a21d802910728ed24a0a7fad230526. Just some tidying up. Change-Id: I3d07a7b151241317ab6bfffd3e79a40db4dab441 Reviewed-by: Ivan Solovev --- src/corelib/kernel/qcoreapplication.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp index 8f4d3a31a22..53d18db7d4e 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp @@ -130,7 +130,7 @@ Q_TRACE_POINT(qtcore, QCoreApplication_sendSpontaneousEvent, QObject *receiver, Q_TRACE_POINT(qtcore, QCoreApplication_notify_entry, QObject *receiver, QEvent *event, QEvent::Type type); Q_TRACE_POINT(qtcore, QCoreApplication_notify_exit, bool consumed, bool filtered); -#if defined(Q_OS_WIN) || defined(Q_OS_DARWIN) +#if (defined(Q_OS_WIN) || defined(Q_OS_DARWIN)) && !defined(QT_BOOTSTRAPPED) extern QString qAppFileName(); #endif @@ -2404,7 +2404,8 @@ QString QCoreApplication::applicationDirPath() return d->cachedApplicationDirPath; } -#if !defined(Q_OS_WIN) && !defined(Q_OS_DARWIN) // qcoreapplication_win.cpp or qcoreapplication_mac.cpp +#if !defined(Q_OS_WIN) && !defined(Q_OS_DARWIN) +// qcoreapplication_win.cpp or qcoreapplication_mac.cpp for those static QString qAppFileName() { # if defined(Q_OS_ANDROID) @@ -2426,7 +2427,7 @@ static QString qAppFileName() return QString(); #endif } -#endif +#endif // !Q_OS_WIN && !Q_OS_DARWIN /*! Returns the file path of the application executable.