summaryrefslogtreecommitdiffstats
path: root/src/core/qtwebengine_extras.gypi
Commit message (Collapse)AuthorAgeFilesLines
* Windows: Use single process binary on Windows and fix GL contextPeter Varga2014-05-211-0/+1
| | | | | Change-Id: Iee7f3dc7fb9deba03e57a80ed48b74069490fe0d Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Remove obsolete QNX exclusions.Jeff Rogers2014-05-161-6/+0
| | | | | | | | | QNX has since changed to Aura and no longer has its own implementations of those files. Change-Id: I193dfa82093530742e6c6599750972bce0e69e39 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> Reviewed-by: Arvid Nilsson <anilsson@blackberry.com>
* Remove icu-config workaround and add libraries for eLinuxAndras Becsi2014-05-071-1/+7
| | | | | | | | | | We require that the icu libs are in the default library seach path since we build embedded with use_system_icu=1. This patch also updates the chromium patches and the shasum of the submodule. Change-Id: Ica43fa45e9f5eac712019f5437bb9fde0896e49a Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Windows: Use the runtime library the same way as QtJocelyn Turcotte2014-04-151-0/+3
| | | | | | | | | | | | | Using a custom allocator prevents us from allocating memory in Chromium cc files and freeing it in our code. Always use the normal CRT heap allocator to allow this. This also makes sure that we use the same /M flags for Chromium translation units as for Qt when dynamically linked. We won't support statically linking QtWebEngine at first anyway. Change-Id: Ifa044c7d3cf39929f7e4ca1c4c4cb3a9dea96266 Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Add SurfaceFactoryQt and OzonePlatformEglfs.Zeno Albisser2014-03-311-0/+3
| | | | | | | | | | | | | | | | | | | SurfaceFactoryQt::loadEGLGLES2Bindings is needed to find and load EGL and GLES2 libraries on embedded linux. It also provides a function to query the native display. We are using qmake variables at compile time to detect where we should look for the libraries at runtime. For EGLFS we query the native display through PlatformNativeInterface. If the resource is not exposed by Qt (pre 5.4), then we assume EGL_DEFAULT_DISPLAY, which is the right parameter for close to 100% of the cases anyway. OzonePlatformEglfs is just boiler plate code. Change-Id: I3ad08a56c50d6160be653ffb168b3f1f791e5245 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Override OPENSSLDIR for embedded linux.Zeno Albisser2014-03-281-14/+16
| | | | | | | | | | | Boot2Qt will ship openssl configuration and ca certificates in /usr/lib/ssl. At runtime the environment variable SSL_CERT_DIR can be used to override the location for certificates. Change-Id: Ib5a55f0ff6874e497b3ca9163e4a11f3a1805de0 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Get rid of GTK dependenciesAndras Becsi2014-03-281-0/+12
| | | | | | | | | | Build with aura by default and remove GTK related code. This patch introduces a mechanism for setting gyp build configuration variables using a GYP_CONFIG and adds a desktop_linux.pri configuration for this target. Change-Id: I6b044ba52ebb20c187572669af94a6fc280b0412 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Remove wrong library path that is reported by icu-config.Zeno Albisser2014-03-251-1/+1
| | | | | | | | | icu-config reports the path to icu resources on the host so we need to remove this path again, when compiling for an embedded target. Change-Id: Ifaf1c07ad3d0a8794a109b253764834ea3ff6ddc Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Fix clipboard build on WindowsZoltan Arvai2014-03-141-0/+2
| | | | | | | | Add missing guard to clipboard.h. Exclude unneeded Windows specific source files from build. Change-Id: I40fbea35dc1721ddf4e9c184515d57428a7ffe4d Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Add Qt clipboard integrationJocelyn Turcotte2014-03-041-0/+3
| | | | | | | | | | | | The GTK clipboard integration isn't working for us and we need a way to get clipboard requests from the renderer into the system clipboard. This patch adds a Qt implementation to let Qt handle the platform abstraction, even though the Chromium clipboard direct integration could work on some platforms. Change-Id: Ie7af5c6b4c662fc8f4109b2e85e9f594d6d90b0d Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Fix the embedded buildAndras Becsi2014-02-051-0/+1
| | | | | | | | | | Adopt to toolchain changes and fix the build with the current snapshot. This patch adds some missing overrides and build system configurations. Change-Id: I488929500347bdb5a077ac14e9553cedfcaa605d Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Disable Werror by defaultPierre Rossi2014-01-111-0/+3
| | | | | | | | | We don't want everybody to have to go and tweak ~/.gyp/include.gypi just for that purpose. Change-Id: I67533a62246dea45c4b5a5a454f43d01328d472f Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Fix the build on ARMAndras Becsi2013-12-111-1/+1
| | | | | Change-Id: I5130a10d56cc7c25da0eabf51c3657ef58cebaa7 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Adding target specific options based on _target_name does not workAndras Becsi2013-12-021-9/+7
| | | | | | | | | | | Remove the condition for the defines and define them if we compile for the target. If these end up causing issues in the future we have will have to patch gl.gyp in chromium. Also move the TOOLKIT_QT define so that it is always defined. Change-Id: If80f057a277b22fd7e0c9b049eeb137b4876c4cb Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Moving sources to src part 1: Move files.Jocelyn Turcotte2013-11-281-0/+51
This only move files without adjusting any paths. This moves: - lib/quick -> src/webengine/api (API files) lib/quick -> src/webengine (other files) This contains the main QtWebEngine module library since <ec7b2ee70a8b2db7fb87f50671a001ddd54697b0>. - lib/widgets -> src/webenginewidgets Also rename this directory to match its module name and rename Api to api. - lib -> src/core - process -> src/process - resources -> src/core/resources - tools/* -> tools/scripts/ The build directory is spread as follow: - build/build.pro -> src/core/gyp_run.pro - build/qmake_extras/* -> src/core/ (for the host and target .pro files) - build/qmake -> tools/qmake - Build related scripts -> tools/buildscripts Change-Id: I0cded1de772c99c0c1da6536c9afea353236b4a1 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>