summaryrefslogtreecommitdiffstats
path: root/tools/qmake/config.tests
Commit message (Collapse)AuthorAgeFilesLines
* Fix Linux audio library detectionAllan Sandfeld Jensen2016-12-152-0/+39
| | | | | | | | | 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>
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-162-39/+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-052-47/+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>
* | Updated license headersJani Heikkinen2016-02-015-89/+49
| | | | | | | | | | | | | | | | | | | | | | | | From Qt 5.7 -> tools & tests are licensed under GPL v3 with some exceptions, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new GPL-EXCEPT header (in those files which will be under GPL 3 with exceptions) Change-Id: I59fcbb8cd1ca42b1a5ef96577bcb35ea0af01b71 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Switch libvpx detection to config checkAllan Sandfeld Jensen2016-01-112-0/+46
|/ | | | | | | | 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>
* Fix khr autotest to work with non-standard locationsLaszlo Agocs2015-09-251-0/+4
| | | | | | | | | Just like the egl autotest in qtbase does, the paths have to be added from the respective QMAKE variables, otherwise the test will never pass on systems where EGL and friends are installed in a non-standard location. Change-Id: Idaa2136b5574f6f320abb8a7074350b5838b402e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Test only for KHR headerv5.6.0-alpha1Samuli Piippo2015-09-011-3/+1
| | | | | | | | | Raspberry Pi toolchain from yocto uses older khr headers that do not include defines for KHRONOS_FALSE and KHRONOS_TRUE, but can still be used to build qtwebengine correctly. Change-Id: Ia7a6420ba142141ebb16d880f989eb56f892f1a3 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Use system snappy if availableAllan Sandfeld Jensen2015-07-282-0/+47
| | | | | | | 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>
* Use system libsrtp if availableAllan Sandfeld Jensen2015-07-192-0/+46
| | | | | | | | Adds configure check and configures chromium to use system libsrtp if available. Change-Id: I134c50e1179bfb6acf01347456f8be26f27bf559 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Add config test for Khronos development headersAndras Becsi2015-02-232-0/+46
| | | | | | | | | 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>
* Update copyright headersJani Heikkinen2015-02-161-7/+7
| | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: Ieb6bac7a1be5c25eb7cb917495b58b6a870ca6d4 Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
* Refactor our build skipping logicPierre Rossi2015-01-162-0/+47
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>