summaryrefslogtreecommitdiffstats
path: root/src/buildtools
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-01-181-7/+7
|\ | | | | | | Change-Id: I4aae316c9826d8ded09e673a01935dc07f13cd64
| * Fix qmake recursive callMichal Klocek2018-01-161-7/+7
| | | | | | | | | | | | | | | | | | Change order of parsing buildtools.pro to avoid missing toolchain generated files. Change-Id: I40456cbf38573903c119313d036e4c2aea039b16 Reviewed-by: Viktor Engelmann <viktor.engelmann@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Add GN_HOST_TOOLCHAIN_EXTRA_CPPFLAGSMichal Klocek2017-11-221-0/+3
| | | | | | | | | | | | | | | | | | | | | | Add a way to add pass extra compilation flags when using host toolchain. This is currently used by yocto to get correct lookup path for native headers. Task-number: QTBUG-63140 Change-Id: Ic8f3e394840635b2a0a26acf593888e1f79439f6 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | Add 'webengine' prefix to configure features, tests, libraries, etcAlexandru Croitor2017-11-122-3/+3
| | | | | | | | | | | | | | | | This is done to make sure there are no conflicts with features in other modules, because they all share a global namespace. Change-Id: I95b3b7fadd8ffc2979ee3aad2234ee543d57c7d8 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | Change spellchecker-related private features into public onesAlexandru Croitor2017-11-021-1/+1
| | | | | | | | | | | | | | | | | | | | This is done because qtConfig(spellchecker) is present in an example .pro file, and thus "spellchecker" should be a public feature. Change-Id: Idff977b8d0835b049c4c19dc42c1475d2c55c323 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | Cleanup skipBuild codeMichal Klocek2017-09-192-8/+5
| | | | | | | | | | | | | | | | | | Move all skipBuild related checks to runConfigure() in configure.prf. Remove some unused functions. Move platform checks to separate prf file. Change-Id: Ia45c837c91c341ed1fbc2e32fc098329da989920 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Adaptations for Chromium 60Alexandru Croitor2017-09-111-0/+7
|/ | | | | | Change-Id: I536258e22c2ec143f2fd3f1cbda229e0611b6af4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Fix host architecture detectionAllan Sandfeld Jensen2017-06-221-4/+5
| | | | | | | | | | | | | | | Read the correct QT_ARCH and QT_TARGET_ARCH variables from QMAKE. This fixes cases where toolchain arch does not match host arch (e.g. x86 tools on x64). Also removes unnecessary WEBENGINE_ARCH variable, and a mismatch in GN mips names. Task-number: QTBUG-61528 Change-Id: I11b050977ce6203c10d1776a15eb32efa4693290 Reviewed-by: Rolf Eike Beer <eb@emlix.com> Reviewed-by: Michal Klocek <michal.klocek@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Improve distcleanAllan Sandfeld Jensen2017-05-081-0/+2
| | | | | | | | Remove our manually generated configuration files on make distclean. Task-number: QTBUG-60235 Change-Id: I8b851fa80e1c17ea6ede9efb6ba0d2f108026db8 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Clean "system" calls to build&run gn and ninjaMichal Klocek2017-04-282-47/+35
| | | | | | | | | | There was a time when gn build was called during make step, however this was not working with recursive qmake calls. Clean up leftovers and fix path and warnings like "Conditional must expand to exactly one word." during builds. Change-Id: I8546520345a5f89ee829558fa0fd9183587848b3 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Make python2 usage more robustJoerg Bornemann2017-04-272-2/+2
| | | | | | | | | | | | | | | | | | | | After configuring Qt there will be an error message if a suitable python version could not be found. Add python2 configure test that - first looks for python2 in PATH - then looks for python in PATH - checks the Python version - stores the result in QMAKE_PYTHON2 Use $$QMAKE_PYTHON2 everywhere where we call python. Pass $$QMAKE_PYTHON2 to gn for its exec_script feature. Task-number: QTBUG-60164 Change-Id: I33de1273cbd20a787b3c8889d35280784dbcd5ae Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Set gn use_gold based on qmake's use_gold_linkerAllan Sandfeld Jensen2017-04-102-0/+11
| | | | | | | | Avoids adding --use-ld=gold on the link command line when gold linker has been deselected in Qt. Change-Id: I2d34cd3043aa24dca1f5f1604c97d8beccb70093 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Create v8_snapshot gn toolchain from one pro fileAllan Sandfeld Jensen2017-03-252-14/+14
| | | | | | | | | | Merge the generation of the v8_snapshot toolchain back to being made in configure_host.pro. This is a lot cleaner and safer against errors, to make it work however we need to cache the target archicture so that it is still available with option(host_build) enabled. Change-Id: Iefed9c97528f8ce338e7a0d4fe5c6884fb4ef4bd Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Remove gyp handlingAllan Sandfeld Jensen2017-03-221-8/+4
| | | | | | | Remove now dead GYP related code. Change-Id: I7d5b8f28f8925e553211dc88acd571b605ffe80d Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Use matching bitwidth for x86 targetSamuli Piippo2017-03-211-1/+1
| | | | | | | | | Extends the matching bitwidth check for v8snaphost builds to include x86 targets as well. Task-number: QTBUG-59504 Change-Id: Ieea917b8a2ed92e157d4cdb4cc272c1bd7a5f74d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Build v8snapshot with host of matching bitwidthAllan Sandfeld Jensen2017-03-192-12/+16
| | | | | | | | | | | Use the separate GN toolchain for v8snapshot to match bitwidth of host and target for that tool. Task-number: QTBUG-59504 Change-Id: Ic01675a4d4daf4be0327c516195fe87ac16720f2 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Support cross-builds and alternative compilers with GNAllan Sandfeld Jensen2017-03-014-0/+93
| | | | | | | | Adds GN versions of the gyp_configure targets, to create custom toolchains we can use to override compilers used by GN. Change-Id: Ic3a9cb7e83f845180396faff632f72f9c24f3365 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Refactor release and debug handlingMichal Klocek2017-02-063-0/+75
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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-07 08:58:46 +0000