diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2016-06-13 17:15:04 +0200 |
---|---|---|
committer | Christian Tismer <tismer@stackless.com> | 2016-06-16 09:40:32 +0000 |
commit | c764273e64896215730e44eb907cd3535596ade4 (patch) | |
tree | 1837b351e332b1fd4118053285fa0cb374e43335 /sources/pyside2/doc/tutorials/qmlintegration/style.qrc | |
parent | 6b8818ccdaba58fb1309be32d2263c14f3ea08b7 (diff) |
Fix OS/X inclusion of framework headers.
The recent change that made use of framework headers on OS/X did
not work with homebrew Qt, and it didn't work with official builds
either, because neither of the chosen include folders contained
all the necessary headers to lead to a successful build.
Fortunately shiboken actually supports being passed multiple include
locations, separated by a colon on OS/X, and a semicolon on Windows.
This patch makes sure to always pass the Qt include folder, and in
case if the Qt build is a framework build, also passes the root
frameworks location, with headers found by shiboken under
frameworkName.framewework/Headers.
This works for homebrew builds, official builds and custom
non-installed prefix / in-source builds of Qt.
Change-Id: I47b24e197839883de2ab873461efc1f4d4d33743
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'sources/pyside2/doc/tutorials/qmlintegration/style.qrc')
m--------- | sources/pyside2 | 31 |
1 files changed, 25 insertions, 6 deletions
diff --git a/sources/pyside2 b/sources/pyside2 -Subproject e64dda26eb2042a8c0cd7c8a33b134dcf097936 +Subproject 23d77136da1f249f0a78c8c7e8124adc8c60423 |