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

QCoreApplication: clean up after {win,mac} removal from Bootstrap

Browse Source 
Amends commit bf8a5ab418a21d802910728ed24a0a7fad230526. Just some
tidying up.

Change-Id: I3d07a7b151241317ab6bfffd3e79a40db4dab441
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
This commit is contained in:
Thiago Macieira 2025-01-16 19:34:24 -08:00
parent d7007090bb
commit c15bfcd5c0
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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_entry, QObject *receiver, QEvent *event, QEvent::Type type);
Q_TRACE_POINT(qtcore, QCoreApplication_notify_exit, bool consumed, bool filtered); 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(); extern QString qAppFileName();
#endif #endif
@ -2404,7 +2404,8 @@ QString QCoreApplication::applicationDirPath()
return d->cachedApplicationDirPath; 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() static QString qAppFileName()
{ {
# if defined(Q_OS_ANDROID) # if defined(Q_OS_ANDROID)
@ -2426,7 +2427,7 @@ static QString qAppFileName()
return QString(); return QString();
#endif #endif
} }
#endif #endif // !Q_OS_WIN && !Q_OS_DARWIN
/*! /*!
Returns the file path of the application executable. Returns the file path of the application executable.