summaryrefslogtreecommitdiffstats
path: root/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/parser.py
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2016-06-13 17:15:04 +0200
committerChristian Tismer <tismer@stackless.com>2016-06-16 09:40:32 +0000
commitc764273e64896215730e44eb907cd3535596ade4 (patch)
tree1837b351e332b1fd4118053285fa0cb374e43335 /sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/parser.py
parent6b8818ccdaba58fb1309be32d2263c14f3ea08b7 (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/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/parser.py')
m---------sources/shiboken222
1 files changed, 16 insertions, 6 deletions
diff --git a/sources/shiboken2 b/sources/shiboken2
-Subproject 4ba52d8a955613985485b14faf76aa66bac08cc
+Subproject 6a3f6544ec0b5a1bc3f8bbaf9269217a2072168