summaryrefslogtreecommitdiffstats
path: root/mkspecs/features/configure.prf
Commit message (Collapse)AuthorAgeFilesLines
* Add 'webengine' prefix to configure features, tests, libraries, etcAlexandru Croitor2017-11-121-9/+9
| | | | | | | | 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>
* Remove WEBENGINE_CONFIG from configureMichal Klocek2017-09-201-65/+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>
* Cleanup skipBuild codeMichal Klocek2017-09-191-10/+21
| | | | | | | | | 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-0/+5
| | | | | | | 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-94/+47
| | | | | | | | | | | | | 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>
* Adaptations for Chromium 60Alexandru Croitor2017-09-111-1/+4
| | | | | | Change-Id: I536258e22c2ec143f2fd3f1cbda229e0611b6af4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Merge branch '5.9' into 5.10Allan Sandfeld Jensen2017-09-061-10/+1
|\ | | | | | | Change-Id: I9fe9946ba47f9ef509a861963c83e275a25fffd0
| * 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>
* | Require NSS for linux buildsMichal Klocek2017-09-051-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | OpenSSL certificate validation was dropped in https://codereview.chromium.org/2862543003 Bundled NSS was deopped in https://codereview.chromium.org/1882433002 Task-number: QTBUG-52193 Task-number: QTBUG-62891 Change-Id: I300c13c30a2625bbe56beb0659107d2a395b0a4d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Add check for glibc > 2.16Michal Klocek2017-09-051-0/+5
| | | | | | | | | | | | | | | | | | | | 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>
* | Remove support for building with Qt versions < 5.8.0Allan Sandfeld Jensen2017-08-041-77/+34
| | | | | | | | | | Change-Id: I2f2ba754111e198298b7d1a595343fcd773e05e5 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Move NSS certificate handling configuration to configure.jsonAllan Sandfeld Jensen2017-08-041-10/+1
| | | | | | | | | | | | Change-Id: Ibae2b8ebb90e79ff8337d994b2234eed5e230dcc Reviewed-by: Viktor Engelmann <viktor.engelmann@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | Add python check for module buildMichal Klocek2017-07-141-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | Python version check skipped the build only for qt5 root builds, however for module build it only printed the warning and the build continued. Skip the build if python version is incorrect. Change-Id: I72d5f638eb79de93faaaa07b39272bdcb8615c3f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Viktor Engelmann <viktor.engelmann@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.9' into dev" into refs/staging/devAllan Sandfeld Jensen2017-07-061-4/+0
|\|
| * 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>
* | Add Configure-Time Tests for gperf, flex and bisonViktor Engelmann2017-07-051-0/+13
|/ | | | | | | | | | | | 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>
* 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>
* 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-021-0/+213
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-09 22:38:41 +0000