summaryrefslogtreecommitdiffstats
path: root/src/core/config/linux.pri
Commit message (Collapse)AuthorAgeFilesLines
* Switch to setting 'official build' for non developer buildsAllan Sandfeld Jensen2019-03-231-0/+1
| | | | | | | | | | | Some things controlled by the OFFICIAL_BUILD defined are commented as unsafe to ship in production, so we need that as well. Note that GOOGLE_CHROME and OFFICIAL_BUILD are two different settings, so this just denotes the build as one shipped in production. Change-Id: I1fdcfec7f5c5142dd2bdc5f1d1f9a296a60e5708 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Fix xscrnsaver detectionAllan Sandfeld Jensen2018-12-031-5/+5
| | | | | | | With Ozone use_xscrnsaver defaults to false, so reverse when we set it. Change-Id: I6950f68a693092bf9315e3d8202347adac3c4742 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Add check for thumb instruction setMichal Klocek2018-11-211-4/+11
| | | | | | | | | We currently require thumb instruction set on arm to build internal ffmpeg. Task-number: QTBUG-71772 Change-Id: I43ed152a51f0dea97b800c868eb13a4e5e8e077e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Fix running thumb vs arm instruction set on yoctoMichal Klocek2018-11-211-2/+4
| | | | | | | | | | | | 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>
* Don't set use_system_libpng twiceAllan Sandfeld Jensen2018-11-131-1/+0
| | | | | Change-Id: Ie53f14403e09b6453d8bb902b267ac1676933a7f Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Add extra config check for x11 ozone pluginMichal Klocek2018-10-231-1/+1
| | | | | | | | 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>
* Add kerberos feature to configure systemMichal Klocek2018-10-171-1/+0
| | | | | | Task-number: QTBUG-51082 Change-Id: I2c3ed5b42b054a9385f358eb9311646bc2a6cde0 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* General adaptations for Chromium 69Allan Sandfeld Jensen2018-09-221-1/+1
| | | | | Change-Id: Ifeaf0ee13213dc5a24d2f2b4655cf7f405cddef7 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Merge remote-tracking branch 'origin/5.11' into 5.12Allan Sandfeld Jensen2018-09-171-0/+1
|\ | | | | | | | | | | | | | | Conflicts: src/3rdparty src/core/core_common.pri Change-Id: I36dc3a70aa653e6c8a610c787b615034180a6127
| * Set arm_arch as wellAllan Sandfeld Jensen2018-09-131-0/+1
| | | | | | | | | | | | | | Either overlooked or added after we make the GN switch. Change-Id: I93bfc27c2e71165901c2046ab2ea902d9dad39d3 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | Use ozone for x11Michal Klocek2018-08-021-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/5.11' into devAllan Sandfeld Jensen2018-06-261-1/+1
|\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf configure.json src/3rdparty tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp Change-Id: Id79ff6cf01c2db3a2044881ddcbf044abdf84936
| * Do make freetype checks in Qt Gui and Qt WebEngine orthogonalKai Koehne2018-05-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | Qt WebEngine requires a newer freetype version then Qt Gui. Also, even if we fall back to 'Qt' freetype in Qt Gui doesn't mean that this version is shared with Qt WebEngine ... so it's best to completely detangle these. Task-number: QTBUG-68439 Change-Id: I081a23fe3e573d717a659e9bccebb14d68e97392 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | Adaptations for Chromium 67Allan Sandfeld Jensen2018-06-261-2/+0
| | | | | | | | | | Change-Id: I13cedba56012f74651a044d6fa8f0957487bf3eb Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | Fine tune configure and clean up header includesMichal Klocek2018-06-121-2/+1
|/ | | | | | | | | | | | | | | | | | | | | | Previously configure was generating two config headers qtwebengine-config.h and qtwebengine-config_p.h, however those headers were never installed or included as dependency in Makefiles. Moreover, due to the name clash all features were included into qt_lib_webengine_*.pri which is QtWebEngine QML module. Move configure to core so all features belong now to qt_lib_webenginecore*.pri. Fix global includes to include qtwebenginecore-config*.h. Drop all DEFINES and use QT_CONFIG instead. Cleanup all evil looking includes in headers for webengine and webenginewidgets. Change-Id: Iddbc8bf4487d9a5f0c19a71a9569535083507756 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Fix unbundling of libpng in pdfiumAllan Sandfeld Jensen2018-03-181-2/+6
| | | | | | | It is a separate GN setting Change-Id: I0fdd9c631a0f9dac3cf63cad4c1eb0c4b97786cb Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Basic adaptations for 65-basedAllan Sandfeld Jensen2018-03-151-3/+4
| | | | | Change-Id: I121b14d6a44e80f5eea4b159c58f7010d472926e Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Fix reversed logic for glib dependencyAllan Sandfeld Jensen2018-03-051-1/+1
| | | | | | | We only used if we didn't have it? Change-Id: I56481cce514b7879857cc7fc0b0dc73e615f90d9 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Fix linux-clang buildsv5.11.0-alpha1Allan Sandfeld Jensen2018-02-141-1/+2
| | | | | | | A gn linked with lld doesn't work at all. Change-Id: I488acb65b482cc1348ecd4909b20897e5edb8ef7 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Merge remote-tracking branch 'origin/5.10.1' into 5.11Liang Qi2018-02-121-2/+2
|\ | | | | | | Change-Id: If971fbfcb158c921e2328dfcdef3bd3322f30c4b
| * Ignore PKG_CONFIG* shell exports for YoctoMichal Klocek2018-02-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | Yocto sets GN_HOST_PKG_CONFIG script for native tools builds, therefore skip host pkg-config script generation even if PKG_CONFIG* shell variables for target are exported. Task-number: QTBUG-66275 Change-Id: I4a9939cd67ca5f32faeb827b5df0d3274ae7c30e Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | Merge remote-tracking branch 'origin/5.10' into devAllan Sandfeld Jensen2018-02-021-1/+8
|\| | | | | | | | | | | | | | | | | | | | | | | 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 pkg-host wrapper scriptMichal Klocek2018-01-231-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-6/+1
|/ | | | | Change-Id: I551c7091bbc0463bed94180313eb2bfe92f0ad84 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* 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-121-17/+17
| | | | | | | | 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>
* 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-201-26/+27
| | | | | | | | | | | | | | 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-111-1/+2
|/ | | | | | Change-Id: I536258e22c2ec143f2fd3f1cbda229e0611b6af4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* 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>
* 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 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>
* Remove gyp handlingAllan Sandfeld Jensen2017-03-221-190/+124
| | | | | | | Remove now dead GYP related code. Change-Id: I7d5b8f28f8925e553211dc88acd571b605ffe80d 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>
* 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-081-1/+1
| | | | | | | | | | 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>
* 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-021-0/+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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 22:35:06 +0000