summaryrefslogtreecommitdiffstats
path: root/tools/buildscripts/gyp_qtwebengine
Commit message (Collapse)AuthorAgeFilesLines
* Remove gyp handlingAllan Sandfeld Jensen2017-03-221-178/+0
| | | | | | | Remove now dead GYP related code. Change-Id: I7d5b8f28f8925e553211dc88acd571b605ffe80d Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-08-021-2/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty src/core/resources/resources.gyp src/webengine/doc/src/qtwebengine-overview.qdoc src/webenginewidgets/api/qwebenginepage.cpp src/webenginewidgets/api/qwebenginescriptcollection.cpp src/webenginewidgets/api/qwebenginescriptcollection_p.h tests/auto/widgets/qwebenginepage/BLACKLIST And readded newly in 5.6 enabled tests to the BLACKLIST. Change-Id: I4ab1fc54ebfaaf940df81b0d8d6bdd15cae8b7c4
| * Move core_generated.gyp to build directoryAllan Sandfeld Jensen2016-07-271-2/+3
| | | | | | | | | | | | | | | | | | Changes core_generated.gyp from being generated in the source directory to being generated in the build directory. Task-number: QTBUG-43014 Change-Id: Ia67df47bfadbf5dfca6e60a613dcf7b162b468fd Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | Merge branch '5.6' into devAllan Sandfeld Jensen2016-02-041-5/+0
|\| | | | | | | Change-Id: I0bb971f01ee1e02da768f336680c8ec0254ab2b0
| * Disable printing in ChromiumAllan Sandfeld Jensen2016-01-311-5/+0
| | | | | | | | | | | | | | | | | | | | | | Disabling printing saves us compiling those files and files off a megabyte on the debug binary. To keep all the configure options in config, the common options are moved to a shared common.pri. Change-Id: Ieffdf9eb7dca58cfdafadd85bd24ea9c2be55ece Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-12-031-0/+8
|\| | | | | | | Change-Id: I052fdc4245e25e58457d51f6e49703bc7dd8ff00
| * Set -no-duplicate-basenameAllan Sandfeld Jensen2015-12-011-0/+8
| | | | | | | | | | | | | | | | Add another gyp flag from gyp_chromium.py, this is needed on some non-x86 platforms in particular AArch64. Change-Id: Id9ca1490d0e8637e52cec53c40e9bc40403501f2 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Adapting to Chromium 47Allan Sandfeld Jensen2015-10-271-5/+4
|/ | | | | | | Updating to Chromium 47 and adapting API. Change-Id: Id465bbcd4facd7c47cb8a9f4bd4e18cbdc0d1120 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.5' into 5.6Allan Sandfeld Jensen2015-09-241-2/+8
|\ | | | | | | Change-Id: Ice3d6e88238940a62d75e7c67f63b626285fccb0
| * do not generate qmake_extras.gypi in the source directoryJoerg Bornemann2015-09-091-2/+8
| | | | | | | | | | | | | | | | | | | | Among other things, we store the used compiler in there. This information belongs into the build directory. Otherwise switching toolchains becomes challenging. Task-number: QTBUG-43014 Change-Id: I9bec26a235f5251322792632d4667cc71210286d Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Unite commmon linux platform configurationAllan Sandfeld Jensen2015-09-101-5/+0
| | | | | | | | | | | | | | Move duplicated linux configuration to linux.pri Change-Id: I9f6f876e09fb748fb78cfbd5201a4326693f0be9 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* | Fix the build on embedded linuxAndras Becsi2015-08-241-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | This patch: - adds required options to the embedded_linux.pri config - adds missing events_ozone.gyp:events_ozone_evdev dependency - fixes pkg-config not to pick host paths when cross compiling - implements missing functions of the OzonePlatform interface - updates the submodule to include fixes for chromium Change-Id: I77b384738fa7d41938a68c10a007728b10d7db28 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Select Visual Studio version based on mkspecKai Koehne2015-08-031-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change 7a1e0d57d1a1683442 determined the Visual Studio version based on the 'VisualStudioVersion' environment variable. While this variable is defined by the default Visual Studio command line prompt, it isn't necessarily set in other environments. Anyhow, Qt already determined the compiler/Visual Studio version in the mkspec. We can just reuse this here. Change-Id: Ibee9526e91ae855151940da6be438705de048c0c Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Fix MSVC buildsAllan Sandfeld Jensen2015-06-231-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Chromium now expects the MSVS version to be set in GYP_MSVS_VERSION, so we need to set that. Fortunately we can use the VisualStudioVersion environment to do so. Note we should be setting it to "2013e" when using Express, but I can not currently detect that. Change-Id: Id51c04c8d3292c05809d4aa1301a50b12b2d57fd Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | Disable V8 binary blobsAllan Sandfeld Jensen2015-06-231-0/+2
|/ | | | | | | | | V8 will now by default require two external binary blobs in libexec. We prefer not having to ship more external dependencies, which are both inconvinient and a security risk. Change-Id: Id171f9be83add871bfa7d76c000799ebda9b7666 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Print only major.minor.micro version of python.Zeno Albisser2015-01-151-1/+1
| | | | | | | | This will avoid printing the compiler version python was built with. Showing the compiler version led to confusion multiple times. Change-Id: I4ced2128b92c83a41f616bcf756f2c313a9caed3 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Prevent OS X from picking a wrong version of clang from the envAndras Becsi2014-09-261-7/+0
| | | | | | | | | | | 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>
* [Win] Add gnuwin32\bin directory to PATH.Michael Brüning2014-09-031-0/+5
| | | | | | | | | This is necessary for finding gperf, bison, yacc, etc. on Windows. Works only if the gnuwin32 directory is on the same level as the qtwebengine root directory, which is the case with a qt checkout. Change-Id: I09fe1523d4e4baca6612f1039bbba2e2ff9d87c0 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* When comparing paths in python we have to use normcase.Zeno Albisser2014-08-261-4/+4
| | | | | | | | | | | | Chromium requires relative paths for output-dir and for generator-output. Also output-dir is expected to be a subdirectory of generator-output. This now allows building on windows without running qmake in recursive mode. Change-Id: Ie0f9965c1fbfd63eb3cb9c360b29f210128a5c3e Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Update the gyp variable used to disable tcmallocPierre Rossi2014-08-191-1/+1
| | | | | | | | 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>
* Use the toolchain from PATH on WindowsJocelyn Turcotte2014-08-141-0/+4
| | | | | | | | | | | | | | We don't want to fetch the compiler path from the mkspec on Windows the same way that we do on linux/embedded. Qt usually let the build environment decide the MSVC toolchain, as it is usually done on Windows. This patch also passes the ninja_use_custom_environment_files ninja generator option to make sure that gyp doesn't try to construct the build environment by running the env scripts itself. Change-Id: I6e04471eb994b81a9f1b8b5f149b4dbddbb320a8 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Fix the build on Windows due to backslashesJocelyn Turcotte2014-08-141-4/+9
| | | | | | | | | | | | | | | | A gyp variable containing backslashes would be evaluated twice when passed through grit_action.gypi in src/core/chrome_qt.gyp. For some reason, gyp would end up reducing the escaping of backslashes once for each variable evaluation, which would completely remove backslashes from the value. Fix the issue by making sure that we pass paths to gyp with slashes instead of backslashes. Python will know what to do with them regardless. Change-Id: Id38866fd63a2ba1524a8c998fe577f7f50fca059 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Update the QtWebEngineCore library to run on top of Chromium 37Jocelyn Turcotte2014-08-141-12/+4
| | | | | | | | | | | | | | | Most of the patch is about upstream classes/methods that changed. Other important details: - icu data files are now used by default - cygwin is no longer required to build on Windows - RenderFrameHost has been replacing RenderViewHost in a few places, following the separate process iframes support in Chromium - The user agent is accessed through ContentClient::GetUserAgent instead of from the command line switches Change-Id: I86cc93aff7ce31176a80b0b4a5d54025674a451c Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Run cygwin configurator before build on WindowsZoltan Arvai2014-04-031-0/+10
| | | | | | | | | Running setup_mount will ensure that every build uses it's own cygwin and prevents mixup with other instance. Update 3rdparty's shasum. Change-Id: Ic8f25ce7c6077318bac36b15cfe23a5a27ed51b9 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Disable cyclic dependency checking when cross-compiling on macArvid Nilsson2014-04-011-4/+4
| | | | | Change-Id: I49415512d9eb152a2c9a20bcc5adf9065717b124 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Adapt to API changes in new stable branch 1750Andras Becsi2014-03-281-7/+1
| | | | | | Change-Id: If0cc263f36d396fd505c1d8b026e2493bfc29cc4 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com> Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* [Mac] Print XCode and clang++ versions for debugging.Zeno Albisser2014-03-271-0/+5
| | | | | Change-Id: I179093362c550479361fe63680818dcd7d8a462a Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Always disable tcmalloc.Zeno Albisser2014-03-111-2/+6
| | | | | | | | | | | | | | | We cannot enable tcmalloc as otherwise we would have to use it for all of Qt as well. If we allocate with tcmalloc and free without (or the other way round) this leads to errors. Specifically it led to something that looked like a double free corruption on embedded linux for an event that is created in qtwebengine code but deleted within Qt. Change-Id: Ia8c8da09e78968648046761e34f7f674769cfdc2 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Use the shadow build directory for the ninja outputJocelyn Turcotte2014-03-071-11/+7
| | | | | | | | | | | | The gyp/ninja build is moved from out/(Debug|Release) to src/core/(Debug|Release). The ninja build as well as generated gyp files and python intermediate files all stay in the source tree for the moment. Change-Id: I6948380c45896540fe508238ceef9fe48e41f5af Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Unify the inclusion of *_extra.gypi files from src/coreAndras Becsi2013-12-031-5/+6
| | | | | | | | This makes it possible to use drop-in files for platform specific options needed for example for Boot2Qt. Change-Id: If9db228ac4be414bfea6f4eafe5199ffee495a48 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Python correctnessPierre Rossi2013-12-031-2/+2
| | | | | | | sys.path.insert(0,... can be harmful, let's not take that chance Change-Id: I00e5c70ba97cddbc596a6a0efb1019a08d3f4ff7 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Get localized strings in the render processPierre Rossi2013-12-031-12/+2
| | | | | | | | Building on top of the repacking of .pak files, we now ship the whole array of repacked locales and pick the appropriate one at runtime. Change-Id: I0096e3eac6a1fc83885fd11e0fa55a746f8e45d8 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Ship repacked .pak filesPierre Rossi2013-12-031-1/+1
| | | | | | | | | | | | | We used to wrap various .pak files in qrc files, but it turns out to be very memory inefficient compared to chromium's approach of mmaping those files. Drop the pak->qrc logic and instead add some pure gyp targets to repack the resources. We then install those with qmake and look them up with QLibraryInfo. Change-Id: I6dd3cedf6afa626ed181463911fef8885c9e9add Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Moving sources to src part 2: Adjust paths.Jocelyn Turcotte2013-11-281-7/+8
| | | | | | | | | | | | | | | | | | | NOTE: To build after this you should rerun init-repository.py or run $> git submodule sync $> git submodule update $> git config qtwebengine.chromiumsrcdir src/3rdparty This makes everything build by adjusting paths. Other mixed-in changes: - Rename qtwebengine_src variables in scripts to qtwebengine_root to avoid confusion. - Cleanup the release and debug extra targets that were in lib.pro. This file has also been split into src.pro and core.pro. Change-Id: Ieee9158a65f526b15244eaca59e779b7069d337e Reviewed-by: Zeno Albisser <zeno.albisser@digia.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Moving sources to src part 1: Move files.Jocelyn Turcotte2013-11-281-0/+167
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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-11 12:12:11 +0000