summaryrefslogtreecommitdiffstats
path: root/mkspecs/features/functions.prf
Commit message (Collapse)AuthorAgeFilesLines
* Fix build when we don't have all the X11 dependenciesAllan Sandfeld Jensen2019-01-171-1/+1
| | | | | | | | | | We only enable the GLX backends when we have all the X11 dependencies, but try to build the corresponding sources files even when we don't. And additional xrandr is no longer a dependency. Change-Id: I35c97c34c6d121bd6544344a73653900bf406be3 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Fix running thumb vs arm instruction set on yoctoMichal Klocek2018-11-211-1/+3
| | | | | | | | | | | | On yocto CC/CXX export contains flags like -marm, -mthumb see https://lists.yoctoproject.org/pipermail/poky/2018-September/011497.html Fix builds for webengine and check also QMAKE_CC for flags, otherwise build ends up passing -marm and -mthumb flags at the same time. Change-Id: I76feb0eaf3bed8a6c3552db1bbf1a0809f03110a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Add extra config check for x11 ozone pluginMichal Klocek2018-10-231-0/+9
| | | | | | | | In case of cross compilation for targets with x11, check also for dependencies. Change-Id: I32df962a61e5a13ee1290ab2c256f0f222dafbd3 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Adapt to new GN submoduleAllan Sandfeld Jensen2018-09-221-1/+1
| | | | | | Change-Id: I3980634a1029479ab944b2e03f12a02d0c77d0c1 Reviewed-by: Michal Klocek <michal.klocek@qt.io> Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Use ozone for x11Michal Klocek2018-08-021-4/+1
| | | | | | | | | | | | | | | | | | | | | Switch to use ozone also for x11/glx. This way we have a more elegant approach to hook in our gl surface classes and we use ozone for all linux qpa backends. Moreover, we have now also more fine grain control to reimplement gl surface handling logic. This also aims to fix currently broken wayland backend, but instead of patching the broken x11 calls, we simply reuse ozone which does not use x11 for ozone egl. Add webengine-x11 check to handle ozone glx plugin compilation. For ozone egl backend reimplement missing functions. Task-number: QTBUG-65682 Task-number: QTBUG-51631 Change-Id: I8b45c6f4d09a1c703efb12b6452d78ab385371ab Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
* Add pkg-host wrapper scriptMichal Klocek2018-01-231-0/+15
| | | | | | | | | | | | | | | 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>
* Add 'webengine' prefix to configure features, tests, libraries, etcAlexandru Croitor2017-11-121-1/+1
| | | | | | | | This is done to make sure there are no conflicts with features in other modules, because they all share a global namespace. Change-Id: I95b3b7fadd8ffc2979ee3aad2234ee543d57c7d8 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Readd isDeveloperBuildAllan Sandfeld Jensen2017-10-241-0/+5
| | | | | | | | Is still used by windows builds when gn needs to be regenerated. Removed in d8f18e2b918e2f7c8149d3e6cd1510b27bde7dfd Change-Id: I81d42f058dab251e79acca47e76b950c725cfaf2 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Simplify binary pathsAllan Sandfeld Jensen2017-09-201-7/+2
| | | | | | | | These old names were for gyp, and are not needed for gn, so we can instead use the same path names Qt would use. Change-Id: I423c2a04df6740ebba84f8c670490dbcf59c3ca7 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Remove WEBENGINE_CONFIG from configureMichal Klocek2017-09-201-6/+1
| | | | | | | | | | | | | | Do not store flags in qmake.cache with WEBENGINE_CONFIG. Use directly qtConfig values insted. This makes configuration more consistent, simplifies handling and avoids passing values from qtConfig to WEBENIGNE_CONFIG, which then were passed to gn. [ChangeLog] Removing WEBENGINE_CONFIG from qtwebengine configure Change-Id: I1a773fb4bff6d67ad75c237d044998051d92ab51 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Add testsupport to new configure systemMichal Klocek2017-09-191-12/+0
| | | | | Change-Id: I123ce22ea3a3d8b7b80c67fa322cb817d924f2e0 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Cleanup skipBuild codeMichal Klocek2017-09-191-173/+12
| | | | | | | | | Move all skipBuild related checks to runConfigure() in configure.prf. Remove some unused functions. Move platform checks to separate prf file. Change-Id: Ia45c837c91c341ed1fbc2e32fc098329da989920 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Move webengine sanitizer option to new configure systemMichal Klocek2017-09-181-101/+0
| | | | | | | Use new configure system to enable sanitizer. Change-Id: I633bc96973b9b9bcd56c4ef03a589e147215dc86 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Make cross compilation builds againMichal Klocek2017-09-131-5/+0
| | | | | | | | | 1292b30 fixed existing b2qt ci compilation issues. Enable cross compilation builds in ci. Change-Id: I2092451c16a5cbdfff0dd57e627ddbded0001f79 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Adaptations for Chromium 60Alexandru Croitor2017-09-111-7/+12
| | | | | | Change-Id: I536258e22c2ec143f2fd3f1cbda229e0611b6af4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Give up earlier on MIPS64 and don't tell users it is supportedAllan Sandfeld Jensen2017-09-051-2/+3
| | | | | | | | | Chromium doesn't currently build on MIPS64, so we shouldn't tell people it might work. Task-number: QTBUG-62655 Change-Id: I56e798cae6914cc8087f1a6a51f07383e81f86c1 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Merge remote-tracking branch 'origin/5.9.1' into 5.9Liang Qi2017-06-241-0/+12
|\ | | | | | | | | | | | | Conflicts: mkspecs/features/functions.prf Change-Id: I53d65ea49f546c7d4aadfdaff178fd2f3f4cdf11
| * Revert "Re-enable building on 32 bit Windows"Joerg Bornemann2017-06-231-0/+12
| | | | | | | | | | | | | | | | | | | | Turns out that we still run out of memory when linking on a 32 bit Windows. This reverts commit 53b632ee0b6dc92ffc4f94f88755d94f7533637a. Change-Id: Ifd8319927b816a52664f214a2540bad31f67935a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Also block intel compiler on macOSAllan Sandfeld Jensen2017-06-231-0/+4
| | | | | | | | | | Change-Id: I3d1157d109c2413593a4d30126fc70349480fe93 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Block intel compilerAllan Sandfeld Jensen2017-06-201-1/+5
|/ | | | | | | | | | We don't support building with the Intel compiler and since it fakes being msvc and gcc, we need to explicitly test for it to block it. Task-number: QTQAINFRA-1196 Change-Id: I727b17d271dab67af8ce69f80bd3d2414cdc4060 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Re-enable building on 32 bit WindowsJoerg Bornemann2017-06-181-12/+0
| | | | | | | The issue that prevented us from doing so seems to be fixed. Change-Id: I230419b61352d91e794e5680ca70802d02393bc0 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Remove superfluous MSVC version checkJoerg Bornemann2017-05-231-21/+0
| | | | | | | | | The MSVC version is already checked by configure.prf. Remove the older, outdated check. This saves us from keeping the version number and error messages in multiple places in sync. Change-Id: I95c4d373771fd57b078b2148b4d8df96778f84ee Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Move qmake files to standard locationsAllan Sandfeld Jensen2017-05-021-0/+408
The tools/qmake directory is a left over from webkit where qmake was but one of many buildsystems. This is not necessary for qtwebengine, so we can instead use the standard locations. Change-Id: I3d126d6627295b113b091f3eabeee25f1c1f6183 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-06 15:27:01 +0000