diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-06-20 08:54:50 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-06-20 08:54:50 +0200 |
| commit | 48474d0550d20688aec50d8d036c95ac4bc23914 (patch) | |
| tree | 448a21bc24a2e5a96cbc617410934a3e46c98869 /sources | |
| parent | 28b1e4a8ee80750454ae9a5e3e4394ebd6d20f58 (diff) | |
| parent | 992ff1f7925009b7ead6d6f005cafcf2e57ed44e (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Id64bec735875c78c8c7d50a38d4cae63b84b2813
Diffstat (limited to 'sources')
| -rw-r--r-- | sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp b/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp index 3196c824e..f301733fe 100644 --- a/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp +++ b/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp @@ -291,10 +291,11 @@ static QString findClangBuiltInIncludesDir() #if defined(Q_CC_CLANG) || defined(Q_CC_GNU) static QString compilerFromCMake(const QString &defaultCompiler) { -# ifdef CMAKE_CXX_COMPILER +// Added !defined(Q_OS_DARWIN) due to PYSIDE-1032 +# if defined(CMAKE_CXX_COMPILER) && !defined(Q_OS_DARWIN) Q_UNUSED(defaultCompiler) return QString::fromLocal8Bit(CMAKE_CXX_COMPILER); -#else +# else return defaultCompiler; # endif } |