summaryrefslogtreecommitdiffstats
path: root/src/core/gyp_run.pro
Commit message (Collapse)AuthorAgeFilesLines
* Remove gyp handlingAllan Sandfeld Jensen2017-03-221-176/+0
| | | | | | | Remove now dead GYP related code. Change-Id: I7d5b8f28f8925e553211dc88acd571b605ffe80d Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Refactor release and debug handlingMichal Klocek2017-02-061-4/+0
| | | | | | | | | | Fix release and debug builds. Refactor ninja and gn builds as a sub projects, these are only build as release. Call core_generator and gn_run separately for debug and release builds. Change-Id: I638023214cdc98a5101d190486452cc4a1229486 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Fix build with 5.8 and make embedded configurableAllan Sandfeld Jensen2017-01-311-1/+1
| | | | | | | | | | Avoid checking features only available in 5.9 directly. This also changes the embedded-build configuration to being a feature that can be set at configure time. Change-Id: I9b42dcf696734a83e5c8d6e1cc07562cbeb3f993 Reviewed-by: Michael Brüning <michael.bruning@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Merge branch '5.8' into devAllan Sandfeld Jensen2016-12-211-1/+1
|\ | | | | | | | | | | | | Conflicts: configure.json Change-Id: I658a02de96b45b382f0f6c383964501b794b5eb6
| * Do not disable thumb instructions on ARMv7+Allan Sandfeld Jensen2016-12-061-1/+1
| | | | | | | | | | | | | | | | | | | | Chromium in particular the bundled FFMPEG does not build on ARMV7 with thumb disabled. Since thumb should always be available on ARMv7 just ignore possible -marm in QMAKE_CFLAGS in that case. Task-number: QTBUG-57037 Change-Id: I09380839dddb97f64fb35ed749e5af0d002fa5fa Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | Split ninja target into runninja and buildninja in gyp_runMichal Klocek2016-12-021-5/+12
| | | | | | | | | | | | | | | | Small refactor to split the targets in makefile. Bootstrapping gn will need also ninja build. Change-Id: Id177a0189b79cf353b6bd27c4e087f4e960f56c2 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | Add support for system based ninjaMichal Klocek2016-11-301-1/+10
|/ | | | | | | | | Adds system-ninja feature, which is enabled if ninja is found in system path. Change-Id: Icc58bc252d67a27f80c139349be28f9fd239108a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Add spellchecker feature to new config systemMichal Klocek2016-11-141-1/+1
| | | | | Change-Id: I35a5c815c9f2b3ebacb5991ba6645641b17db2db Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* simplify setup of exclusive buildsOswald Buddenhagen2016-10-211-3/+1
| | | | | | | | | the simulator_and_device CONFIG flag is now gone. this also implies that we can set the debug_and_release and build_all flags based on the same condition. Change-Id: Ib16d05213e738a961c9e0b232829985b8ad64a50 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Fix spellchecking for macOSAlexandru Croitor2016-10-171-2/+8
| | | | | | | | | | | | The change fixes spellchecking to work on macOS. A new WebEngine configure option is available to allow spellchecking on macOS to use either Hunspell like the other platforms, or the native spellchecker that comes with the OS. The default is to use Hunspell. Task-number: QTBUG-53135 Change-Id: I3e45b2e0d728b1bf2659c35f3d0a042b0ecd6239 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-10-061-1/+1
|\ | | | | | | | | | | | | | | Conflicts: src/3rdparty src/webengine/api/qquickwebenginesettings.cpp Change-Id: Ie4abadb076c51d070cbb05f29b9ebcd9705933ad
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-10-041-1/+1
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty Change-Id: I49d99b5ac2cfba243eda1ea705c2a7d71b5542f6
| | * Include neon support for any -fpu=.*neon.*Donald Carr2016-09-271-1/+1
| | | | | | | | | | | | | | | | | | Change-Id: I9c571c823b6fa2411e003799f7ff8627ef6e1d5e Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-09-211-1/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty src/core/delegated_frame_node.h src/webengine/api/qquickwebenginecontextmenudata.cpp Change-Id: I163488d0d32cd981351608b2886f12e547e24672
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-09-121-0/+4
| |\| | | | | | | | | | Change-Id: I9acebc9f1d01ab9041f75c49749f8a122ffbfe30
| | * Do not assume neon on armv7Allan Sandfeld Jensen2016-09-081-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Chromium defaults to arm_neon=1 and then sets -mfpu=neon if the arm architecture is 7. Change-Id: Ib144dd4188ba4221ed35367026de9f9a04c69792 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| * | Fix buildAllan Sandfeld Jensen2016-09-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | We now get a multiword value from $$pkgConfigExecutable which will cause us to treat it as multiple gyp config sets, which will make gyp fail. Change-Id: Icdf781bb633d804ff6355e882dc4997bb5f3310f Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into 5.8Allan Sandfeld Jensen2016-08-301-0/+2
|\| | | | | | | | | | | Change-Id: I82f7a6a6d1bf27dc8adf7e2a91ea8ab29c54a607
| * | Use pkg-config wrapper provided by qmakeMichal Klocek2016-08-261-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Switch to pkg-config wrapper provided by qmake to avoid exporting extra PKG_CONFIG_LIBDIR paths. Change-Id: I6c916d8d20965808af7b206c4fecf6c8791e93b4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | Adjust webengine to the qtConfig() changes in qtbaseLars Knoll2016-08-231-5/+5
|/ / | | | | | | | | Change-Id: I907f6ea73a1d707eda536764c4b0b2edea49a963 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-08-021-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1/+1
| | | | | | | | | | | | | | | | | | 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 remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-06-271-3/+10
|\| | | | | | | Change-Id: Ic6686df8f82f710a3441501b7eeaffe69fbcbdf7
| * Fix detection of MIPS architucture revisionAllan Sandfeld Jensen2016-06-241-3/+10
| | | | | | | | | | | | | | | | | | We were not handling -march= arguments and we were not setting the result in GYP_CONFIG. Task-number: QTBUG-54336 Change-Id: I63e45f153aa46d5879aa968aa6c3d898ef58855e Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | fix logical mismerge from 5.6Oswald Buddenhagen2016-06-171-1/+1
| | | | | | | | | | | | | | iphonesimulator_and_iphoneos was renamed to simulator_and_device in 5.7. Change-Id: I0be78eb67b9f9867548108235eb180874f66cb95 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-06-111-0/+1
|\| | | | | | | Change-Id: Ib010ede9756fb02992a3276ae7ec90ef1ab56a00
| * Allow to set arm_thumb=0 with -marmAkihiko Odaki2016-06-011-0/+1
| | | | | | | | | | | | | | | | In case arm_version == 7, arm_thumb used by default. This change allows to override the configuration. Change-Id: Ifa924d3d6b6c39da513523fdc40757d277fb7f26 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-05-311-0/+1
|\| | | | | | | Change-Id: I561c00b3a844ab493a5bf0148a5923662842cf5d
| * unifiy ios simulator&device handling with that of debug&releaseOswald Buddenhagen2016-05-231-0/+1
| | | | | | | | | | Change-Id: Ifb141ae83330cd320896b75090b8bb8e51b853a5 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
* | Provide a debug version of QtWebEngineProcessJoerg Bornemann2016-05-041-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | We never shipped a debug version of the QtWebEngineProcess executable. This is problematic in debug_and_release builds when a debug application starts the release version of QtWebEngineProcess. The Qt libraries will then be loaded twice, in debug and release. Also, in development setups where only the debug libraries are deployed, the release version of QtWebEngineProcess cannot be loaded. Task-number: QTBUG-49493 Change-Id: I2f7bfb9c7cf8e869dc91007f4e967a713f438065 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Update spellchecker APIsMichal Klocek2016-04-181-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * marks new properties in QQuickWebEngineProfile as FINAL * removes QT_NO_SPELLCHECK from API headers * renames spellCheckLanguages() to availableDictionaries() * removes "togle spellcheck" methods and actions * use WEBENGINE_CONFIG instead of CONFIG for disable the feature at compile time: WEBENGINE_CONFIG+=no_spellcheck Done-With: Peter Varga <pvarga@inf.u-szeged.hu> Task-number: QTBUG-52371 Change-Id: I8c8eff497b9e7afe0cec2edc97dec248151487f2 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Fix merge duplicationAllan Sandfeld Jensen2016-04-131-1/+0
| | | | | | | | | | | | | | | | We already set sysroot to empty for all none cross_compile builds in the 5.7 branch. Change-Id: I99626694983c776f46d0e5daa9b1e39614266cb6 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Add option to allow compiling WebEngine as Mac App Store compliant.Alexandru Croitor2016-03-221-0/+1
| | | | | | | | | | | | | | | | | | When the option is enabled, a GYP variable is set that will result in removing private API calls in Chromium. Task-number: QTBUG-51072 Change-Id: If8835ce74bf5db94c17b68ebeb396cae9cc10553 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-03-081-0/+13
|\| | | | | | | Change-Id: Ieab3c4a6d16b1d7b7c0243ff8898f81807e7b1fc
| * Configure MIPS architecure for gypAllan Sandfeld Jensen2016-03-031-0/+13
| | | | | | | | | | | | | | | | Parses MIPS architecture information on from qmake to gyp. Task-number: QTBUG-51580 Change-Id: Icdd164aa1379b7f0b93773cb061f95f204db8494 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Basic adaptation to Chromium 49Allan Sandfeld Jensen2016-03-071-3/+3
| | | | | | | | | | | | | | | | Converts types, callbacks and headers to match Chromium 49. Task-number: QTBUG-51173 Change-Id: I544ef46e187105e250fea1b48b72d2c81a906640 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Reduce size of embedded binariesAllan Sandfeld Jensen2016-02-161-0/+4
|/ | | | | | | | | | Adds a WEBENGINE_CONFIG option that greatly reduces the size of the core library (from 80Mbyte to 45Mbyte on Linux), and enable it on embedded linux by default. Change-Id: Ieb7afdbc160984fe5952be16dfbc96aa8c5f35ef Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Propagate qmake's warnings-are-errors settingAllan Sandfeld Jensen2016-01-061-0/+2
| | | | | | | | Disable -Werror when Qt is configured to not use it. Change-Id: Icc4d291cf941fc27b19aa2170796985c20eced8e Task-number: QTBUG-50254 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Configure gyp for arm64Allan Sandfeld Jensen2015-12-011-0/+1
| | | | | | | Introduces basic support for doing native arm64 builds. Change-Id: Ic03327c053a1c8197ba0610cf1364ccc93f015ff Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Support building on ARMAllan Sandfeld Jensen2015-09-231-36/+38
| | | | | | | Fix ARM linux builds on ARM Change-Id: Ifd97a0286b509003d0c7959654d406e271349cd7 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Use GYP_CONFIG over GYP_ARGSAllan Sandfeld Jensen2015-09-211-19/+19
| | | | | | | | Moves the handling of GYP_CONFIG down so that it may be used consistently for all GYP arguments in gyp_run.pro. Change-Id: Ic63d652701dbae4094572b2401d020fc058ea7ac Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Do not override use_system_ffmpegAllan Sandfeld Jensen2015-09-211-1/+1
| | | | | | | | We can use proprietary codecs with system FFMPEG if system FFMPEG is build with them. If both are set we should trust the configuration. Change-Id: I702dcdbed4b20405c7affa7af0d87ba446b44ca2 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Add post configure step and make using system ICU an optionAllan Sandfeld Jensen2015-07-271-1/+1
| | | | | | | | | | Adds a post configure step to test qmake arguments, summerize options, and make it possible to enable using system ICU, but leaving it default off for now. Also summerizes the proprietary codec configuration. Change-Id: I620a69dcdbb14b49143770d38eecb5aeab48ad05 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Update snapshot SHA1Peter Varga2015-06-161-0/+1
| | | | | | | | | | The update contains the remove_v8base_debug_symbols change and enables it. This shrinks the debug library size even more. In case the symbols are needed CONFIG+=v8base_debug can be passed to qmake. Change-Id: I1a9e78163343257d76b7842ba592979db95b992a Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-08 00:51:28 +0000