summaryrefslogtreecommitdiffstats
path: root/src/core/core_module.pro
Commit message (Collapse)AuthorAgeFilesLines
* Support clang_cl builds on WindowsAllan Jensen2019-05-021-2/+2
| | | | | Change-Id: I1f3e8fc378cfceda92ff17fcc7669c0f5d97c3f7 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Fine tune configure and clean up header includesMichal Klocek2018-06-121-3/+0
| | | | | | | | | | | | | | | | | | | | | | 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 sanitizer buildAlexandru Croitor2018-01-101-2/+11
| | | | | | Task-number: QTBUG-64726 Change-Id: Ic88eed62e85ad1d95afcbd154c6556509e42bd47 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Add 'webengine' prefix to configure features, tests, libraries, etcAlexandru Croitor2017-11-121-2/+2
| | | | | | | | 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 branch '5.9' into 5.10Allan Sandfeld Jensen2017-11-011-1/+3
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/core/core_module.pro src/core/delegated_frame_node.cpp src/core/surface_factory_qt.cpp src/webenginewidgets/api/qwebengineprofile.cpp tests/auto/widgets/widgets.pro Change-Id: I92f3ef4eee779afef6c5381a7aa8b551417c1b17
| * Revert "Use MSVC's /WHOLEARCHIVE linker flag"Joerg Bornemann2017-10-171-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6eae98639730ab1ad1611f1ea61bcaad2fe0f69a. The /WHOLEARCHIVE flag stopped working in VS 2017 15.4.0. Use our beloved list of object files again. Task-number: QTBUG-63701 Change-Id: I9eaf7c92012d6d3c73658f9e06d422c52fa1dc76 Reviewed-by: Michal Klocek <michal.klocek@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Remove WEBENGINE_CONFIG from configureMichal Klocek2017-09-201-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Adaptations for Chromium 60Alexandru Croitor2017-09-111-1/+11
|/ | | | | | Change-Id: I536258e22c2ec143f2fd3f1cbda229e0611b6af4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Use MSVC's /WHOLEARCHIVE linker flagJoerg Bornemann2017-06-071-3/+1
| | | | | | | | | | The /WHOLEARCHIVE option was introduced in Visual Studio 2015 Update 2. Since we support no older MSVC version we can unconditionally use this option and remove our hack that simulates whole-archive by writing object file names into a linker reponse file. Change-Id: I32d2cb556c15f9a8aa2f77f608268e0af7ab6a1d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Improve Qt Creator indexingAllan Sandfeld Jensen2017-05-031-3/+0
| | | | | | | Includes gn sources, headers and defines Change-Id: I2abfb2c5238211a2305f6bdbcd082e832c048a2b Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Remove gyp handlingAllan Sandfeld Jensen2017-03-221-32/+25
| | | | | | | Remove now dead GYP related code. Change-Id: I7d5b8f28f8925e553211dc88acd571b605ffe80d Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Use GN linker flags on core_moduleAllan Sandfeld Jensen2017-03-071-3/+4
| | | | | | | | | | | 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>
* Use .NOTPARALLEL on Windows tooAllan Sandfeld Jensen2017-03-031-1/+1
| | | | | | | | With Jom 1.1 supporting the special target we can use it to also avoid compiling and linking debug and release in parallel on Windows too. Change-Id: Ie3307f1f40fd877d04f9fea53c02fe7a37c48824 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Simple adaptations to Chromium 55Allan Sandfeld Jensen2017-03-011-1/+3
| | | | | | | The simplest adaptations to API and build changes in Chromium 55 Change-Id: I923fa188690a04902492317807f72f006bcab9c6 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Fix rsp linking on windowsMichal Klocek2017-02-101-9/+8
| | | | | | | | | Rsp file format is not correct currently on windows, as a workaround use selfmade rsp file. Task-number: QTBUG-58710 Change-Id: I0cd6f3f5e29285330b1abbb30177bbd56f064e0d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* macOS GN integrationAlexandru Croitor2017-01-271-49/+63
| | | | | Change-Id: I89850d43c8f11ec54b3a47318ef0b3f083ae3dee Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Add gn build of qtwebengine for linuxMichal Klocek2017-01-251-48/+65
| | | | | | | | | | | This commit uses gn instead of gyp to build on desktop linux. Use WEBENGINE_CONFIG+=use_gn to use gn during the build instead of gyp. Change-Id: Ifd3d8d0835b47c323a8d39c320eb55e5e1024dee Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Add GN files to other filesAllan Sandfeld Jensen2016-12-141-1/+3
| | | | | | | This will help QtCreator find them for us. Change-Id: I9ec27f75f7153427d16ebe62b79a283e287ff829 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Adjust webengine to the qtConfig() changes in qtbaseLars Knoll2016-08-231-4/+4
| | | | | Change-Id: I907f6ea73a1d707eda536764c4b0b2edea49a963 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-08-021-0/+7
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty src/core/resources/resources.gyp src/webengine/doc/src/qtwebengine-overview.qdoc src/webenginewidgets/api/qwebenginepage.cpp src/webenginewidgets/api/qwebenginescriptcollection.cpp src/webenginewidgets/api/qwebenginescriptcollection_p.h tests/auto/widgets/qwebenginepage/BLACKLIST And readded newly in 5.6 enabled tests to the BLACKLIST. Change-Id: I4ab1fc54ebfaaf940df81b0d8d6bdd15cae8b7c4
| * Stop linking both debug and release libraries at the same time.Alexandru Croitor2016-06-271-0/+7
| | | | | | | | | | Change-Id: Ide3a8adc320b38a399514c0115bd8e24c37af63d Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | make use of COPIESOswald Buddenhagen2016-06-171-21/+2
| | | | | | | | | | Change-Id: I440ead04e386362593d50c491508676bb5d0ff64 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-06-111-0/+2
|\| | | | | | | Change-Id: Ib010ede9756fb02992a3276ae7ec90ef1ab56a00
| * Avoid precompiling headers in core_module.proJoerg Bornemann2016-06-101-0/+2
| | | | | | | | | | | | | | | | Loading qt_module.prf automagically fills PRECOMPILED_HEADER. Clear this, because core_module is a link-only module. Change-Id: I4edf75faf7c251719c1d9412ca42870dd06ddb95 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge branch '5.6' into 5.7Allan Sandfeld Jensen2016-04-181-0/+8
|\| | | | | | | Change-Id: I490e0ee46d3ff040ca26426feb7e4d6ef7098f94
| * Install all resources for developer build in .pro fileKai Koehne2016-04-151-0/+8
| | | | | | | | | | | | | | | | | | | | ICU .dat file and .pak files were already copied to the developer build directory in core_module.pro. Let's do the same for translations, and remove the logic handling this in resources.gyp. Change-Id: I4926cd6012f2664feed27aa042eb3ceb282a93d9 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-211-9/+16
|\| | | | | | | | | | | | | | | Conflicts: src/3rdparty src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc Change-Id: I90728e965399e51b626d538924de955f9abab5fe
| * Disable installation of icudt.dat for builds using system ICUKai Koehne2016-03-101-9/+16
| | | | | | | | | | Change-Id: I71006b596b985acbfeec883d63de67959d0b8bdb Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-03-081-2/+10
|\| | | | | | | Change-Id: Ieab3c4a6d16b1d7b7c0243ff8898f81807e7b1fc
| * Copy resources also for non-developer non-prefix buildsKai Koehne2016-02-251-2/+2
| | | | | | | | | | Change-Id: I8a31a83c996761e3997e5efa44aeaad04f24375f Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| * Add chromium files to Qt projectAllan Sandfeld Jensen2016-02-241-0/+8
| | | | | | | | | | | | | | | | | | | | This will make them indexed by Qt Creator, but may make launching on a non-SSD slower. Change-Id: Ifa6e54c06ef06f68fa277a408fa7b0783d715199 Reviewed-by: Alexandru Croitor <alexandru.croitor@theqtcompany.com> Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com> Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* | Merge branch '5.6' into devAllan Sandfeld Jensen2016-02-041-8/+17
|\| | | | | | | Change-Id: I0bb971f01ee1e02da768f336680c8ec0254ab2b0
| * Copy all resource files to build directoryKai Koehne2016-01-231-8/+17
| | | | | | | | | | Change-Id: I1a4b96a2a695b4be4e936275c59f939b887098d1 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Package devtools_resources separatelyKai Koehne2016-01-271-1/+2
|/ | | | | | | | | | | Move the resources for remote debugging out of qtwebengine_resources.pak, into a separate qtwebengine_devtools_resources.pak. This allows developers to decide at deployment phase whether to ship the (rather large) resources for the devtools feature, or not. Task-number: QTBUG-50646 Change-Id: I74c75ad30989b97a63e6bce3abbc33360d1452e4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Move ICU data to resources sub-dirAllan Sandfeld Jensen2016-01-111-2/+2
| | | | | | | Also moves the ICU data from the prefix root to the resources subdir. Change-Id: I1eec6c09a8ff1f87166a9f8a2a010b770198751e Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Install qtwebengine resources in a sub-directoryAllan Sandfeld Jensen2016-01-061-1/+1
| | | | | | | | | | | | | Moves the qtwebengine resource files to a resource sub-directory so they are not installed in the prefix-root. At the same time the search of them is improved, so application developers can install them in the application dir, even if the prefix dir exists. Change-Id: If64f16ae6ee924c66fb0a0b024bca2caa6400ee3 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* fix link error with MSVCJoerg Bornemann2015-10-061-1/+1
| | | | | | | | | | | Since qtbase/e88334e0 we must not put MSVC linker flags into LIBS or LIBS_PRIVATE. QMAKE_LFLAGS is the right place. This fixes a build error with MSVC: LINK : fatal error LNK1181: cannot open input file '\OPT:REF.obj' Change-Id: I2971e412dd8d5cfe8b7aca218d679dd136019dd8 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* fix debug_and_release build on WindowsJoerg Bornemann2015-09-241-2/+5
| | | | | | | | | | | | | | | | | | | | The public API symbols are compiled in a static library that's linked to core with --whole-archive when using gcc. There's no equivalent for this in MSVC. We hacked around this limitation in commit 38944be4 by creating a source file that includes every public header. Unfortunately this breaks debug_and_release builds, because we must inject this generated source file as absolute path, and gyp will generate the same object file for every source file that's specified with an absolute path... This reverts commit 38944be4 and replaces the work-around by simulating -whole-archive on MSVC. This is done by passing all object files that belong to qtwebenginecoreapi.lib to the linker via a response file that is created when building qtwebenginecoreapi.lib. Task-number: QTBUG-48376 Change-Id: Iaa991fe96a2c336d982d29d6924ce950c0be5398 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Disambiguate debug and release builds of libqtwebenginecoreapiKai Koehne2015-09-171-1/+3
| | | | | | | | | | Though the destination directory for a debug and a release build differ, the static library is still intermediately placed in a common directory. This patch adds a unique suffix to the library name to avoid clashes. Task-number: QTBUG-48287 Change-Id: I299704529539d0b7ed9aaf1df06245ae1c3ce363 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Doc: reorganize and rename docsLeena Miettinen2015-08-191-2/+0
| | | | | | | | | | | | - Move general docs to src/webengine/doc/src - Remove a dedicated .qdocconf for Qt WebEngine Core, build its documentation as part of Qt WebEngine - Describe all Qt WebEngine modules on the Qt WebEngine index and overview pages - Add a wireframe drawing on the architecture Change-Id: Ib4261d1a16bbaf313d0f858515184a96dab524a5 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Merge branch '5.5' into 5.6Allan Sandfeld Jensen2015-08-181-1/+3
|\ | | | | | | Change-Id: I9977663123560a22f493b8c02d02de8897b38666
| * Add 200 percent image resourcesKai Koehne2015-07-141-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move out the resources intended for 100% scale factor from qtwebengine_resources.pak into a separate _100p.pak, and add also a _200p.pak. This fixes crashes and artifacts on Windows with high-DPI setups. [ChangeLog] qtwebengine_resources_100p.pak and qtwebengine_resources_200p.pak have been added alongside qtwebengine_resources.pak. Depending on the target environment either one or both have to be deployed. Task-number: QTBUG-47018 Change-Id: I1f305ada3ca4e4ae356276a59e0e92c94cca2d3f Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Add documentation for QtWebEngineCore moduleKai Koehne2015-07-281-0/+2
| | | | | | | | | | | | | | | | Now that QtWebEngineCore has public API, we should document the module. Change-Id: I29660243da80b5923836bb2d0394dc2e8be209e2 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | Remove code dealing with now removed ffmpegsumo pluginAllan Sandfeld Jensen2015-07-151-25/+4
| | | | | | | | | | | | | | | | | | | | 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>
* | Add public QtWebEngineCore C++ APIAndras Becsi2015-06-081-2/+18
|/ | | | | | | | | | | | | | | | | | | | | | | | | | This patch introduces a new public C++ API layer in preparation to make it possible to integrate with lower level Chromium features related mostly to networking operations like accessing and blocking cookies, custom request headers, etc. This API layer can be used both by Qt Widgets and Qt Quick applications with a small C++ core. It should contatain API to access features that usually run on the IO thread to make it possible to perform heavy tasks that would otherwise require costly context switches to the UI thread. Furthermore for these features a QML API does either not make sense, since they are non-UI-related, or a QML API is simply not feasible, because the API is meant for advanced usecases like web browser development (i.e. custom protocol handlers, network traffic interception cookie syncing, etc.). In the long term this layer could also make it possible to reduce code duplication in the widgets and quick layers by moving common parts to the core layer. The new API is built entirely by qmake as a separate static library which is then linked into the QtWebEngineCore library built by gyp and ninja, to prevent the build options passed to Chromium to break the API layer. As a first step this only contains the global headers for core. Change-Id: Iccf8544587cde7c0d9c6abd462e4766bf9ec81ae Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
* Fix prefix buildPeter Varga2015-04-291-2/+2
| | | | | | | | | | | Deploy resources, locales, icu and plugins into the build directory instead of install directory. It is necessary when Qt is configured with -developer-build and -prefix options: the compilation may fail if user has no write access for install directory. Task-number: QTBUG-45796 Change-Id: I425f26fcb4b611c255dd744cb9b4eafe16015d6f Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Integrate with WebChannelPierre Rossi2015-02-121-5/+1
| | | | | | | | | | Provide a transport mechanism for WebChannel over chromium IPC and expose WebChannel in our experimental QML API. Co-authored by Milian Wolff. Change-Id: Ia24b1d4ebc8515de677d4849ec33cb55c963918e Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.4' into devPierre Rossi2015-01-161-51/+53
|\ | | | | | | | | | | | | Conflicts: src/3rdparty Change-Id: Ied43de29444d4803218e250b096b9c72bc017af7
| * Only deploy ffmpegsumo once in debug_and_releaseJocelyn Turcotte2015-01-071-51/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves all installs inside the the release-only-with-debug-fallback block to prevent the debug ffmpegsumo.dll to overwrite the release one on Windows (and get use for both debug and release builds). This will use the release version for both instead by default. This also moves the load(qt_module) call higher to make sure that build_all is added to CONFIG at that point. Change-Id: I2584a28e5eaaf5028798703fb387ac2b120d7ea9 Task-number: QTBUG-43348 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-01-021-2/+0
|\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/3rdparty src/core/content_browser_client_qt.h src/core/core_module.pro Change-Id: Ia05a6564a4d17ca14ff9b76ae018c3f4ef33d535
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-04 12:45:38 +0000