diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-10-29 10:52:27 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-11-04 12:42:20 +0100 |
| commit | 1d77cd18510412242384c5b37a00efd5b6ce8a26 (patch) | |
| tree | 2a9b1ed450674ad7e35f1b8e6da7090f68d5ae68 /sources | |
| parent | 6eb583d77019ad03112c188b20063e2199486235 (diff) | |
Pyside2/Qml: Work around for broken include in QtQml
Add path to QtCore for shiboken.
Change-Id: I479120d962acb3e9e7ad31ee637abec201811809
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'sources')
| -rw-r--r-- | sources/pyside2/cmake/Macros/PySideModules.cmake | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sources/pyside2/cmake/Macros/PySideModules.cmake b/sources/pyside2/cmake/Macros/PySideModules.cmake index dca00ec11..14707f964 100644 --- a/sources/pyside2/cmake/Macros/PySideModules.cmake +++ b/sources/pyside2/cmake/Macros/PySideModules.cmake @@ -91,7 +91,10 @@ macro(create_pyside_module) list(REMOVE_DUPLICATES total_type_system_files) # Contains include directories to pass to shiboken's preprocessor. - set(shiboken_include_dirs ${pyside2_SOURCE_DIR}${PATH_SEP}${QT_INCLUDE_DIR}) + # Workaround: Added ${QT_INCLUDE_DIR}/QtCore until + # qtdeclarative/8d560d1bf0a747bf62f73fad6b6774095442d9d2 has reached qt5.git + string(REPLACE ";" ${PATH_SEP} core_includes "${Qt5Core_INCLUDE_DIRS}") + set(shiboken_include_dirs ${pyside2_SOURCE_DIR}${PATH_SEP}${QT_INCLUDE_DIR}${PATH_SEP}${core_includes}) set(shiboken_framework_include_dirs_option "") if(CMAKE_HOST_APPLE) set(shiboken_framework_include_dirs "${QT_FRAMEWORK_INCLUDE_DIR}") |