summaryrefslogtreecommitdiffstats
path: root/src/core/config
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.11' into 5.12Michael Brüning2018-08-211-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf configure.json examples/webenginewidgets/markdowneditor/resources/3rdparty/marked.js examples/webenginewidgets/markdowneditor/resources/3rdparty/qt_attribution.json examples/webenginewidgets/markdowneditor/resources/markdowneditor.qrc mkspecs/features/platform.prf src/3rdparty src/core/media_capture_devices_dispatcher.cpp src/core/net/url_request_context_getter_qt.cpp src/core/net/url_request_context_getter_qt.h src/core/web_contents_adapter.cpp Change-Id: I467133ba455b1f85f6bb61793794c31cb1094541
| * Enforce Visual Studio check in windows.priKai Koehne2018-07-061-2/+2
| | | | | | | | | | | | | | | | | | | | Because windows.pri is included from a replace function gnArgs, fatal does not work: src/core/config/windows.pri:60: 'fatal' is not a recognized test function. Change-Id: Ib831e1ffa7e8e345477692d453bbcc568864b98c Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | Use ozone for x11Michal Klocek2018-08-023-22/+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-262-4/+3
| | | | | | | | | | Change-Id: I13cedba56012f74651a044d6fa8f0957487bf3eb Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | Remove obsolete embedded_qnx.priMichal Klocek2018-06-181-10/+0
| | | | | | | | | | Change-Id: Id884467582a7ff70b3d6dc526344916574370444 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Fine tune configure and clean up header includesMichal Klocek2018-06-122-2/+3
|/ | | | | | | | | | | | | | | | | | | | | | 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>
* Build without iterator debuggingJüri Valdmann2018-04-171-0/+1
| | | | | | | | | | | Iterator debugging (aka standard library debug mode) with libstdc++ slows down some code by orders of magnitude due to locking for each iterator operation. Disable on non-MSVC platforms. Task-number: QTBUG-66904 Change-Id: Ibb31f32235084b52988ac674b4b0bb1b198eed88 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Move the last gn_arg over to the restAllan Sandfeld Jensen2018-03-221-0/+2
| | | | | | | is_debug was the only configuration argument still set in gn_run.pro Change-Id: I7b66888e6b936b44bafdad02f7974941d4e875ce Reviewed-by: Michal Klocek <michal.klocek@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>
* Enable jumbo builds againAllan Sandfeld Jensen2018-03-171-5/+4
| | | | | | | | With the memory increased this should be possible again to get the build speed back. Change-Id: I321b739744833fdcc92a25c83e3ed5be0318407d Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Basic adaptations for 65-basedAllan Sandfeld Jensen2018-03-152-6/+9
| | | | | Change-Id: I121b14d6a44e80f5eea4b159c58f7010d472926e Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Clarify Windows build requirementsJoerg Bornemann2018-03-121-3/+1
| | | | | | | | [ChangeLog][QtWebEngine] QtWebEngine requires Visual Studio 2017. Task-number: QTBUG-66596 Change-Id: Ib9961afef17bc095bdf983cb06981e16963157c1 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@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-022-2/+20
|\| | | | | | | | | | | | | | | | | | | | | | | 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-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>
| * Fix enable/disable precompiled headersMichal Klocek2018-01-231-1/+5
| | | | | | | | | | | | | | | | Use 'enable_precompiled_headers' instead of 'disable_precompiled_headers' Change-Id: I23af6fe1c24a6ccc14d31f009710ebbc4cc2f716 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>
* Enable/disable precompiled headersAllan Sandfeld Jensen2018-01-201-0/+2
| | | | | | | Pass Qt precompiled header settings to GN. Change-Id: I4133c2fc77b50028be3ebb8feec24d49476e5e2d Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Turn off jumbo build on WindowsJoerg Bornemann2018-01-191-1/+3
| | | | | | | | | ...because the generated source files contain include directives with relative paths that are too long for the toolchain. Task-number: QTBUG-65677 Change-Id: I664309c16f7ac5cdd267f9463d061be90dc664a0 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Disable net-reporting at compile timeAllan Sandfeld Jensen2018-01-171-0/+1
| | | | | | | | | | | It is default off at run-time anyway. Also updates 3rdparty with: 17e4aafb6fe8 [Backport] Clamp performance.now() to 100us. f0775ea93ab6 Fix building with enable_reporting=false Change-Id: I4d7c0423fff5ecd0291ffdc9bddb90050ed61d8c Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Reduce jumbo limitAllan Sandfeld Jensen2018-01-151-1/+2
| | | | | | | | Reduces amount of memory used when compiling and is more friendly when compiling using icecream. Change-Id: I3ba3afcaa75ee79e02f2a8b2fa6d8f19e5f7b929 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix sanitizer buildAlexandru Croitor2018-01-101-0/+12
| | | | | | Task-number: QTBUG-64726 Change-Id: Ic88eed62e85ad1d95afcbd154c6556509e42bd47 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Merge "Merge remote-tracking branch 'origin/5.10.0' into 5.10" into ↵Allan Sandfeld Jensen2017-11-241-2/+4
|\ | | | | | | refs/staging/5.10
| * 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>
* | Use jumbo buildJüri Valdmann2017-11-221-1/+2
|/ | | | | | | Builds ~50% faster. Change-Id: Ic24f67e0ed96a15ad8bfb5120bccc29c7d9d856e 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-25 03:19:12 +0000