summaryrefslogtreecommitdiffstats
path: root/build/build.pro
Commit message (Collapse)AuthorAgeFilesLines
* Moving sources to src part 1: Move files.Jocelyn Turcotte2013-11-281-61/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* Improved ARM cross-compile settings detectionArvid Nilsson2013-11-271-11/+22
| | | | | | | | | Let the Chromium build system figure out default values if a flag can't be deduced from the QMAKE_CFLAGS. For example, this allows Chromium to default to ARM v7 if no ARM version can be deduced from compiler flags. Change-Id: I47257a7fc27cdbca84c6999dba75affe809f753b Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Add build system support for cross compilationAndras Becsi2013-11-261-2/+31
| | | | | | | | | This patch adds support for inheriting target specific cross-compile settings from Qt. Change-Id: I964297d776bcc5ac169ce09a52f661d08c5b4b9d Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> Reviewed-by: Arvid Nilsson <anilsson@blackberry.com>
* Add guards to project files to prevent unnecessarily processing on Windows.Zoltan Arvai2013-11-191-2/+4
| | | | | | | | | On Windows with default debug_and_release configuration project files parsed tree times while generating Makefile, Makefile.Debug and Makefile.Release. Some operation needs only one time processing. Change-Id: I02d04076cbb70c705916703526444585e83a24ff Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Rename findNinja to findOrBuildNinja and fail early if gyp failsAndras Becsi2013-10-011-3/+2
| | | | | | | | | We should not not use the $$ syntax to collect the output of the gyp call instead we should just fail with an error in case gyp_qtwebengine fails. Change-Id: Ib6218bdfb998100a3717470713ed5bf5f30db339 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Do not rely on shebang for finding python.Zeno Albisser2013-09-031-1/+1
| | | | | Change-Id: I0d963ee8b38eacde269d51c2f180190ce7d03048 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Tweak the build systemAndras Becsi2013-06-271-1/+1
| | | | | | | | | | | Fix a typo so we get the correct CHROMIUM_SRC_DIR and add it to INCLUDEPATH so that QtCreator indexes Chromium headers. Also add NINJAFLAGS environment variable to ninja command line to be able to specify options to ninja, like how many jobs it should run when using icecc. Change-Id: Ib494dc5c71d4e3a4eac419118c9cf6b1c474b6da Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Rename ninja Makefile target to invoke_ninja.Zeno Albisser2013-06-271-1/+1
| | | | | | | | | | | This avoids the Makefile target colliding with the submodule name. If both have the same name, the target would not be invoked. This is because make would find a file/folder ninja in the build subdirectory, and therefore belives that the dependencies for the target "ninja" are fulfilled. Change-Id: I7ef1974e06d9cd7a6023d0d17170e0bf730c4b87 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Make ninja detection a bit more robustPierre Rossi2013-06-141-1/+1
| | | | | | | | Having ninja in the PATH should be good enough. If that didn't work, we try to find it in the most logical location relative to CHROMIUM_SRC_DIR and bail out otherwise. Since it seems unlikely to vary, and can be convenient to keep persistent, we put it in .qmake.cache if qmake uses a cache.
* Rename remaining references of blinq to QtWebEngine.Jocelyn Turcotte2013-06-111-2/+2
|
* Ease the switching between Debug and Release buildsPierre Rossi2013-05-311-5/+1
| | | | | | | | Change the semantics of getOutDir, introduce getConfigDir. Rely on Gyp's configurations mechanism to get a sensible path for the BLINQ_PROCESS_PATH in both cases. Also make the build smarter in that re-generation of gyp files will lead to re-gyping.
* Define blinq_process path at compile timePierre Rossi2013-05-021-3/+1
| | | | | | | This way we won't have to define the BLINQ_PROCESS_PATH environment variable except in the case where we want to override that value. Refactored some of the output dir logic in the process
* Revert "Make it possible to do shared library builds"Simon Hausmann2013-05-021-1/+1
| | | | | | This reverts commit 6d4e28f380d81eebeabac139c7f8e25de53ddee8. GYP_DEFINES does the same job :)
* Make it possible to do shared library buildsSimon Hausmann2013-05-021-1/+1
| | | | Until a developer-build option is in place, you can do export GYP_FLAGS="-Dcomponent=shared_library"
* Support debug and release buildsSimon Hausmann2013-04-291-2/+3
|
* New qmake approachPierre Rossi2013-04-291-0/+25
This should allow us to have much better integration by generating the necessary gyp files directly from qmake. Mostly works for now, though we will most likely need to build the gyp generation as we go. * Out dir logic is still crap and needs to be (re)worked. * In the same vein, we probably don't want the generated gyp content ending up in the source tree in the long run, which could prove tricky with relative paths to sources and all.
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 19:26:16 +0000