summaryrefslogtreecommitdiffstats
path: root/src/core/gyp_run.pro
Commit message (Collapse)AuthorAgeFilesLines
* Fix prefix buildPeter Varga2015-04-291-2/+2
| | | | | | | | | | | Deploy resources, locales, icu and plugins into the build directory instead of install directory. It is necessary when Qt is configured with -developer-build and -prefix options: the compilation may fail if user has no write access for install directory. Task-number: QTBUG-45796 Change-Id: I425f26fcb4b611c255dd744cb9b4eafe16015d6f Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Remove eAndroid hooksAndras Becsi2015-04-141-2/+1
| | | | | | | | Support for the B2Qt/eAndroid platform is discontinued with Qt 5.5 so we can remove all remnants of the android platform. Change-Id: I93f15fcd4a345203e15010ddf1e8de3e8d28ab56 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Fix deployment problems with developer buildsPeter Varga2014-11-281-0/+5
| | | | | | | | | | | This fix deploys the following files into qtbase without make install: - qtwebengine_resources.pak - translations/qtwebengine_locales/*.pak - icudtl.dat - plugins/qtwebengine/libffmpegsumo.so Change-Id: Id2c02f03fb01571942d3135b215ebb8ad7a3221b Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Display error if building for ARM architecture older than ARMv6Jonathan Liu2014-10-271-0/+1
| | | | | | | Chromium is only supported on ARMv6 and ARMv7 for ARM architecture. Change-Id: I0493c9ba2baf4a537f759286622056093c0d4a25 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Fix ARM NEON detection for -mfpu=neon-vfpv4Jonathan Liu2014-10-151-1/+1
| | | | | Change-Id: I972d3560d6aa2640a2702f219cf802d2476b1c6e Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Set arm_tune to empty string if mtune flag is not set by toolchainAndras Becsi2014-09-221-1/+1
| | | | | | | | | | | Since the default arm_tune option applied by chromium is not recognized by our gcc toolchain set arm_tune to empty string to prevent chromium from setting a default. Our toolchains set the arm version which already implies the corresponding mtune option anyway. Change-Id: I0291bd4f0e5706597d37f914e4eeefbd75397bbf Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* QtWebEngine should join the Beautiful Stack Trace ClubJocelyn Turcotte2014-09-181-0/+5
| | | | | | | | | | | | | Configuring Qt with -force-debug-info -no-strip should carry the needed cflags to ninja through gyp. Also prevent stripping the library in release with force_debug_info. qmake will already call strip --strip-unneeded by default when running make install for release builds so remove that condition completely from core_module.pro. Change-Id: Ic31fca5b4365d61161f2500c2de011faa3e19c14 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Fix the build on eAdroidAndras Becsi2014-05-191-1/+1
| | | | | | | | | The eAndroid mkspec also sets linux, and since the qnx change we ended up including both android and linux configs. Make it more obvious why the else is there. Change-Id: Ia97483d410e280bbb4f4b56cf6fd351f6a4bbbca Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Add initial build configuration for QNX.Jeff Rogers2014-05-161-0/+1
| | | | | | | | 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>
* Make gyp to dump debug symbols for separate_debug_info buildsAndras Becsi2014-05-151-0/+2
| | | | | | | | | With this patch we get usable debug files. This also makes qmake strip the core lirary from unneeded sysmbols which is especially beneficial on embedded. Change-Id: Ic1cadd87dbedb9817512a8b4f251cc3e43f028d1 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Set target_arch based on QT_ARCH for x86 and x86_64Andras Becsi2014-04-291-0/+3
| | | | | | | This is needed when cross-compiling for the emulator. Change-Id: I499c97df2deba8b91162c8f636bb5a25eba1bc29 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* There is no neon on arm pre v7.Zeno Albisser2014-04-281-1/+1
| | | | | Change-Id: I0a446f916627ec2519c59fd101a140bf21f1a1b3 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Shrink the debug library size even moreAndras Becsi2014-04-251-1/+2
| | | | | | | | | | Pass remove_webcore_debug_symbols=1 to gyp to reduce the library size. In case the symbols are needed CONFIG+=webcore_debug can be passed to qmake. Change-Id: I383aa3c60bfe6a0dc5344d37334b25810087d4e9 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Update eAndroid for new snapshotAndras Becsi2014-04-241-1/+1
| | | | | | | This patch adds configurations and updates command line switches. Change-Id: I0223695cc3a743bb2364a73e56fe5391dc43663d Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Easily enable proprietary codecsPierre Rossi2014-03-311-0/+2
| | | | | | | | | | | | | | | While we can't ship this by default in our binary packages in the future, it would be nice for users who can afford it to easily build with support for h264 among others. And for our private use, that means we can now watch videos from Vimeo. This simply requires passing WEBENGINE_CONFIG+=proprietary_codecs to qmake when building. Change-Id: Ib2274a7cfd053aaa3d38ac18e360310691e11534 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Force disable libstdc++ debug modeAndras Becsi2014-03-281-0/+2
| | | | | | | | | This reduces the debug library size by about 20% which should make it possible again to successfully link on the CI. Change-Id: Id0ced6b821032eb49a8e34aff81a7e1648a3dfff Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Introduce platform specific pri files for all platforms.Zeno Albisser2014-03-281-24/+4
| | | | | | | | 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>
* Get rid of GTK dependenciesAndras Becsi2014-03-281-2/+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>
* Adapt to API changes in new stable branch 1750Andras Becsi2014-03-281-0/+2
| | | | | | Change-Id: If0cc263f36d396fd505c1d8b026e2493bfc29cc4 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com> Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Add qt_os embedded_linux for platform specific configuration.Zeno Albisser2014-03-251-0/+4
| | | | | | Change-Id: I2c7878b0f5a84bc299d6c033a69e1f2f904168f3 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Fix debug_and_release buildsJocelyn Turcotte2014-03-071-14/+27
| | | | | | | | | | | | | | | This makes sure that gyp_run.pro follows the same behavior as core_module.pro and that ninja is run for each config, in the appropriate directory. A special .NOTPARALLEL make fake target is added to avoid running ninja for both configurations in parallel (this would cause build failures). This target will be ignored by nmake, but might cause issues if trying to build with jom. Change-Id: Ibaa5f6aa4972cb24c83cc7a63e496938a5c16a3f Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Use the shadow build directory for the ninja outputJocelyn Turcotte2014-03-071-4/+4
| | | | | | | | | | | | 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>
* Override path for perl, bison and gperf on WindowsZoltan Arvai2014-03-051-0/+3
| | | | | | | | Use these dependencies from environment. No need to include them in the snapshot. Change-Id: I81623cc15e8c1e9431c5569985c90a4fbac638e7 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Extend search path in libvpx to enable build with QtWebEngineZoltan Arvai2014-02-281-0/+6
| | | | | | | Paths are paritally hardcoded for Windows in libvpx. Change-Id: Ic1c537bcc8b988c9803326709e38f44cb0943ee3 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Use arm_neon_optional from armv7 onward if not explicitly enabledAndras Becsi2014-02-061-6/+10
| | | | | | | | | This makes our behavior consistent with chromium if the Qt toolchain does not explicitly enable NEON instructions, which would result in undefined symbols otherwise. Change-Id: Idc4f355714ede4206f4650664f6c24784100e7d8 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Fix the embedded buildAndras Becsi2014-02-051-3/+3
| | | | | | | | | | 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>
* Minor clean-up in core_gyp_generator.pro and gyp_run.proAndras Becsi2013-12-091-2/+1
| | | | | | | | | | - Use QMAKE_RESOLVED_TARGET to find out the core lib target name - Pass the NINJAFLAGS env var to ninja instead of passing the content - Remove invalid dependency rule for the ninja target, which is only parsed because it looks like a qmake condition. Change-Id: I09bba8f350308d3249369171d0a3d5824f184590 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Add Android specific build settings and command line switchesAndras Becsi2013-12-041-0/+10
| | | | | | | | Although this is an unsupported platfrom for QtWebEngine it is needed for Boot2Qt-Android and can live upstream. Change-Id: I21fea1fd00c1206e3b56373349b30df5ee121fda Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Fix the build with a neon enabled setup to pass arm_neon=1 to gypAndras Becsi2013-12-021-1/+1
| | | | | | Change-Id: Ibe0bab32fb215bc4de58a474ca7b77a289dea2f0 Reviewed-by: Arvid Nilsson <anilsson@blackberry.com> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Moving sources to src part 2: Adjust paths.Jocelyn Turcotte2013-11-281-1/+1
| | | | | | | | | | | | | | | | | | | 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/+61
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-14 04:50:11 +0000