summaryrefslogtreecommitdiffstats
path: root/src/core/config
Commit message (Collapse)AuthorAgeFilesLines
* Add GN_PKG_CONFIG_HOST to set host pkg-configMichal Klocek2017-11-221-1/+3
| | | | | | | | | Yocto builds need to pass pkg-config-native to build natvie tools. Task-number: QTBUG-63140 Change-Id: I75ef77461b56bd599240da95df13261aa9e4be75 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Add missing 'webengine' prefix in configure.jsonMichal Klocek2017-11-221-1/+1
| | | | | | | Fix condition mixup in webengine-system-lcms2 configuration Change-Id: Iff8513b1e1102c3ca6402b2ec346dfdded2c110a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Add 'webengine' prefix to configure features, tests, libraries, etcAlexandru Croitor2017-11-123-24/+24
| | | | | | | | 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>
* Unbundle pdfium librariesAllan Sandfeld Jensen2017-11-071-5/+7
| | | | | | | | | We now have gn flags to request unbundling of zlib and lcms2 in pdfium and can add those to our configure system. Task-number: QTBUG-61746 Change-Id: Iccc4c2a09b7b99121d79348f9e0636785b29f503 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Adaptations to 61-basedAllan Sandfeld Jensen2017-10-251-1/+2
| | | | | Change-Id: I5cb198445f283c6cea8187a1a2883896df0ee918 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Fix system-zlib configure name collision with coreMichal Klocek2017-09-221-1/+3
| | | | | | | | | | | When -zlib is provided on windows for main configure line the system-zlib feature is forced on webengine. This is not expected since we assume zlib only for unix builds. Prepend 'webengine' for webengine system-zlib feature. Task-number: QTBUG-63367 Change-Id: I983d2e0df0badbaf7a076662ce178009be151406 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Fix system-harfbuzz and system-png detectionMichal Klocek2017-09-201-7/+2
| | | | | | | Import gui-private to check for system-png and system-harfbuzz. Change-Id: I26fe98ce3de1f6af8015228260e8ef74952e816e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Remove WEBENGINE_CONFIG from configureMichal Klocek2017-09-205-48/+37
| | | | | | | | | | | | | | 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>
* Merge remote-tracking branch 'origin/5.9' into 5.10Allan Sandfeld Jensen2017-09-141-2/+2
|\ | | | | | | Change-Id: I0860a46b981c1f711bec45d7a495bcec2a80ee1f
| * Also set MIPS/Arm flags for host-buildsAllan Sandfeld Jensen2017-09-081-2/+2
| | | | | | | | | | | | | | | | | | QT_ARCH is the current architecture, and if the host is Arm or MIPS, we also need the flags there. Task-number: QTBUG-61846 Change-Id: I38f826e061eff900f6e27f4de0fc913323cf5e3e Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Add host-pkg-config to linux configurationMichal Klocek2017-09-121-0/+1
| | | | | | | | | | | | | | | | | | | | In case of passing pkg_config also set host_pkg_config otherwise pkg-config for sysroot will inject sysroot root libdir linker flag during host build which leads to weird errors. Change-Id: I57f277e500ba175687f65b9947b9f9c8edd969fc Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Migrate configuration lefovers to new configure systemMichal Klocek2017-09-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | 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-113-4/+21
| | | | | | | | | | | | Change-Id: I536258e22c2ec143f2fd3f1cbda229e0611b6af4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* | Adaptations for Chromium 59Allan Sandfeld Jensen2017-09-111-1/+2
| | | | | | | | | | Change-Id: I472053e316bfa782d0a6fb8903f4901be12247ae Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge branch '5.9' into 5.10Allan Sandfeld Jensen2017-09-061-2/+6
|\| | | | | | | 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>
| * Fix multilib builds with different archs of toolchain and systemAllan Sandfeld Jensen2017-08-291-1/+5
| | | | | | | | | | | | | | | | | | Set host_cpu to ensure GN gets on the right path matching the host of the toolchain we give it in host_toolchain. Task-number: QTBUG-62673 Change-Id: I99d6dfdbe4cee30bc240049b656d1ec73becce8a Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * Remove dead code for detecting system SRTPAllan Sandfeld Jensen2017-08-111-1/+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' into devKai Koehne2017-07-111-2/+7
|\| | | | | | | Change-Id: Idffd0c603f7925b8b9b037ce2d63cb13e964c20e
| * Increase debug symbol level on Windows to generate all Chromium symbolsAlexandru Croitor2017-07-041-2/+7
| | | | | | | | | | | | | | | | | | | | | | Debug symbol level 1 is not enough to generate all debug symbols on Windows. The symbols for the files found in src/core are generated with symbol_level=1, but no symbols are generated for the files in src/3rdparty. Change-Id: I30729981d5956c1c6a8040008bc00af1f19c15d2 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devAllan Sandfeld Jensen2017-07-052-10/+10
|\| | | | | | | Change-Id: Ida702fd5fa05a32d6cd7fc737aa061da74b675a0
| * Windows: Make sure that the path is correctly quotedAndy Shaw2017-06-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | We need to ensure that the path is using forward slashes to avoid any chances of a trailing backslash escaping the final quote. Additionally we need to quote the whole string in case there is a space, we can't use shell_quote for this as this preserves the backslashes which can cause a problem. Change-Id: Iadde9a10e2d80ad48efd695d414af58d891c7412 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * Fix host architecture detectionAllan Sandfeld Jensen2017-06-221-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * Always set a host toolchainAllan Sandfeld Jensen2017-06-121-1/+1
| | | | | | | | | | | | | | | | | | | | If we don't give Chromium a host toolchain it will pick one of its own overriding which compiler should be used, and breaking native builds on non-x86 architectuers. Task-number: QTBUG-61128 Change-Id: Ia25a4f43a28214003abcb11dc75a0e57064f76a7 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * Do not enable debug symbols in windows release buildsAllan Sandfeld Jensen2017-06-071-5/+4
| | | | | | | | | | | | | | | | | | | | Clean up the logic for cross-building to x86 on x86-64 windows, avoiding enabling debug symbols when force_debug_info is set, remove them 32-bit builds even it _is_ set, and use the standard logic for getting the GN target arch. Change-Id: Ia6a5a5e7429ffb1cf07629deaeebfb2466280a9b Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* | Simple adaptations for Chromium 58Allan Sandfeld Jensen2017-06-141-5/+2
| | | | | | | | | | Change-Id: I7c2c85973b03fdbd2eafb5339f33a3758d53e924 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* | Adaptations for Chromium 57Allan Sandfeld Jensen2017-06-143-3/+0
|/ | | | | Change-Id: Ia2756c1e9b13839c2330bd98cf953d47cbdac0dd Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* Document Mac App Store incompatibilityAlexandru Croitor2017-05-151-2/+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>
* Do not set arm/misp specific gn args for host_buildMichal Klocek2017-03-311-2/+2
| | | | | | | Self build of gn ends with error on embedded builds. Change-Id: I669c61eef7107919dbe11cdb558cf6ae0499621c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Fix build on 32 bit msvc toolchainKai Koehne2017-03-281-0/+27
| | | | | | | | | | | | Bring back the logic to disable debugging symbols for 32 bit native compilers on Windows (symbol_level = 0), or only do minimal debugging symbols useful for e.g. stack traces (symbol_level = 1). The corresponding gyp logic got removed in commit c5282c347929. Change-Id: Ibb7d43814992a00f5413d024f9c362d41dc5a3a5 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Remove gyp handlingAllan Sandfeld Jensen2017-03-229-487/+211
| | | | | | | Remove now dead GYP related code. Change-Id: I7d5b8f28f8925e553211dc88acd571b605ffe80d Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Support Visual Studio 2017Joerg Bornemann2017-03-221-0/+2
| | | | | Change-Id: I6b8e49913fc73ec3728b5c005fd83d2e573ad4ea Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Cleanup ozone platformAllan Sandfeld Jensen2017-03-201-1/+1
| | | | | | | | | Rename the platform to make it clear it is not just for eglfs. Fixes formating, and also removes parts unnecessary for us that original ozone platforms doesn't use anymore either. Change-Id: I04e5792e2ced2580ae0cbfe208b4e594af60a09a Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Port MIPS configuration to GNAllan Sandfeld Jensen2017-03-201-0/+18
| | | | | | | Translate MIPS configuration to GN like we do for GYP Change-Id: Ieb2534eeb40bdec54d2c986c65c523239c41a355 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Fix OpenGL for embedded buildsAllan Sandfeld Jensen2017-03-201-0/+2
| | | | | | | | Sets the external ozone platform and make sure we don't set bad QT_LIBDIR defines for libEGL and libGLESv2 when not doing cross builds. Change-Id: I60eada3c93224a3aa3a105b007d669932516d331 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Support appstore compliancy switch from the new configure systemAlexandru Croitor2017-03-171-0/+2
| | | | | | | Change-Id: Ic7768d9b2677ed488d6af05f34942321b670671e Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Support linux-clang-libc++ buildsAllan Sandfeld Jensen2017-03-141-0/+2
| | | | | | | | | | | Updates chromium including: 579ba08 Remove dependency on data_use_measure compontent 7172fcd Fix shim headers for vpx 0085696 Fix builds with path containing "+" aad9dc4 Support linux-clang-libc++ builds Change-Id: Ic4fa0bea77ee170c55f02efb883d86b3537d9229 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Port ARM configuration to GNAllan Sandfeld Jensen2017-03-141-0/+37
| | | | | | | Detect ARM configuration and pass it to GN. Change-Id: I809db0e096dc8c8785b37990769d4a981b147624 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Enable FFMPEG configuration for GNAllan Sandfeld Jensen2017-03-082-1/+3
| | | | | | | | | | Enables proprietary codecs and using system FFMPEG Pulls in Chromium changes: 725c4c9 Optionally link with system ffmpeg Change-Id: Id7b3379c99a709348bf8684f78e44b41169a1e5a Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Fix 32-bit Windows buildJoerg Bornemann2017-03-071-0/+1
| | | | | | | | We must set target_cpu="x86" for 32 bit builds. Task-number: QTBUG-59334 Change-Id: I2d58045de47c51953c5f8712a175d2ebdcb00e15 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Use GN linker flags on core_moduleAllan Sandfeld Jensen2017-03-071-1/+1
| | | | | | | | | | | Again enable linking with the flags GN calculated for us. Also fixes a typo that meant we didn't get the link timing flags on Windows. Change-Id: Idd46fd65ea7618a9c510fa2c790569f5974aa5ff Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Respect use system opus, vpx and icu configurationAllan Sandfeld Jensen2017-03-071-3/+3
| | | | | | | | | | | Also updates Chromium pulling in: eb8da98 Reland: Optionally unbundle libvpx, opus and FLAC 6cdd0a0 Legalize chromium's directory sort 503e84f46 Optionally link with system ICU e429a99 Fix incorrect dependency on shim headers Change-Id: If6da022c410ac5de6ab40ab8a800bf547406efb5 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Re-enable v8 snapshots for cross buildsAllan Sandfeld Jensen2017-03-031-2/+0
| | | | | | | | They were not working due to a typo causing v8_current_cpu to be set wrong in configure_host.pro, that has been fixed in the meantime. Change-Id: I18ca533806d65fb9bf6e6c26c0cb01d97ed124dd Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Fix cross-compiled desktop linux buildsAllan Sandfeld Jensen2017-03-022-5/+5
| | | | | | | | With embedded-builds now being a configure option we can have cross compiled desktop builds, and should support them. Change-Id: I43d9f26dc13bc1709c24d1420868e3c8bbbc458f Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Fix linux-clang buildsAllan Sandfeld Jensen2017-03-023-2/+13
| | | | | | | Pass through the right GN args to make clang builds work. Change-Id: I99d7f0caaed8a8c594a8b40f18207f2f95fe03b1 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Make xscrnsaver optionalAllan Sandfeld Jensen2017-03-021-0/+1
| | | | | | | | Allow building on machines where xscrnsaver is not present, but turning of the corresponding features. Change-Id: Iabf7063fcc25f68f5a9fefc95a1caf164da49fed Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Don't use_external_popup_menu on macOS so that popups actually appearAlexandru Croitor2017-03-011-1/+2
| | | | | | | | | | | | Using the use_external_popup_menu option forces Chromium to compile a different code path for displaying popup menus on macOS, which is not implemented by the Qt overrides, and thus no popups appear. Thus that option should be disabled, and instead the old code path should be used, just like in previous versions of Qt. Change-Id: Ic0f0dca2e097aac2c01e729d7a91425ce3f52674 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Support cross-builds and alternative compilers with GNAllan Sandfeld Jensen2017-03-012-28/+56
| | | | | | | | Adds GN versions of the gyp_configure targets, to create custom toolchains we can use to override compilers used by GN. Change-Id: Ic3a9cb7e83f845180396faff632f72f9c24f3365 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Simple adaptations to Chromium 55Allan Sandfeld Jensen2017-03-015-13/+83
| | | | | | | The simplest adaptations to API and build changes in Chromium 55 Change-Id: I923fa188690a04902492317807f72f006bcab9c6 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Fix release builds for debug and release buildsMichal Klocek2017-02-151-1/+2
| | | | | | | | | | | | Small typo makes debug builds make release. Fix core lib and covert tool compilation for debug builds. Updates chromium: b0bb0288 Fix debug builds compilation Change-Id: Id478ab5e2a2a1b3d5716002f76f252451f69f5ac Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-07 17:56:21 +0000