summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* Fix Xcode version check to work with major versions >= 10Alexandru Croitor2018-07-231-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>
* Fix minimum GCC version in documentationJüri Valdmann2018-07-231-0/+1
| | | | | | | | | The documentation says we require 4.7 or later but actually already since the 5.10.0 release our qmake config has been checking for version 5 or later. Task-number: QTBUG-69535 Change-Id: Ia2f74b35570a9ba6fd1423b9507fe636d850db76 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Clarify Windows build requirementsJoerg Bornemann2018-03-121-1/+1
| | | | | | | | [ChangeLog][QtWebEngine] QtWebEngine requires Visual Studio 2017. Task-number: QTBUG-66596 Change-Id: Ib9961afef17bc095bdf983cb06981e16963157c1 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Merge remote-tracking branch 'origin/5.10' into devAllan Sandfeld Jensen2018-02-022-0/+28
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/core/download_manager_delegate_qt.cpp src/core/download_manager_delegate_qt.h src/core/render_widget_host_view_qt.cpp src/core/web_contents_adapter.cpp src/webengine/api/qquickwebengineview.cpp tests/auto/widgets/qwebenginedownloads/tst_qwebenginedownloads.cpp Change-Id: I2308414ce257ae5bb0fc9f6493aa111a267ff39b
| * Add 32bit host compiler testMichal Klocek2018-01-241-0/+7
| | | | | | | | | | | | | | | | | | The 32bit compiler is required for creating v8 snapshots. Task-number: QTBUG-65004 Task-number: QTBUG-64869 Change-Id: I0a7a351208768f0b12900fac14d3abd5c8d99fa2 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Add pkg-host wrapper scriptMichal Klocek2018-01-232-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Adaptations for Chromium 63Allan Sandfeld Jensen2018-01-251-4/+2
| | | | | | | | | | Change-Id: I551c7091bbc0463bed94180313eb2bfe92f0ad84 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* | Merge remote-tracking branch 'origin/5.10' into devAllan Sandfeld Jensen2018-01-172-12/+1
|\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/webengine/api/qquickwebengineview_p_p.h src/webenginewidgets/api/qwebenginepage_p.h tests/auto/quick/qmltests/data/TestWebEngineView.qml Change-Id: Id2acc92e8d0364bdaaf5a63ea2d2cb9cd533ade3
| * Fix sanitizer buildAlexandru Croitor2018-01-101-1/+1
| | | | | | | | | | | | Task-number: QTBUG-64726 Change-Id: Ic88eed62e85ad1d95afcbd154c6556509e42bd47 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| * Merge remote-tracking branch 'origin/5.9' into 5.10Allan Sandfeld Jensen2018-01-081-11/+0
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/core/api/qwebengineurlrequestjob.cpp src/core/browser_context_adapter.cpp src/core/renderer/user_resource_controller.cpp src/core/web_engine_context.cpp src/webenginewidgets/api/qwebenginepage.cpp Change-Id: I5278e5e22e1776d42975fc94d70ff8ca4f81fb9a
| | * 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>
* | | Merge remote-tracking branch 'origin/5.10' into devAllan Sandfeld Jensen2017-11-293-11/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/core/web_event_factory.cpp src/core/web_event_factory.h src/webengine/render_widget_host_view_qt_delegate_quick.h Change-Id: Ic43787e2689c81b501ed395a990190eb67d83a2b
| * | Add 'webengine' prefix to configure features, tests, libraries, etcAlexandru Croitor2017-11-123-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge remote-tracking branch 'origin/5.10' into devAllan Sandfeld Jensen2017-10-271-0/+5
|\| | | | | | | | | | | Change-Id: Ibc1c881a67bf088ba6fb044e2553c74c7e9e24ca
| * | 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>
* | | Merge branch '5.10' into devAllan Sandfeld Jensen2017-10-131-1/+2
|\| | | | | | | | | | | Change-Id: I3a411e4019a5ec2f7d1a967b62a00ad7cf92f6f4
| * | Merge remote-tracking branch 'origin/5.9' into 5.10Allan Sandfeld Jensen2017-09-291-1/+2
| |\| | | | | | | | | | Change-Id: I7094e85a7770303a2ae30baccbc484c04f33600e
| | * 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>
* | | Clean up remote devtools implementationAllan Sandfeld Jensen2017-10-131-17/+19
|/ / | | | | | | | | | | | | | | | | Rename the file after the contents has been refactored being different classes, and switch to using Chromium discover HTML page which we now have available and which works. Change-Id: Ic04a56471be3a49e5d1dd4b1f914eda927272d89 Reviewed-by: Viktor Engelmann <viktor.engelmann@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-202-71/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-193-183/+183
| | | | | | | | | | | | | | | | | | 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-182-101/+5
| | | | | | | | | | | | | | 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>
* | 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-112-8/+16
| | | | | | | | | | | | 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-062-12/+4
|\| | | | | | | Change-Id: I9fe9946ba47f9ef509a861963c83e275a25fffd0
| * 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>
* | 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-063-7/+10
|\|
| * 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>
* | 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>
* 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 10:37:02 +0000