summaryrefslogtreecommitdiffstats
path: root/configure.pri
Commit message (Collapse)AuthorAgeFilesLines
* Add pkg-host wrapper scriptMichal Klocek2018-01-231-0/+14
| | | | | | | | | | | | | | | Currently we need pkg-config host for cross-builds to build build tools. Unfortunately if build environment exports PKG_CONFIG_* variables pkg-config will pick them up also for host builds, which can lead to compile errors. Create pkg-config-host_wrapper which explicitly unsets PKG_CONFIG_* variables. This is a temporary workaround till proper solution is implemented in qtbase. Task-number: QTBUG-65079 Change-Id: I9aff4a27ba62e096ed4c023cf022a41833260178 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Fix sanitizer buildAlexandru Croitor2018-01-101-14/+20
| | | | | | Task-number: QTBUG-64726 Change-Id: Ic88eed62e85ad1d95afcbd154c6556509e42bd47 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Adaptations to 61-basedAllan Sandfeld Jensen2017-10-251-1/+1
| | | | | Change-Id: I5cb198445f283c6cea8187a1a2883896df0ee918 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Fix pkg-config call in icu testMichal Klocek2017-09-201-1/+1
| | | | | | | | The call had the side effect of generating extra pkg-config-wrapper.sh in root of the build. Use different pkg-config call. Change-Id: I8335ae55547272924802f3903ce6bba903389b62 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Add testsupport to new configure systemMichal Klocek2017-09-191-0/+5
| | | | | Change-Id: I123ce22ea3a3d8b7b80c67fa322cb817d924f2e0 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Move webengine sanitizer option to new configure systemMichal Klocek2017-09-181-0/+89
| | | | | | | Use new configure system to enable sanitizer. Change-Id: I633bc96973b9b9bcd56c4ef03a589e147215dc86 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Migrate configuration lefovers to new configure systemMichal Klocek2017-09-121-0/+20
| | | | | | | | | | | | | Use new configure system for all package detection. Move config test execution to new configure system. However, keep old configure.prf for error hanlding. Split configuration summary into: * optional system libraries used * required system libraries * required system libraries for qpa-xcb (on linux) Change-Id: I5108456caa024a1ada9bb54750693064a2d36f78 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Merge "Merge branch '5.9' into 5.10" into refs/staging/5.10Allan Sandfeld Jensen2017-09-111-2/+2
|\
| * Merge branch '5.9' into 5.10Allan Sandfeld Jensen2017-09-061-2/+2
| |\ | | | | | | | | | Change-Id: I9fe9946ba47f9ef509a861963c83e275a25fffd0
| | * Fix the detection of python2.exeHannah von Reth2017-08-211-2/+2
| | | | | | | | | | | | | | | | | | Change-Id: I6a8be77d1acfea34252a3b5c5a17e1792787a32b Reviewed-by: Florian Bruhin <qt-project.org@the-compiler.org> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | | Pick up GNU tools from the mother repo's gnuwin32 directoryJoerg Bornemann2017-09-111-3/+16
|/ / | | | | | | | | | | | | This makes it unnecessary to have gperf, bison and flex in PATH. Change-Id: Ie4a0dea4452e3a38067b47eb41c3e9904274e175 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Add check for glibc > 2.16Michal Klocek2017-09-051-0/+20
| | | | | | | | | | | | | | | | | | | | Fix broken compilation due to "Unable to create small static TLS block in shared library" https://sourceware.org/bugzilla/show_bug.cgi?id=14898 Change-Id: I53840dbff22f4b10bdb32401f79889f6c313f470 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Add Configure-Time Tests for gperf, flex and bisonViktor Engelmann2017-07-051-0/+30
|/ | | | | | | | | | | | Configure-Time tests for presence of (required) gperf, bison and flex are added to configure.pri and configure.json, so that we can decide early on to skip the build, instead of starting a build that will fail much later, yield incomprehensible error messages and make the build of the complete Qt framework fail. Task-number: QTBUG-52805 Change-Id: I7dab49e6e8672b72901519ad7d88de97197fe587 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* 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>