summaryrefslogtreecommitdiffstats
path: root/src/core/core_headers.pro
Commit message (Collapse)AuthorAgeFilesLines
* Fine tune configure and clean up header includesMichal Klocek2018-06-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | Previously configure was generating two config headers qtwebengine-config.h and qtwebengine-config_p.h, however those headers were never installed or included as dependency in Makefiles. Moreover, due to the name clash all features were included into qt_lib_webengine_*.pri which is QtWebEngine QML module. Move configure to core so all features belong now to qt_lib_webenginecore*.pri. Fix global includes to include qtwebenginecore-config*.h. Drop all DEFINES and use QT_CONFIG instead. Cleanup all evil looking includes in headers for webengine and webenginewidgets. Change-Id: Iddbc8bf4487d9a5f0c19a71a9569535083507756 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Fix QtWebEngineProcess not being found after macdeployqt is used.Alexandru Croitor2016-03-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* Fix more syncqt warningsAllan Sandfeld Jensen2016-01-051-0/+5
Change include form to follow standard Change-Id: I8b30ae9a6923365d524c473f2807b76e4fccebf4 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>