summaryrefslogtreecommitdiffstats
path: root/src/core/config
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7Allan Sandfeld Jensen2016-03-111-1/+1
|\
| * Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-03-081-1/+1
| |\ | | | | | | | | | Change-Id: Ieab3c4a6d16b1d7b7c0243ff8898f81807e7b1fc
| | * Revert "Disable using the ICU data file on embedded linux"Kai Koehne2016-03-011-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c5957ac90cbaccccbd58b3fc73f94cf0d4795e54. It was based on the assumption that we remove system ICU, which got removed in commit 94b550ebee2858756a293aacf7e78e7ce11bb9c9. Task-number: QTBUG-51156 Change-Id: I7ac1adb414d250b2887af936ae3dc74a919a0890 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | * ICU: Sync use_system_icu and icu_use_data_file_flagKai Koehne2016-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | If we use the system ICU we do not need to care about loading the data file. Task-number: QTBUG-51156 Change-Id: I9f9c61c39db50663105e99af001c7e9f56322717 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | | Use system protobuf if foundAllan Sandfeld Jensen2016-03-081-1/+1
|/ / | | | | | | | | | | | | Search for protobuf library and compiler, and use them if found. Change-Id: I310eca661ed2dda14349e84a6769d2ae79ffb7c5 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Update snapshot scripts to Chromium 49Allan Sandfeld Jensen2016-03-071-1/+0
| | | | | | | | | | | | | | | | | | The multi megabyte ICU assembler files are now omitted, as we instead either generate data files or use system ICU. Task-number: QTBUG-51173 Change-Id: I7c7594be08876751ffd73171550000a28399954f Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Skip building on 32-bit windows hostsAllan Sandfeld Jensen2016-03-051-5/+1
| | | | | | | | | | | | | | | | We keep running out of memory during linking and must skip building on 32-bit architectures until that problem is solved. Change-Id: Ib0b465cb033df0112133eb256adeb498d260da7f Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Only set fastbuild once on the gyp commandlineAllan Sandfeld Jensen2016-03-021-7/+8
| | | | | | | | | | | | | | We were setting it to both 1 and 2. Change-Id: I1b2a063d06e3cb664ae587dd6dc78fa589297c4b Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Reduce size of embedded binariesAllan Sandfeld Jensen2016-02-161-0/+2
| | | | | | | | | | | | | | | | | | | | Adds a WEBENGINE_CONFIG option that greatly reduces the size of the core library (from 80Mbyte to 45Mbyte on Linux), and enable it on embedded linux by default. Change-Id: Ieb7afdbc160984fe5952be16dfbc96aa8c5f35ef Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Include printing sources and enable printing for desktop platforms.Michael Bruning2016-02-103-1/+3
| | | | | | | | | | | | | | | | | | | | | | Also adds Qt specific core classes for printing as well as adding printing related objects to the web engine context and including the printing sources in the builds for the desktop platforms. Also updates src/3rdparty submodule SHA-1. Change-Id: I9c2631c59f63571c0840d838077e66122bacc741 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Merge branch '5.6' into devAllan Sandfeld Jensen2016-02-045-1/+18
|\| | | | | | | Change-Id: I0bb971f01ee1e02da768f336680c8ec0254ab2b0
| * Disable WebSpeechAllan Sandfeld Jensen2016-02-012-2/+2
| | | | | | | | | | | | | | | | Also allows us to remove code handling libFLAC and libspeex since we no longer depend on those. Change-Id: Ifedc19b3c958215d298edd11f9126ea5b9cc09fa Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * Disable printing in ChromiumAllan Sandfeld Jensen2016-01-315-0/+16
| | | | | | | | | | | | | | | | | | | | | | Disabling printing saves us compiling those files and files off a megabyte on the debug binary. To keep all the configure options in config, the common options are moved to a shared common.pri. Change-Id: Ieffdf9eb7dca58cfdafadd85bd24ea9c2be55ece Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Add spell checker supportMichal Klocek2016-02-014-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Integrate chromium spell checker: * add spellchecker and dependencies to build * underline misspelled words in html text areas * right-click context menu shows up to 4 options to correct the misspelled word * toggle spell check from context menu * add new qml and widget api calls to qwebengineprofile to enable/disable spell check, select spell check language, get list of supported languages/dictionaries * register new qml spell check properties for QtWebEngine 1.3 * CONFIG+="no_spellcheck" to remove spellcheck support Change-Id: Ie61434ab9493597d7759a6f33794f6859c4e3a4c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Remove superfluous enable_plugins=1Kai Koehne2016-01-272-2/+0
| | | | | | | | | | | | | | | | chromium/build/common.gypi already sets enable_plugins to true by default for desktop platforms. Change-Id: I3805a6856fe70ad3bd89606e974b02858e68e263 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Enable Widevine CDMAllan Sandfeld Jensen2016-01-193-1/+4
| | | | | | | | | | | | | | | | | | | | | | Enable loading Google Chrome's Widevine pepper plugin. Flash and Widevine plugins will now also be searched for in the plugins/ppapi directory. Task-number: QTBUG-50132 Change-Id: I28fb56bb08d7e81629e34420be626621a7981181 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-12-031-0/+24
|\| | | | | | | Change-Id: I052fdc4245e25e58457d51f6e49703bc7dd8ff00
| * Work around MSVC linker out of memory failureJoerg Bornemann2015-12-021-0/+24
| | | | | | | | | | | | | | | | | | | | The native 32 bit MSVC linker tends to fail with LNK1102 (out of memory) in debug mode. Work around this issue by disabling debug information for x86, when not using the amd64_x86 cross-compiler. Task-number: QTBUG-49545 Change-Id: I2aac7e400719f74ced450e264ab1464596e5f204 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Merge branch '5.6' into devAllan Sandfeld Jensen2015-11-201-2/+2
|\| | | | | | | Change-Id: I05fe27b8321944cf68cc96dfa9dfcaeb54c8c8cd
| * Apply glib usage from the Qt configuration to QtWebEngine as well.Michael Bruning2015-11-061-1/+1
| | | | | | | | | | | | | | | | | | | | It was previously ignored and libQt5WebEngineCore.so.5 still linked dynamically to libglib-2.0.so Change-Id: I0b0b128c9eb36d94af9f5f91f212d1371403adad Task-number: QTBUG-49253 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * [Windows] Fix build on 32 bit hosts.Michael Bruning2015-11-041-0/+5
| | | | | | | | | | | | | | | | | | | | The default Windows SDK path is different on 32 bit machines. Adjust it to look for the D3D dlls in the right location. Co-Authored with Kai Koehne. Change-Id: If313188cdcc4634c3c9bf9dad6d2dce229fa3faa Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| * Revert "Fix build with freetype2 depending on harfbuzz"Allan Sandfeld Jensen2015-10-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | We should trust the global Qt configuration, the same issue should have been solved in qtbase already. This fixes RedHat builds where FreeType2 reports a wrong version. This reverts commit 981e38d2dc82c047c6ad8ec19427d3ac7434dc3c. Change-Id: I662105521b277585c83335e20831692f990e4dc1 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | [Windows] Fix build on 32 bit hosts and update src/3rdparty.Michael Bruning2015-11-141-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | The default Windows SDK path is different on 32 bit machines. Adjust it to look for the D3D dlls in the right location. Co-Authored with Kai Koehne. Also updates 3rdparty submodule to enable builds with MSVS2015 and let the merge from 5.6 to dev pass the CI. Change-Id: Ifb31a0e379c978b238b3437170c53a02cbde0349 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Adapting to Chromium 47Allan Sandfeld Jensen2015-10-271-1/+0
|/ | | | | | | Updating to Chromium 47 and adapting API. Change-Id: Id465bbcd4facd7c47cb8a9f4bd4e18cbdc0d1120 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Fix build with freetype2 depending on harfbuzzAllan Sandfeld Jensen2015-10-121-1/+1
| | | | | | | | | Chromium uses system freetype2 by default but not harfbuzz by default, since some newer versions of freetype2 depends on harfbuzz, we need to configure Chromium to use system harfbuzz in those cases. Change-Id: Ic15abe85c5b7e5ef1c3d82420efbc8605c2fe1ae Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Clean up configure syntaxAllan Sandfeld Jensen2015-10-121-15/+14
| | | | | | | | Imports use? qmake macro from QtWebKit and use it to make checks simpler and keep the webengine config in WEBENGINE_CONFIG. Change-Id: Ic0f1fca45ebc292d8146107697f9d3ca3764dfb4 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Make NSS vs BoringSSL choice more flexibleAllan Sandfeld Jensen2015-10-122-3/+6
| | | | | | | | Make the NSS library optional on Linux to reduce the hard coded difference between embedded and desktop builds. Change-Id: I3d7f703ead0ff325ffd2ae272e7e4c2d5258fc25 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Unite commmon linux platform configurationAllan Sandfeld Jensen2015-09-103-60/+44
| | | | | | | Move duplicated linux configuration to linux.pri Change-Id: I9f6f876e09fb748fb78cfbd5201a4326693f0be9 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* Enable building linux-clang platformAllan Sandfeld Jensen2015-09-071-2/+3
| | | | | | | | Adds the necessary flags to build with clang on desktop linux. Change-Id: I77f8937849bceefbae17158421a180e4a1adc2d3 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Respect Qt system-harfbuzz settingAllan Sandfeld Jensen2015-08-252-0/+2
| | | | | | | Link with system harfbuzz when Qt has been configured to do so. Change-Id: I6921397915f069b06e6447987744c0186b6c7ce0 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Fix the build on embedded linuxAndras Becsi2015-08-241-0/+3
| | | | | | | | | | | | This patch: - adds required options to the embedded_linux.pri config - adds missing events_ozone.gyp:events_ozone_evdev dependency - fixes pkg-config not to pick host paths when cross compiling - implements missing functions of the OzonePlatform interface - updates the submodule to include fixes for chromium Change-Id: I77b384738fa7d41938a68c10a007728b10d7db28 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Select Visual Studio version based on mkspecKai Koehne2015-08-031-0/+14
| | | | | | | | | | | | | | Change 7a1e0d57d1a1683442 determined the Visual Studio version based on the 'VisualStudioVersion' environment variable. While this variable is defined by the default Visual Studio command line prompt, it isn't necessarily set in other environments. Anyhow, Qt already determined the compiler/Visual Studio version in the mkspec. We can just reuse this here. Change-Id: Ibee9526e91ae855151940da6be438705de048c0c Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Add configurable option for using system FFMPEGAllan Sandfeld Jensen2015-07-282-0/+2
| | | | | | | | | | | Add qmake command line option to use system FFMPEG and report result and option in the configure summary. Also checks libraries FFMPEG and chromium both uses are available on the system since linking will otherwise fail. Does not check if the version of the libav libraries are correct, but leaves that to whomever enables the option. Change-Id: I39c9c47eba19a6e40872a2e9b24a9010cdea1011 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Use system snappy if availableAllan Sandfeld Jensen2015-07-282-0/+2
| | | | | | | Snappy doesn't use pkg-config so we use a configure check to detect it. Change-Id: I54f02d493139069ca8838f7008041340990fc016 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Add post configure step and make using system ICU an optionAllan Sandfeld Jensen2015-07-272-1/+4
| | | | | | | | | | Adds a post configure step to test qmake arguments, summerize options, and make it possible to enable using system ICU, but leaving it default off for now. Also summerizes the proprietary codec configuration. Change-Id: I620a69dcdbb14b49143770d38eecb5aeab48ad05 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Use system libsrtp if availableAllan Sandfeld Jensen2015-07-192-0/+2
| | | | | | | | Adds configure check and configures chromium to use system libsrtp if available. Change-Id: I134c50e1179bfb6acf01347456f8be26f27bf559 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Detect and use system librariesAllan Sandfeld Jensen2015-07-192-2/+16
| | | | | | | | Uses pkg-config to detect libevent, libwebp, flac, jsoncpp, opus, speex and vpx, and configure chromium to link with system versions. Change-Id: Ic6c5bbe07929a7c2b79abcb760a8c61b0c9ed92f Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Remove code dealing with now removed ffmpegsumo pluginAllan Sandfeld Jensen2015-07-151-1/+0
| | | | | | | | | | Chromium now links statically to ffmpeg, and the ffmpegsumo plugin is no longer built. This also makes the plugin dir unneeded. Change-Id: I2204ce966b067886d57a9548d8aec829b73642d8 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Merge Chromium 44 and fixesAllan Sandfeld Jensen2015-07-062-0/+6
|\ | | | | | | | | | | | | Bumbs the Chromium version to 44 and merges the 'wip/44-based' branch, which contains all the patches to build against Chromium 44. Change-Id: If03dd301cb2a5cf7da3fe0a92ce1134f1239bf00
| * Unbundle zlib, minizip, libxml2 and libxslt on LinuxAllan Sandfeld Jensen2015-07-012-0/+4
| | | | | | | | | | | | | | If available use the system versions of these basic libraries on Linux. Change-Id: Iebcd5c11c53d0d491c457ccff71be04f8b2cac1c Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
| * Respect the system-png configure optionAllan Sandfeld Jensen2015-07-012-0/+2
| | | | | | | | | | | | | | Link to system libpng on Linux if Qt was configured to do so. Change-Id: Ic86120aabb206173738e5a1977cad1d762794f2a Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-06-291-0/+1
|\ \ | |/ |/| | | | | | | | | | | Conflicts: .qmake.conf src/webenginewidgets/api/qwebenginepage.cpp Change-Id: Idb33c92bd53fab76eee8fedb542dbf5e4a10f9e6
| * Use system fontconfig on embedded linuxv5.5.0Andras Becsi2015-06-161-0/+1
| | | | | | | | | | | | | | | | | | | | Since our reference platform provides fontconfig on the system we can use that instead of the bundled one. This prevents us from duplicating the fontconfig cache which might also result in a very long first startup time. Change-Id: Ida74651a0d73ac7631cb5b60c0ced5998e59bc8c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into devPierre Rossi2015-05-151-5/+2
|\| | | | | | | Change-Id: I1fbcd05760cb287d1d8a0fba344ec7cfe8348c7d
| * Update embedded configurationAndras Becsi2015-05-121-5/+2
| | | | | | | | | | | | | | | | | | Remove some obsolete options and add conditionals similar to desktop_linux.pri. Change-Id: Id295345028e5fd5f593cbd0b5dc6acdb5c00518b Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-04-191-74/+0
|\| | | | | | | Change-Id: I78c25caf30923fc1101b137f9abc3993e3cf0600
| * Remove eAndroid hooksAndras Becsi2015-04-141-74/+0
| | | | | | | | | | | | | | | | Support for the B2Qt/eAndroid platform is discontinued with Qt 5.5 so we can remove all remnants of the android platform. Change-Id: I93f15fcd4a345203e15010ddf1e8de3e8d28ab56 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Add support for Shockwave Flash plugin.Zeno Albisser2015-03-302-1/+3
|/ | | | | | | | | | We will try to load the pepper flash plugin from the places where it is most commonly located. Alternatively the location and flash version can be passed on the command line. Change-Id: I41367586462157e722661aab3630357d6caf6a81 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Respect use-system-jpeg Qt settingAllan Sandfeld Jensen2015-03-041-0/+2
| | | | | | | Forward the system-jpeg Qt setting to chromium. Change-Id: I646176fdf6a1c7818828dc8b24543cc885cc3688 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Fix the build on eLinuxAndras Becsi2015-02-201-0/+3
| | | | | | | | | | | | | Update ozone layer to the new snapshot, update the embedded_linux.pri configuration, fix the GLSurfaceQt build on non-x11 linux and update embedded command line switches for the 40.0.2214-based chromium snapshot. This patch also updates the snapshot sha1 to include required chromium changes. Change-Id: I7f9446fa1b67a0af7baee564acff41ae33ff1a94 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-06 17:50:04 +0000