summaryrefslogtreecommitdiffstats
path: root/src/core/core_headers.pro
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@theqtcompany.com>2016-03-18 15:45:47 +0100
committerAlexandru Croitor <alexandru.croitor@theqtcompany.com>2016-03-30 16:13:35 +0000
commit173c421596beae6984fc7cb3c719670249f322bc (patch)
tree4a7490ef1370496dad3d2acf5798d68465007c1c /src/core/core_headers.pro
parentd6a1e5a76d442286374062077e343593e9197ebe (diff)
Fix QtWebEngineProcess not being found after macdeployqt is used.
Currently on OSX, two Info.plist files are generated and copied to the QtWebEngineCore framework, one into Contents/Info.plist and another into Resources/Info.plist. The first one is generated by core_headers.pro and the second by core_module.pro. OS X frameworks only use the plist found in the Resources directory, and the Contents one was generated by qmake erroneously, assuming that core_headers is an application, rather than a framework. When macdeployqt is used with -always-overwrite option, it copies Contents/Info.plist (which contained an incorrect bundle id) over to Resources/Info.plist, and afterwards when an application is executed, it cannot find the plist file because it contains the the wrong CFBundleIdentifier, thus not being able to find the QtWebEngineProcess. Fix consists in making sure code_headers.pro does not generate an Info.plist, and just use the one generated by core_module.pro. Change-Id: I6295bde3b1d1771ed45f3a2fdff9fc60577f2ab6 Task-number: QTBUG-51939 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Diffstat (limited to 'src/core/core_headers.pro')
-rw-r--r--src/core/core_headers.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/core_headers.pro b/src/core/core_headers.pro
index ebafe58ec..52c6ca57d 100644
--- a/src/core/core_headers.pro
+++ b/src/core/core_headers.pro
@@ -1,5 +1,5 @@
TARGET = QtWebEngineCore
-CONFIG += no_private_module header_module internal_module
+CONFIG += no_private_module header_module internal_module no_plist
MODULE = webenginecoreheaders
load(qt_module)