From c764273e64896215730e44eb907cd3535596ade4 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 13 Jun 2016 17:15:04 +0200 Subject: 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 --- sources/shiboken2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sources/shiboken2/libshiboken/pep384impl.cpp') diff --git a/sources/shiboken2 b/sources/shiboken2 index 4ba52d8a9..6a3f6544e 160000 --- a/sources/shiboken2 +++ b/sources/shiboken2 @@ -1 +1 @@ -Subproject commit 4ba52d8a955613985485b14faf76aa66bac08cc7 +Subproject commit 6a3f6544ec0b5a1bc3f8bbaf9269217a2072168f -- cgit v1.2.3