From ed257af5ef6abc4f7c0f05a03776506c4abe19cf Mon Sep 17 00:00:00 2001 From: Sergey Fedorov Date: Wed, 25 Jun 2025 09:40:12 +0800 Subject: [PATCH] Fix environ for Apple --- src/core/io/qprocess.cpp | 8 +++++++- src/core/io/qprocess_unix.cpp | 7 ++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/core/io/qprocess.cpp b/src/core/io/qprocess.cpp index 2a44e8f4c..63abe51b0 100644 --- a/src/core/io/qprocess.cpp +++ b/src/core/io/qprocess.cpp @@ -33,7 +33,13 @@ #include "qcorecommon_p.h" #ifndef QT_NO_PROCESS -extern char **environ; + +#ifdef __APPLE__ +# include +# define environ (*_NSGetEnviron()) +#else + extern char **environ; +#endif QT_BEGIN_NAMESPACE diff --git a/src/core/io/qprocess_unix.cpp b/src/core/io/qprocess_unix.cpp index 5a0312dfe..3c601f01d 100644 --- a/src/core/io/qprocess_unix.cpp +++ b/src/core/io/qprocess_unix.cpp @@ -43,7 +43,12 @@ # include // FIONREAD #endif -extern char **environ; +#ifdef __APPLE__ +# include +# define environ (*_NSGetEnviron()) +#else + extern char **environ; +#endif QT_BEGIN_NAMESPACE