summaryrefslogtreecommitdiffstats
path: root/configure.pri
Commit message (Collapse)AuthorAgeFilesLines
* Make python2 usage more robustJoerg Bornemann2017-04-271-0/+41
| | | | | | | | | | | | | | | | | | | | 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>
* Fix build with 5.8 and make embedded configurableAllan Sandfeld Jensen2017-01-311-0/+9
| | | | | | | | | | 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>
* Fix detection of system ninja and gn on WindowsJoerg Bornemann2017-01-111-2/+3
| | | | | | | | On Windows we need to look for ninja.exe and gn.exe. Change-Id: Ibdf7416135ecbb32974b6d23c6045b1d195439aa Reviewed-by: Michal Klocek <michal.klocek@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Add gn bootstrap to build systemMichal Klocek2016-12-081-0/+12
| | | | | | | 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-0/+12
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>