at 24.05-pre 1.4 kB view raw
1--- pyside-setup-everywhere-src-5.12.6/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp~ 2020-07-08 14:37:13.022476435 -0700 2+++ pyside-setup-everywhere-src-5.12.6/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp 2020-07-08 14:37:18.271484269 -0700 3@@ -330,17 +330,15 @@ 4 } 5 #endif // NEED_CLANG_BUILTIN_INCLUDES 6 7- // Append the c++ include paths since Clang is unable to find <list> etc 8- // on RHEL 7 with g++ 6.3 or CentOS 7.2. 9- // A fix for this has been added to Clang 5.0, so, the code can be removed 10- // once Clang 5.0 is the minimum version. 11- if (needsGppInternalHeaders()) { 12- const HeaderPaths gppPaths = gppInternalIncludePaths(compilerFromCMake(QStringLiteral("g++"))); 13- for (const HeaderPath &h : gppPaths) { 14- if (h.path.contains("c++") 15- || h.path.contains("sysroot")) { // centOS 16- headerPaths.append(h); 17- } 18+ const HeaderPaths gppPaths = gppInternalIncludePaths(QStringLiteral("g++")); 19+ for (const HeaderPath &h : gppPaths) { 20+ // PySide2 requires that Qt headers are not -isystem 21+ // https://bugreports.qt.io/browse/PYSIDE-787 22+ if (!h.path.contains("-qt")) { 23+ // add using -isystem 24+ headerPaths.append(h); 25+ } else { 26+ headerPaths.append({h.path, HeaderType::Standard}); 27 } 28 } 29 #else 30