summaryrefslogtreecommitdiffstats
path: root/tools/qmake/mkspecs/features/configure.prf
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* 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>
* Make NSS vs BoringSSL choice more flexibleAllan Sandfeld Jensen2015-10-121-2/+15
| | | | | | | | Make the NSS library optional on Linux to reduce the hard coded difference between embedded and desktop builds. Change-Id: I3d7f703ead0ff325ffd2ae272e7e4c2d5258fc25 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Remove hard dependency on libjpeg on Linux.Michael Brüning2015-10-121-1/+0
| | | | | | | | It made the build fail on systems that use libjpeg-turbo. Task-number: QTBUG-48606 Change-Id: I1aa6acab1627d3f4613b4ca39837b6deb25d3cc0 Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
* Add more required pkg-config packagesAllan Sandfeld Jensen2015-09-231-0/+3
| | | | | | | These packages are required if Qt was build against them. Change-Id: I2b664229485dd764617d1683647951ab600768ed Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Update dependenciesAllan Sandfeld Jensen2015-09-181-8/+12
| | | | | | | | Add more pkg-config based libraries that we need to build Qt WebEngine and update Chromium SHA so that we do not need ATK. Change-Id: I713823e3dcad9b9f5a112d500d23281ac59c307b Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Add configurable option for using system FFMPEGAllan Sandfeld Jensen2015-07-281-0/+15
| | | | | | | | | | | Add qmake command line option to use system FFMPEG and report result and option in the configure summary. Also checks libraries FFMPEG and chromium both uses are available on the system since linking will otherwise fail. Does not check if the version of the libav libraries are correct, but leaves that to whomever enables the option. Change-Id: I39c9c47eba19a6e40872a2e9b24a9010cdea1011 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Use system snappy if availableAllan Sandfeld Jensen2015-07-281-0/+2
| | | | | | | Snappy doesn't use pkg-config so we use a configure check to detect it. Change-Id: I54f02d493139069ca8838f7008041340990fc016 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Add post configure step and make using system ICU an optionAllan Sandfeld Jensen2015-07-271-0/+22
| | | | | | | | | | Adds a post configure step to test qmake arguments, summerize options, and make it possible to enable using system ICU, but leaving it default off for now. Also summerizes the proprietary codec configuration. Change-Id: I620a69dcdbb14b49143770d38eecb5aeab48ad05 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Use system libsrtp if availableAllan Sandfeld Jensen2015-07-191-0/+2
| | | | | | | | Adds configure check and configures chromium to use system libsrtp if available. Change-Id: I134c50e1179bfb6acf01347456f8be26f27bf559 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Detect and use system librariesAllan Sandfeld Jensen2015-07-191-5/+16
| | | | | | | | Uses pkg-config to detect libevent, libwebp, flac, jsoncpp, opus, speex and vpx, and configure chromium to link with system versions. Change-Id: Ic6c5bbe07929a7c2b79abcb760a8c61b0c9ed92f Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Add xscrnsaver to required packagesAllan Sandfeld Jensen2015-07-021-1/+1
| | | | | | | | | Xscrnsaver is now used for idle desktop detection on Linux, and required unless we disable that functionality from Chromium. Change-Id: I5295ebd822a4b53024d86868aa6dc4912ab120c1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
* Unbundle zlib, minizip, libxml2 and libxslt on LinuxAllan Sandfeld Jensen2015-07-011-0/+8
| | | | | | | If available use the system versions of these basic libraries on Linux. Change-Id: Iebcd5c11c53d0d491c457ccff71be04f8b2cac1c Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Add config test for Khronos development headersAndras Becsi2015-02-231-1/+2
| | | | | | | | | These are needed on Linux, since the core layer can not rely on the shipped third_party/khronos headers because that would break the build on GLES configs. Change-Id: I598f58a9830b31a56425db60b7fc36c3f34f8581 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Add additional dependency checksPierre Rossi2015-01-161-1/+9
| | | | | | | | | For dependencies that have caused trouble before, such as libdrm. Task-number: QTBUG-41516 Change-Id: I0cee98282e93460971471796a65a43be4750c6b0 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Refactor our build skipping logicPierre Rossi2015-01-161-0/+23
Move the logic to mkspecs to keep the .pro files robust. Add the basic infrastructure for config.tests, the first one of which will consistently ensure we have libcap on linux. Change-Id: Iee4207e747e589ba67d5353cb4c18f156e555c11 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-22 01:22:24 +0000