summaryrefslogtreecommitdiffstats
path: root/tools/qmake/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* Require OSX SDK version of at least 10.10.3.Alexandru Croitor2016-03-081-5/+25
| | | | | | | | | | | | Chromium 49-based uses new OSX API which was added in SDK 10.10.3. Make sure not to allow compilation in case the SDK version is lower than that. This also reverts commit 70ed3812fbe5eee6f62ddb26251f46061b0d3675 to allow compiling on OSX 10.9, with an appropriate SDK. Task-number: QTBUG-51350 Change-Id: Ib6dab0a1e16734cda9429363c90d2c8b8838d833 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@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>
* Skip building on 32-bit windows hostsAllan Sandfeld Jensen2016-03-051-0/+12
| | | | | | | | We keep running out of memory during linking and must skip building on 32-bit architectures until that problem is solved. Change-Id: Ib0b465cb033df0112133eb256adeb498d260da7f Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Require xcode 7.0 and OS X 10.10Allan Sandfeld Jensen2016-02-221-5/+5
| | | | | | | | | We might be able to get xcode 6.0 on OS X 10.9 working with an 10.10.3 SDK, but for now we just require 10.10 and a newer xcode. Change-Id: Ibeb068e9993b3709a1fd74370d7892718a108ab1 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Merge branch '5.6' into devAllan Sandfeld Jensen2016-02-042-17/+35
|\ | | | | | | Change-Id: I0bb971f01ee1e02da768f336680c8ec0254ab2b0
| * winrt: Disable buildMaurice Kalinowski2016-02-021-0/+4
| | | | | | | | | | | | | | | | WinRT is not a supported platform and checks to disable the build have been removed in previous refactorings. Change-Id: I22d2a8ae28f7cfaa3b962ac353ad5c14f11771a9 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| * 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>
| * Allow build on all Linux platformsKai Koehne2016-01-261-16/+30
| | | | | | | | | | | | | | | | | | | | | | | | Support also irregular mkspec names like linux-imx6-g++. We officially only support boot2qt for embedded Linux, but that's no reason to prevent builing on other configurations. Also, the line between embedded and Desktop Linux is blurry. Task-number: QTBUG-49249 Task-number: QTBUG-50259 Change-Id: If5b87a21bb226194c8340430be958d42ae80b537 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Merge branch '5.6' into devAllan Sandfeld Jensen2016-01-121-2/+6
|\| | | | | | | Change-Id: I4272eb59cac08c69eaa58dd4d94debf1b8c5cf78
| * Merge remote-tracking branch 'origin/5.5' into 5.6Michael Bruning2015-12-091-2/+6
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp Change-Id: I451bc61673014db8e87b2a2cf98fb6879ce0e58d
| | * Fix ninja for shadow builds on windows.Michael Bruning2015-11-301-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | xcopy seems to behave differently for than cp when copying directories recursively. Change-Id: I5130a0642511fb796d9b32e0d4cd2cd2b9153dc0 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 remote-tracking branch 'origin/5.6' into devLiang Qi2015-12-031-9/+22
|\| | | | | | | | | | | Change-Id: I052fdc4245e25e58457d51f6e49703bc7dd8ff00
| * | Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-11-201-9/+22
| |\| | | | | | | | | | Change-Id: I20e36d0e18dd26365557a4093436e9660e30e173
| | * Build ninja in the shadow build directory.Michael Bruning2015-11-191-9/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | Essentially makes a copy of the ninja sources to the build directory to be non-intrusive for src/3rdparty. Task-number: QTBUG-44002 Change-Id: I82a686abbfab2579462dcb57e10b16f71a3a0d4e Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | | Merge branch '5.6' into devAllan Sandfeld Jensen2015-11-202-13/+11
|\| | | | | | | | | | | 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>
| * | Check if platform is supported first.Michael Bruning2015-10-261-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The former location of the check at the end of the function caused misleading error messages about missing features to be printed as the reason for the skipped build, when actually the whole platform was not supported by Qt WebEngine. Change-Id: Ie8ad80b8716b7212ae96ce6ed2e2ab51f396d219 Reviewed-by: Joerg Bornemann <joerg.bornemann@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>
* | Enable building with MSVC 2015Kai Koehne2015-10-191-2/+2
| | | | | | | | | | | | | | | | | | Enable MSVC 2015 in prechecks and fix error C2308: concatenating mismatched strings Task-number: QTBUG-47541 Change-Id: Ia583e2963c7e6ef8327909b91c8df04aeb17eb07 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Check for OS X minimum version early onKai Koehne2015-10-151-4/+12
| | | | | | | | | | | | Change-Id: Ib7f9af5784a5e57767e70a1aa580a98d75e129be Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Remove special case for msvc2013 when checking for c++11Kai Koehne2015-10-131-1/+1
| | | | | | | | | | | | | | | | Since qtbase commit cc67960f msvc enables c++11 for MSVC 2012 and newer, too. Change-Id: If73850759bbbb107c99e2dd6e4066e15b73d8f6c 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-122-15/+19
| | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-10-081-5/+12
|\| | | | | | | Change-Id: I1ac58ada3f32821d62d49e5fcb12546aa9e75fb4
| * fix python version checkJoerg Bornemann2015-10-061-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The python code that is used to determine the version number did not work with python3. In python3 print is a real function and must be called as such. Use positional accessors to be compatible with python < 2.6. Also extend the error message for users that attempt the build with python3. Task-number: QTBUG-48507 Change-Id: I49e1fb77c2cc421ac1faed8d8143bf605fbde700 Reviewed-by: Florian Bruhin <qt-project.org@the-compiler.org> Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into 5.6Allan Sandfeld Jensen2015-09-241-1/+1
|\| | | | | | | Change-Id: Ice3d6e88238940a62d75e7c67f63b626285fccb0
| * enable OS X 32 bit buildJoerg Bornemann2015-09-211-1/+1
| | | | | | | | | | | | Task-number: QTBUG-48228 Change-Id: Ic8ee640316b95b2e7e2de9115330821dfae0e905 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.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-182-9/+13
| | | | | | | | | | | | | | | | 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>
* | Enable building linux-clang platformAllan Sandfeld Jensen2015-09-071-1/+1
| | | | | | | | | | | | | | | | Adds the necessary flags to build with clang on desktop linux. Change-Id: I77f8937849bceefbae17158421a180e4a1adc2d3 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@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-273-1/+28
| | | | | | | | | | | | | | | | | | | | 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>
* Partially revert "Fix QtCreator loading of qtwebengine.pro"Andras Becsi2015-04-241-2/+2
| | | | | | | | Changing the python print signature seems to cause problems on Windows, so revert it. Change-Id: I715f792b880a2269ec153bbc73b432c6a4e87cc5 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Fix QtCreator loading of qtwebengine.proAndras Becsi2015-04-151-2/+2
| | | | | | | | | | | | | When QtCreator loads qtwebengine.pro some parsing errors are shown if it picks up the system python3 for basic detection. Although we do not plan to support python3 with all of our scripts (since Chromium does not) these simple cases can be fixed by using the function version of python's print. This patch also adds the Chromium source path to the core INCLUDEPATH so that Chromium headers are indexed as well. Change-Id: Ia6dec1c776fdcddf875fb8e814d8fb33b7340989 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Remove eAndroid hooksAndras Becsi2015-04-141-1/+0
| | | | | | | | Support for the B2Qt/eAndroid platform is discontinued with Qt 5.5 so we can remove all remnants of the android platform. Change-Id: I93f15fcd4a345203e15010ddf1e8de3e8d28ab56 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Enable building the QML test support API for developer buildsAndras Becsi2015-03-121-0/+1
| | | | | | | | This makes sure developers at least build this codepath so we have the needed coverage to find out if something breaks. Change-Id: Id56ecf5bb051e873e9bcf313a50a5eec23c2bd83 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* Add testsupport QML API and error page signalsPeter Varga2015-03-061-0/+6
| | | | | | | | | | | The testsupport API is used for test those features that are not planned to be accessible via the public API. For example, signals of the chromium's error page should not be visible for the develepor but it is important to test whether the error page is loaded properly. Change-Id: Ie5b3265a207d05649cabd624a001a6ffe2e45971 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>
* Call default_pre before using its resultsFrederik Gladhorn2015-02-191-3/+2
| | | | | | | | | To check the XCode version, default_pre has to be run first. Under most circumstances the order is not important since the value gets cached, that's why current builds usually work. Change-Id: I2613e92189592d7b25200e22a378f9f593b5057e Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Bypass the C++11 check for Visual Studio 2013.Michael Brüning2015-02-021-1/+1
| | | | | | | | Visual Studio enables the C++11 features it supports by default without using the QT_CONFIG logic. Change-Id: Ifcd9ae230a081783256c99183c10fc8295c014cc Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
* Check for python version 2, minor version 7 and up when building.Michael Brüning2015-01-201-2/+2
| | | | | | | | | Python 3 is not supported by the Chromium build system and installation of the Qt WebEngine libraries will fail. Change-Id: Ie402c069afecf087de8521401ed4261e74df8b87 Task-number: QTBUG-43242 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-09 14:32:41 +0000