tjh.dev
1--- pyside-setup-everywhere-src-5.12.3/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp~ 2019-06-15 10:31:04.712949189 +0200
2+++ pyside-setup-everywhere-src-5.12.3/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp 2019-06-15 11:52:52.894987343 +0200
3@@ -317,15 +317,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(QStringLiteral("g++"));
13- for (const HeaderPath &h : gppPaths) {
14- if (h.path.contains("c++"))
15- headerPaths.append(h);
16+ const HeaderPaths gppPaths = gppInternalIncludePaths(QStringLiteral("g++"));
17+ for (const HeaderPath &h : gppPaths) {
18+ // PySide2 requires that Qt headers are not -isystem
19+ // https://bugreports.qt.io/browse/PYSIDE-787
20+ if (!h.path.contains("-qt")) {
21+ // add using -isystem
22+ headerPaths.append(h);
23+ } else {
24+ headerPaths.append({h.path, HeaderType::Standard});
25 }
26 }
27 #else