| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The build configuration requires the following changes:
- toolkit_views=1: for native_theme_aura, as otherwise
nine_image_painter_factory.cc would be excluded.
- use_system_harfbuzz=0: we do not want to rely on this
being provided on the system, therefore being explicit.
- want_separate_host_toolset=1: assures that icuuc gyp
target will be available.
The file gl_surface_ozone.cc must be added to the exclusion
list to avoid duplicate symbols with gl_surface_at.cpp.
The defines EGL_API_FB and LINUX must be set to 1,
to explicitly define that we are using EGL and are building
for a linux target.
Change-Id: If6722ecbfd0655fe7852d52a606f27c18304f717
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Until now we relied on the PATH to pick the right clang version on
OS X which turned out to be a source of issues on build nodes that
have a lot of old cruft lying around which was picked up by gyp.
Set make_clang_dir so that gyp uses the configured clang version
from Qt and remove the env manipulation from our gyp script.
Change-Id: I4ac679ea56fa874eecaa578aad77b462445c0caa
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
|
|
|
|
|
|
|
|
| |
Enabling rendering into a WGL backbuffer, in addition to the EGL/angle
one.
Change-Id: I8f2e3f5ecf52b6db22712b1129059f462725a256
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
| |
Change-Id: I94ccd40dbba9a3c6a962ebaca6d3d5ab316de8d5
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
| |
Change-Id: I1edd16e6875198d7480897e7b2e2fbf68b245883
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
|
|
|
| |
This changed with chrome 37. We only need to define it unconditionally
in gyp_qtwebengine as tcmalloc is never an option for us.
Change-Id: I8b21eb1114582c1d9a8aa61c5f15fc8469721395
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
| |
Change-Id: Idf4373bc10367dfc15445c4c530915cbda04ae9c
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
qtwe_chromium_obj_dir wasn't falling back to src/3rdparty if the
config couldn't be found in git.
Move the fallback logic to a getChromiumSrcDir qmake function, and
use it in both places.
The build system will now also print that the Chromium sources will
follow the git config if found instead of the other way around,
since this should now be the normal case as part of Qt5.
Change-Id: I5ab972ab53156c1bd033518e2eb51013559491ac
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
| |
GYP_ARGS needs a -D option before defining a value.
Change-Id: I4acb78e3f201a5d7369c3e998eb7356769bb7553
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
This is done by setting qt_egl_library and qt_glesv2_library to
the correct value depending on whether the build is using debug or
release config.
This also updates the 3rdparty submodule as necessary.
Change-Id: I536310073d1d2436f7ed529b935421f6c9a8cae9
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
With Qt 5.3 mac_sdk_path ends up being empty, so make sure to set
the proper flags for chromium to pick the right sdk.
Also add clang_use_chrome_plugins=0 so we can remove it as well from
the Mac-Use-libc-instead-of-stdlibc patch.
Change-Id: Ia132f079f905761644ad26c728f7116f538ea62d
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
|
|
| |
Currently some variables defined in os independent section.
Change-Id: I661d840b2271dc4bccf98dc2a252feaf6907952c
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
|
|
|
|
|
|
|
|
| |
QNX is using Ozone, so exclude gl_context_ozone as well.
Change-Id: Icdad9eed3211e9b095fbf884bc5e0243b551c1bb
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Reviewed-by: Arvid Nilsson <anilsson@blackberry.com>
|
|
|
|
|
| |
Change-Id: Idaf5264304d09ae7b2bfe0abee7c53310b50b48f
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
| |
This patch adds configurations and updates command line switches.
Change-Id: I0223695cc3a743bb2364a73e56fe5391dc43663d
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
|
|
|
|
|
| |
Change-Id: Ie907ade6c4888f450ee22d4d6bfd00f0e2d1fa09
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
| |
Change-Id: I0ed2bd7f27bfba863331390bd5630b552cd41af4
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Shared EGL contexts should always be created on the same
thread, as otherwise context creation might fail.
We use a GLContextHelper singleton that is initialized
on startup and creates the contexts when requested
through a BlockingQueuedConnection.
There is a pretty and a correct solution for this problem.
This is the pretty one. It is based on the assumption
that Chromium decides to use the same or a similar enough
configuration for the EGLContext as Qt previously did.
But we prefer pretty over correct as the correct solution
would potentially impose a layering violation.
This is enabled for all embedded linux devices.
Change-Id: I910cc90d0f87fd6d1fe0a475b17ba56cd8c503f6
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
|
|
|
| |
Turning off gyp's parallel processing that broken on Windows.
Disable nacl, remoting and ash.
Change-Id: If695799f94111135fcdf4130180e998d0094055d
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
| |
Define qt_os for all supported platforms.
Move simple platform specific flags into the pri files.
Change-Id: I09b030f4a8a815f48a8100d81669a7729218efc2
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
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>
|