summaryrefslogtreecommitdiffstats
path: root/src/core/gn_run.pro
Commit message (Collapse)AuthorAgeFilesLines
* Fine tune configure and clean up header includesMichal Klocek2018-06-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | Previously configure was generating two config headers qtwebengine-config.h and qtwebengine-config_p.h, however those headers were never installed or included as dependency in Makefiles. Moreover, due to the name clash all features were included into qt_lib_webengine_*.pri which is QtWebEngine QML module. Move configure to core so all features belong now to qt_lib_webenginecore*.pri. Fix global includes to include qtwebenginecore-config*.h. Drop all DEFINES and use QT_CONFIG instead. Cleanup all evil looking includes in headers for webengine and webenginewidgets. Change-Id: Iddbc8bf4487d9a5f0c19a71a9569535083507756 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Move the last gn_arg over to the restAllan Sandfeld Jensen2018-03-221-4/+0
| | | | | | | is_debug was the only configuration argument still set in gn_run.pro Change-Id: I7b66888e6b936b44bafdad02f7974941d4e875ce Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Pass silent on to ninjaAllan Sandfeld Jensen2018-03-201-1/+4
| | | | | | | | If NINJAFLAGS is not explicitly set, set its verbosity based on Qt's configuration. Change-Id: I49ef48f6bfa5461dcccba05709c74df6834e2e3a Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Add 'webengine' prefix to configure features, tests, libraries, etcAlexandru Croitor2017-11-121-2/+2
| | | | | | | | 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-191-4/+2
| | | | | | | | | 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>
* Clean "system" calls to build&run gn and ninjaMichal Klocek2017-04-281-13/+11
| | | | | | | | | | 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-271-1/+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>
* Remove superfluous run_gn target from gn_run.proJoerg Bornemann2017-04-211-4/+1
| | | | | | | Gn is called at qmake time. The run_gn target was empty and did nothing. Change-Id: I570094e013c63a78ca6cec6987f119bfda45e085 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Fix calls to ninja on Windowsv5.9.0-beta1Kai Koehne2017-03-311-2/+2
| | | | | | | | | Make sure that the path to ninja and the directory uses the correct slashes. Without it, the call might silently fail. Task-number: QTBUG-59842 Change-Id: If59eb14b1fb99aae2b78c85a0052e5aefd5d5bf9 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Add gnuwin32\bin directory to PATH on WindowsJoerg Bornemann2017-03-281-7/+18
| | | | | | | | | | | 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. This is a port of 09e53e79 which did the same for the gyp build. Change-Id: Icd75c44605ba07269f721cd3b9877463c43f8beb Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Remove -v from base ninja command lineAllan Sandfeld Jensen2017-03-031-1/+1
| | | | | | | | | With the migration done, we don't need the verbose output by default anymore. Developers that want it can still enable it by adding -v to NINJAFLAGS Change-Id: Ib26969791f0954a86de13fec8a271ae9459e6aaa Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Use .NOTPARALLEL on Windows tooAllan Sandfeld Jensen2017-03-031-1/+3
| | | | | | | | With Jom 1.1 supporting the special target we can use it to also avoid compiling and linking debug and release in parallel on Windows too. Change-Id: Ie3307f1f40fd877d04f9fea53c02fe7a37c48824 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Fix release builds for debug and release buildsMichal Klocek2017-02-151-1/+2
| | | | | | | | | | | | Small typo makes debug builds make release. Fix core lib and covert tool compilation for debug builds. Updates chromium: b0bb0288 Fix debug builds compilation Change-Id: Id478ab5e2a2a1b3d5716002f76f252451f69f5ac Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Fix running qmake recursivelyMichal Klocek2017-02-071-1/+8
| | | | | | | Move gn run call form make step to qmake step. Change-Id: I01913aef9dff505df3319755ae7009144919accf Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Refactor release and debug handlingMichal Klocek2017-02-061-19/+7
| | | | | | | | | | 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>
* macOS GN integrationAlexandru Croitor2017-01-271-0/+1
| | | | | Change-Id: I89850d43c8f11ec54b3a47318ef0b3f083ae3dee Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Add gn build of qtwebengine for linuxMichal Klocek2017-01-251-5/+28
| | | | | | | | | | | This commit uses gn instead of gyp to build on desktop linux. Use WEBENGINE_CONFIG+=use_gn to use gn during the build instead of gyp. Change-Id: Ifd3d8d0835b47c323a8d39c320eb55e5e1024dee Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Add gn bootstrap to build systemMichal Klocek2016-12-081-0/+39
Bootstraps gn wihout rebuild. Change-Id: I09ee4d6b6f458f16f0d9ac18433823153ab75995 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-08 21:50:10 +0000