summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* Fix Xcode version check to work with major versions >= 10Alexandru Croitor2018-09-281-1/+21
| | | | | | | | | | | | | | | | | We used lessThan for the Xcode version check, which started to fail when comparing Xcode 10 with Xcode 7.3, because lessThan first tries to convert the arguments to ints and if that fails, it does string comparison instead. Rewrite the code to be similar to the SDK checks. We can't use the qmake versionAtLeast function because it was added in Qt 5.10, and we still need to be able to build against Qt 5.9. Task-number: QTBUG-69476 Change-Id: I831a683ee676838a4d531a4d6e715182e9e4193d Reviewed-by: Michael Brüning <michael.bruning@qt.io> (cherry picked from commit 0fc07d2943753f444f3eeccd9fb1dfde0938cb70) Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Remove QT_LIBDIR_EGL/GLES2 leftoversMichal Klocek2018-01-021-11/+0
| | | | | | | | | | Since e812237b69 we do not longer use QT_LIBDIR_EGL and QT_LIBDIR_GLES2 to dynamically load gl libraries. Remove leftovers from gn generator. Task-number: QTBUG-65442 Change-Id: I045242b49be411373d36eb9c333916d27b0f169d Reviewed-by: Viktor Engelmann <viktor.engelmann@qt.io>
* Add mkspecs include path to the gn buildPeter Varga2017-09-201-1/+2
| | | | | | | | | INCLUDEPATH qmake variable doesn't contain mkspecs include path. Add it explicitly to the include_dirs gn variable in the gn generator. Change-Id: I454aa015794f258f588590b4662a16c04041c8fd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* 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>
* Add detection for system re2Allan Sandfeld Jensen2017-09-031-0/+1
| | | | | | Change-Id: Ifa305045f3594f06b0ee106cd43f9d35853f8958 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Remove proprietary codec summary from configure.prfAllan Sandfeld Jensen2017-08-301-5/+0
| | | | | | | We already list this in summary of configure.json Change-Id: I03e5b5aa779541fd1ac367a1066b5c1846979cc1 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Remove dead code for detecting system SRTPAllan Sandfeld Jensen2017-08-111-5/+0
| | | | | | | | | We currently don't support unbundling SRTP because Chromium uses a too new unreleased version, but we were still testing for it and claiming to use the system one if found. Change-Id: I250f0d7fc1e09398b3196895bdd529d366cd0a86 Reviewed-by: Alexandru Croitor <alexandru.croitor@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>
* | Fix host architecture detectionAllan Sandfeld Jensen2017-06-221-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Read the correct QT_ARCH and QT_TARGET_ARCH variables from QMAKE. This fixes cases where toolchain arch does not match host arch (e.g. x86 tools on x64). Also removes unnecessary WEBENGINE_ARCH variable, and a mismatch in GN mips names. Task-number: QTBUG-61528 Change-Id: I11b050977ce6203c10d1776a15eb32efa4693290 Reviewed-by: Rolf Eike Beer <eb@emlix.com> Reviewed-by: Michal Klocek <michal.klocek@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@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 duplicate LC_RPATH values on macOSAlexandru Croitor2017-06-161-2/+1
| | | | | | | | | | | | | | | | | Starting with Qt 5.9, the values in QMAKE_RPATHDIR were passed along to GN, which resulted in both qmake and GN adding rpath linker flags, leading to duplicate rpath values. This lead to the Qt package installer not removing all absolute path rpath values when installing Qt, which subsequently caused issues with code signing Qt applications. The fix is not to pass the rpath values to GN, and rely on the ones generated by qmake. Task-number: QTBUG-61413 Change-Id: Ib27d9c232674534d4b053cb1e12750f5c8bc87a9 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Merge remote-tracking branch 'origin/5.9.0' into 5.9Allan Sandfeld Jensen2017-05-291-24/+24
|\ | | | | | | Change-Id: Iba6114263488d6bf84b255b38182904dc5880386
| * Update changes and configure feedbackAllan Sandfeld Jensen2017-05-161-5/+5
| | | | | | | | | | | | | | | | | | | | | | Document changes to configure system and ensure we don't output nonsense when the two systems are mixed. Also updates changes to include security fixes and that binary compatibily was fixed, and lists all relevant bug-fixes I could fine. Change-Id: I68aa729e0846a0c0c18fd7d91e016b551157ddd6 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * Document Mac App Store incompatibilityAlexandru Croitor2017-05-151-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | The patch also removes the appstore compatibility feature from the feature summary displayed when qmake is invoked, and also makes sure not to pass the relevant compatibility argument to GN. [ChangeLog][macOS] Removed -appstore-compliant configure switch. Task-number: QTBUG-60443 Change-Id: I9c5ced0375195dd62e2416c57484d8e6021ebdd8 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| * Prefer NSS on all Linux buildsAllan Sandfeld Jensen2017-05-101-4/+2
| | | | | | | | | | | | | | | | | | Otherwise we can get certificate errors on a lot distros, for many pages including our own and Google's. Task-number: QTBUG-60603 Change-Id: I52f3486711438389ed8a5d7272bf5b211a37c805 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| * Fix backwards compatibilityAllan Sandfeld Jensen2017-05-101-1/+6
| | | | | | | | | | | | | | | | | | | | QtWebEngine supports building with last stable and last LTS Qt releases. Guard some 5.7-5.9 API from being used when not available, and reinstate the default features for 5.6 LTS builds. Change-Id: Ia288a49109d011a2bee883d4a2d38d994b497d59 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| * Move ICU configuration to new configure systemAllan Sandfeld Jensen2017-05-081-10/+12
| | | | | | | | | | | | | | | | | | The command-line switches is called webengine-icu to avoid conflicting with icu switches in other modules. Change-Id: Ic923a199efbc4081b3c30f0cafa4b7ea786bdb00 Reviewed-by: Michael Brüning <michael.bruning@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@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>
* | Improve distcleanAllan Sandfeld Jensen2017-05-081-0/+2
|/ | | | | | | | Remove our manually generated configuration files on make distclean. Task-number: QTBUG-60235 Change-Id: I8b851fa80e1c17ea6ede9efb6ba0d2f108026db8 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Use qtbase optimize_size configure optionAllan Sandfeld Jensen2017-05-041-1/+3
| | | | | | | | | The optimize-size configure option got landed generally in qtbase, so respond to that instead of doing our own. Change-Id: I8bfcf494a6f0d599bf375ae4ea73ce86ee02216b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Move qmake files to standard locationsAllan Sandfeld Jensen2017-05-024-0/+885
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-01 18:43:36 +0000