summaryrefslogtreecommitdiffstats
path: root/configure.json
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.9.0' into 5.9Allan Sandfeld Jensen2017-05-291-0/+14
|\ | | | | | | Change-Id: Iba6114263488d6bf84b255b38182904dc5880386
| * Move ICU configuration to new configure systemAllan Sandfeld Jensen2017-05-081-0/+14
| | | | | | | | | | | | | | | | | | The command-line switches is called webengine-icu to avoid conflicting with icu switches in other modules. Change-Id: Ic923a199efbc4081b3c30f0cafa4b7ea786bdb00 Reviewed-by: Michael Brüning <michael.bruning@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Add "WebEngine" section entries to Qt WebEngine featuresStephan Binner2017-05-081-6/+12
|/ | | | | Change-Id: If305e1f3becbb600e0338a6d1c1a4a9b2c0caf3e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Use qtbase optimize_size configure optionAllan Sandfeld Jensen2017-05-041-7/+0
| | | | | | | | | The optimize-size configure option got landed generally in qtbase, so respond to that instead of doing our own. Change-Id: I8bfcf494a6f0d599bf375ae4ea73ce86ee02216b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Move qmake files to standard locationsAllan Sandfeld Jensen2017-05-021-2/+0
| | | | | | | | | | The tools/qmake directory is a left over from webkit where qmake was but one of many buildsystems. This is not necessary for qtwebengine, so we can instead use the standard locations. Change-Id: I3d126d6627295b113b091f3eabeee25f1c1f6183 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Make python2 usage more robustJoerg Bornemann2017-04-271-0/+20
| | | | | | | | | | | | | | | | | | | | 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>
* Make optimize for size a visible configurable optionAllan Sandfeld Jensen2017-04-051-0/+7
| | | | | | | | Can be enabled with --optimize-for-size and is enabled by default for embedded builds. Change-Id: I955fa57804c8b7e80bb82deb83deb94a9e2a7621 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Move opus, webp and ffmpeg to new configure systemAllan Sandfeld Jensen2017-03-081-0/+48
| | | | | | | | Use the new configure system to control if we are using system opus, webp and ffmpeg libraries. Change-Id: I53db66ca1668fc939a51bf7811f967468456b924 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Make WebRTC support configurableAllan Sandfeld Jensen2017-01-311-1/+9
| | | | | | | | | | WebRTC is a big feature that Chromium has left configurable for a long time, we can forward that configurability to our users to allow them control it directly instead of just enabling it on desktop and disabling it on embedded. Change-Id: I4445e2189112205ddf1368bd5e197bab2df92092 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Fix build with 5.8 and make embedded configurableAllan Sandfeld Jensen2017-01-311-2/+15
| | | | | | | | | | 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>
* Do not autodetect system gn and hide option in summaryAllan Sandfeld Jensen2017-01-251-1/+1
| | | | | | | | | We will need a custom gn to build qtwebengine, so we shouldn't use the system gn unless explicitly requested, and we shouldn't advertise using it to users as it usually won't work. Change-Id: I98271ec70841d1b78ff5a1099575872646af73b2 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Add pepper-plugins feature to new configure systemMichal Klocek2017-01-161-0/+8
| | | | | | | | Task-number: QTBUG-57731 Task-number: QTBUG-58108 Change-Id: I253dab52361afd411dcf545fab752836c19ee3c7 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Add print and pdf feature to new configure systemMichal Klocek2017-01-161-0/+12
| | | | | | | | | | | | Currently printing and pdf are bounded together. Make compilation optional by adding it as a feature. Fix formatting of embedded_linux.pri Task-number: QTBUG-57731 Task-number: QTBUG-58108 Change-Id: I53a2baea656df0a5b6139365ed06385c9ebc5830 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Merge branch '5.8' into devAllan Sandfeld Jensen2016-12-211-1/+42
|\ | | | | | | | | | | | | Conflicts: configure.json Change-Id: I658a02de96b45b382f0f6c383964501b794b5eb6
| * Fix Linux audio library detectionAllan Sandfeld Jensen2016-12-151-1/+42
| | | | | | | | | | | | | | | | | | The configure checks where moved to QtMultimedia which we do not depend on, therefore we need to now duplicate the checks ourselves. Task-number: QTBUG-57620 Change-Id: I6f7319c7e91e3f51baf012c669121389cd6e1360 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | Add gn bootstrap to build systemMichal Klocek2016-12-081-0/+10
| | | | | | | | | | | | | | Bootstraps gn wihout rebuild. Change-Id: I09ee4d6b6f458f16f0d9ac18433823153ab75995 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Add support for system based ninjaMichal Klocek2016-11-301-1/+14
|/ | | | | | | | | 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-2/+9
| | | | | Change-Id: I35a5c815c9f2b3ebacb5991ba6645641b17db2db Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Start using new config systemAllan Sandfeld Jensen2016-11-101-0/+27
Adds the optionproprietary codecs to configure.json, so it can be selected by the global configure, and is summarized there too. Keeps the old system for compat with building against older Qt. Change-Id: I5deba10f2e25445870cbdc7507155b0b76c307de Reviewed-by: Michael Brüning <michael.bruning@qt.io>