summaryrefslogtreecommitdiffstats
path: root/tools/qmake/mkspecs/features/configure.prf
Commit message (Collapse)AuthorAgeFilesLines
* Create v8_snapshot gn toolchain from one pro fileAllan Sandfeld Jensen2017-03-251-0/+4
| | | | | | | | | | 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-4/+2
| | | | | | | Remove now dead GYP related code. Change-Id: I7d5b8f28f8925e553211dc88acd571b605ffe80d Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Move opus, webp and ffmpeg to new configure systemAllan Sandfeld Jensen2017-03-081-14/+26
| | | | | | | | 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 xscrnsaver optionalAllan Sandfeld Jensen2017-03-021-1/+1
| | | | | | | | Allow building on machines where xscrnsaver is not present, but turning of the corresponding features. Change-Id: Iabf7063fcc25f68f5a9fefc95a1caf164da49fed Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Support cross-builds and alternative compilers with GNAllan Sandfeld Jensen2017-03-011-2/+1
| | | | | | | | 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>
* Simple adaptations to Chromium 55Allan Sandfeld Jensen2017-03-011-1/+7
| | | | | | | The simplest adaptations to API and build changes in Chromium 55 Change-Id: I923fa188690a04902492317807f72f006bcab9c6 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Switch mac builds to gnMichal Klocek2017-02-061-0/+1
| | | | | | | | | | | | | Updates chromium: cd3417b Override xcode min version to 0721 d67d4bb Remove pending messages DCHECK to stop certain tests from crashig [ChangeLog] Switch mac builds to gn Change-Id: I78111bd931f43ceb6e28d67da73f6fb2b2051c9b Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Switch linux desktop builds to gnMichal Klocek2017-02-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Updates chromium: 1fd9f11 Remove linking with libatomic fa90180 Fix missing dependency on libffi b5a3338 Fix broken unit test for gn 70ea2bc Fix gn compilation for rhel6.6, rhel7.2 f408e89 Improve .pri output 492b20a Remove gtk2 dependency in tests 42e3484 Allow Service Workers without HTTP headers 7a1be30 Do not require gnome-keyring 11e5c2d Revert "Add mus and catapult project files" 891fb3a Remove various test and telemetry dependencies ddd6053 Do not use last_commit_position for gn build e85719e Windows and macOS GN integration 8fda2ae Make more features configurable 93db377 [Backport] Don't schedule wholeSubtreeInvalid sets [ChangeLog] Switch linux desktop builds to gn Change-Id: I0f766b9ee9ea65a2f92d9818ea5fb34a2e65c52d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Make WebRTC support configurableAllan Sandfeld Jensen2017-01-311-0/+1
| | | | | | | | | | 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-3/+8
| | | | | | | | | | 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>
* Add pepper-plugins feature to new configure systemMichal Klocek2017-01-161-0/+2
| | | | | | | | 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-3/+1
| | | | | | | | | | | | 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>
* Use the app-store compliance configure optionAllan Sandfeld Jensen2016-12-261-0/+1
| | | | | | | Qtbase now has the option which we can follow. Change-Id: I25617b83af4ad8d4b5d10db52f10aab2c0efc58b Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Fix Linux audio library detectionAllan Sandfeld Jensen2016-12-151-7/+8
| | | | | | | | | 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>
* Move the QPrinter and QtWidgets related code out of the PDFium wrapperMichael Brüning2016-11-251-0/+3
| | | | | | | | | | | This moves the actual printing using QPrinter to the WebEngineWidgets part of the API. The printsupport module depends on the widgets module and therefore QtWebEngineCore also had a dependency to widgets. This is removed by this change. Change-Id: If6e5745709a59de18f2123b930cbe6e64390c867 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Add pkg-config test for system harfbuzz version on linuxMichael Brüning2016-11-231-1/+4
| | | | | | | | | | | Older harfbuzz versions like the one bundled with Ubuntu 16.04 cause crashes of Qt WebEngine applications. Use the bundled copy although Qt was configured with -system-harfbuzz in those scenarios. Task-number: QTBUG-56895 Change-Id: I8fad6754447ba32c3630e6772ca2ae6d4fd710c1 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Add spellchecker feature to new config systemMichal Klocek2016-11-141-0/+1
| | | | | Change-Id: I35a5c815c9f2b3ebacb5991ba6645641b17db2db Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Start using new config systemAllan Sandfeld Jensen2016-11-101-0/+5
| | | | | | | | | | 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>
* move invocation of (old style) configuration to top-level projectOswald Buddenhagen2016-11-081-4/+0
| | | | | | | | | | | there doesn't appear to be a reason for magically invoking the configuration from default_pre/post, and it would cause problems further down the line with the new configure system. Change-Id: I3cf743a444e96bb397116f2ad4dce923f57aacfc Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Improve configure outputAllan Sandfeld Jensen2016-10-191-27/+58
| | | | | | | | Format the output slightly more, and report the list of optional bundled and system libraries used. Change-Id: I1fd06a5a83fb01e93dfd29236774a6e320530a6e Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix spellchecking for macOSAlexandru Croitor2016-10-171-0/+5
| | | | | | | | | | | | The change fixes spellchecking to work on macOS. A new WebEngine configure option is available to allow spellchecking on macOS to use either Hunspell like the other platforms, or the native spellchecker that comes with the OS. The default is to use Hunspell. Task-number: QTBUG-53135 Change-Id: I3e45b2e0d728b1bf2659c35f3d0a042b0ecd6239 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Prepare for configure modularization in qtbaseLars Knoll2016-09-161-0/+1
| | | | | | | | | This ensures we will find the features also after the modularization change in qtbase. Change-Id: I34d4eecbc51335c59e0e1d5d8de4149487fd07b6 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Adjust webengine to the qtConfig() changes in qtbaseLars Knoll2016-08-231-3/+3
| | | | | Change-Id: I907f6ea73a1d707eda536764c4b0b2edea49a963 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-161-2/+0
|\ | | | | | | Change-Id: Id5f97771be23a4393e8d3be98903c321377ae809
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-161-2/+0
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty src/webengine/api/qquickwebenginecertificateerror.cpp src/webengine/doc/src/webengineview.qdoc tools/qmake/config.tests/libcap/libcap.cpp Change-Id: I2a2cfc904a8d6b561fb71ef7a0cc4bfb860124db
| | * Remove libcap dependencyAllan Sandfeld Jensen2016-08-051-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | Chromium does not appear to use it anymore. Change-Id: I846fd869ffb15b832f208764fe8066f000187973 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-051-0/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also blacklist tst_QWebEnginePage::comboBoxPopupPositionAfterChildMove() and comboBoxPopupPositionAfterMove(). Conflicts: .qmake.conf src/3rdparty src/core/render_widget_host_view_qt.cpp src/core/resources/resources.gyp src/webengine/doc/src/qtwebengine-platform-notes.qdoc src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h tests/auto/widgets/qwebenginepage/BLACKLIST tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp tools/qmake/mkspecs/features/functions.prf Task-number: QTBUG-55158 Change-Id: I1d73ac9b3ca5293ad3c7e3a56f4c395da930e6f4
| * | Fix building on OS X 10.9 with 10.10 SDKAlexandru Croitor2016-07-011-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously building on OS X 10.9 was only allowed with a 10.10.3 SDK. But there is no supported version of Xcode on 10.9 that would ship with that SDK, which lead to the fact that there was no way to compile WebEngine with an officialy provided toolchain. This patch lowers the requirement of the SDK to 10.10, at the expense of disabling usage of API that was added in the 10.10.3 SDK release (Force Touch API). The required minimum Xcode version is thus bumped to 6.1, and the documentation is updated accordingly. Task-number: QTBUG-54486 Change-Id: I025caa336ceac5b8ea76ef451eb5e6b78abfe0c9 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | Add back spellchecking supportMichal Klocek2016-07-021-4/+0
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit: * d364c05de52f9ab39034e56cac4e0a7981dc541d * e507f140b70f464fb970d2f94357ac588dcc4f03 Moreover it fixes shut down of keyed services, updates versioning of and fixes spellcheck unit test context menu request, which otherwise fails on windows. Change-Id: I9bfc589544cb969abd6d2d7af69531b4c5c907b7 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-05-311-0/+5
|\| | | | | | | Change-Id: I561c00b3a844ab493a5bf0148a5923662842cf5d
| * Add qtlocation dependency to sync.profileAllan Sandfeld Jensen2016-05-301-0/+5
| | | | | | | | | | | | | | | | | | | | | | Without qtpositioning from qtlocation source module, we have no support for geolocation. Also correct a false dependency on xmlpatterns, and adds a feature report on geolocation at configure time. Change-Id: I7d80b8288631401bf4c8aaa2541327a52910c3e6 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Remove harmful spaces in qmake argument helpKai Koehne2016-05-251-1/+1
| | | | | | | | | | Change-Id: I47182d78f9dc8ecb8b4758f3ab739eaf88c04e24 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7.0Michael Bruning2016-05-231-1/+1
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty src/core/browser_context_adapter.cpp src/core/web_contents_adapter.cpp src/webengine/doc/src/qtwebengine-platform-notes.qdoc tests/auto/widgets/qwebenginepage/BLACKLIST Change-Id: I768fc954a9a2147fc3669961286163a0a824def3
| * Remove fake dependencies in embedded linux buildsAllan Sandfeld Jensen2016-05-201-1/+1
| | | | | | | | | | | | | | When doing embedded Linux builds we do not use X11 libraries. Change-Id: I704d8fd4853e2187590bc9513f55b7ec61c9c4bd Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Remove spellchecking supportMichal Klocek2016-05-061-0/+4
| | | | | | | | | | | | | | | | Spellchecking API needs a bit more reviews and love. Current API is not intuitive and partly broken. Change-Id: Ie9cd371f38cca2f6b3f56a8699ad874cd332c318 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-04-291-3/+3
|\| | | | | | | Change-Id: I922e637ffbf03aa15711fa5d0e10ecd4f25448ab
| * Fix hint to use WEBENGINE_CONFIG+=Kai Koehne2016-04-281-3/+3
| | | | | | | | | | | | | | At least on Windows/cmd.exe you can't put spaces in the argument. Change-Id: I55767a23409403b695e225339f86daae2dea1dc4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Merge branch '5.6' into 5.7Allan Sandfeld Jensen2016-04-111-2/+2
|\| | | | | | | Change-Id: I53645ee5405b1c43807123fd3c196e314cfd1ce9
| * Use system NSS only for certificate handlingKai Koehne2016-04-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compiling against NSS 3.23 fails with current Chromium. Also, with NSS 3.21 there are failures connecting to e.g. google.com. Fix this by adapting the setup endorsed by upstream Chromium: BoringSSL is always used for cryptography, and NSS only for certificate handlng. Patches included in 3rdparty update: 0a385bb [backport] Call EnsureNSSHttpIOInit in the chimera build. 0472123 Fix build against newer NSS 90c62c4 <third_party/libpng> [Backport] update to libpng 1.2.56 34857b8 <third_party/libpng> [Backport] Stop large iCCP chunks causing delays and "Aw Snap!" Task-number: QTBUG-52193 Task-number: QTBUG-51890 Task-number: QTBUG-52068 Change-Id: If8aaed9b9a09475c5ed0dfec64d31f45ce9670f5 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Add option to allow compiling WebEngine as Mac App Store compliant.Alexandru Croitor2016-03-221-0/+7
| | | | | | | | | | | | | | | | | | When the option is enabled, a GYP variable is set that will result in removing private API calls in Chromium. Task-number: QTBUG-51072 Change-Id: If8835ce74bf5db94c17b68ebeb396cae9cc10553 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Use system protobuf if foundAllan Sandfeld Jensen2016-03-081-1/+7
| | | | | | | | | | | | | | Search for protobuf library and compiler, and use them if found. Change-Id: I310eca661ed2dda14349e84a6769d2ae79ffb7c5 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Merge branch '5.6' into devAllan Sandfeld Jensen2016-02-041-1/+1
|\| | | | | | | Change-Id: I0bb971f01ee1e02da768f336680c8ec0254ab2b0
| * Disable WebSpeechAllan Sandfeld Jensen2016-02-011-1/+1
| | | | | | | | | | | | | | | | Also allows us to remove code handling libFLAC and libspeex since we no longer depend on those. Change-Id: Ifedc19b3c958215d298edd11f9126ea5b9cc09fa Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Switch libvpx detection to config checkAllan Sandfeld Jensen2016-01-111-2/+2
| | | | | | | | | | | | | | | | Chromium depends on svc_context.h that isn't normally shipped by libvpx-dev packages. Change-Id: I39790add79097a4eb614873df85e32749b591fd2 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Merge branch '5.6' into devAllan Sandfeld Jensen2015-11-201-8/+6
|\| | | | | | | Change-Id: I05fe27b8321944cf68cc96dfa9dfcaeb54c8c8cd
| * Fix cross-compile with NSS availableAllan Sandfeld Jensen2015-11-111-3/+4
| | | | | | | | | | | | | | | | Chromium currently can't build configure with both NSS and embedded, so we need to use OpenSSL in that configuration. Change-Id: Ia680b2865d876d4dcd4df8624b8628ff579fc649 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| * Revert "Fix build with freetype2 depending on harfbuzz"Allan Sandfeld Jensen2015-10-231-5/+2
| | | | | | | | | | | | | | | | | | | | | | We should trust the global Qt configuration, the same issue should have been solved in qtbase already. This fixes RedHat builds where FreeType2 reports a wrong version. This reverts commit 981e38d2dc82c047c6ad8ec19427d3ac7434dc3c. Change-Id: I662105521b277585c83335e20831692f990e4dc1 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Adapting to Chromium 47Allan Sandfeld Jensen2015-10-271-3/+3
|/ | | | | | | Updating to Chromium 47 and adapting API. Change-Id: Id465bbcd4facd7c47cb8a9f4bd4e18cbdc0d1120 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Fix build with freetype2 depending on harfbuzzAllan Sandfeld Jensen2015-10-121-2/+5
| | | | | | | | | Chromium uses system freetype2 by default but not harfbuzz by default, since some newer versions of freetype2 depends on harfbuzz, we need to configure Chromium to use system harfbuzz in those cases. Change-Id: Ic15abe85c5b7e5ef1c3d82420efbc8605c2fe1ae Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Clean up configure syntaxAllan Sandfeld Jensen2015-10-121-15/+14
| | | | | | | | Imports use? qmake macro from QtWebKit and use it to make checks simpler and keep the webengine config in WEBENGINE_CONFIG. Change-Id: Ic0f1fca45ebc292d8146107697f9d3ca3764dfb4 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>