| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
| |
Currently we run gn with same sets of arguments for pdf
and webengine. Split those so we can make fine grain
configuration and drop some requirements.
Change-Id: I40890b5475dddadd0798ea091ca5e7143fd952b3
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Since e75aed1a96e in base we have now new check for
conflicting 'targets' when doing debug_and_release builds and
generates a warning:
Targets of builds 'Release' and 'Debug' conflict: gn_run.
Some people are unhappy about it (me), therefore make workaround
to suppress this warning. Most likely there is better way to fix it.
Change-Id: Ia9dd3e2418c49097acf52ae3a0a6deae57365999
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
|
|
|
|
|
|
| |
Don't build both release and debug, when build_all is not requested.
Change-Id: I4e0458ba460a9c62b32161ea588955b2f539a37e
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Processing configuration for gn when building qpdfcore module
will require optional libraries resolved. Some libs are not needed,
but this requires extra patching of gn build configs; so
to keep things simple, just detect all the libs beforehand.
Unfortunately using this for main configure goes bonkers.
The issue here is that main configure resets features in global scope,
which can break features coming from qtbase and results in
bogus configurations in certain cases. Therefore move current
configuration to buildtools and make everything else depend on this.
Task-number: QTBUG-75840
Task-number: QTBUG-76606
Change-Id: Id87f5ba017541a2d5a2836510c6cabc5a19f92c6
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Create/split main configure for submodules. Now configure system knows when webenginecore
module is not going to be built and the user gets the feedback after the configure step
with the message:
The following modules are not being compiled in this configuration:
webenginecore
webengine
webenginewidgets
If a module is not built also features are not populated, therefore some tests
have to be moved to main configuration. This improves error reporting and prepares
landing for QtPdf modules.
Remove configure.prf and fix issues after config split.
Add makefile call to report errors. Now calling make also reports
issues.
Task-number: QTBUG-75840
Task-number: QTBUG-76606
Change-Id: I76944df4c5db6f4954c464e3741a8054cb10b40e
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
|
|
|
|
|
|
|
| |
Add sth like 'NINJAJOBS=-j20 make'. Helps to quickly investigate
icecc issue without need to do qmake_all.
Change-Id: I7438e9cd1a2b15bcbc1a4790bbc4d6596c5c7abd
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
is_debug was the only configuration argument still set in gn_run.pro
Change-Id: I7b66888e6b936b44bafdad02f7974941d4e875ce
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
Move gn run call form make step to qmake step.
Change-Id: I01913aef9dff505df3319755ae7009144919accf
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: I89850d43c8f11ec54b3a47318ef0b3f083ae3dee
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
Bootstraps gn wihout rebuild.
Change-Id: I09ee4d6b6f458f16f0d9ac18433823153ab75995
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
|