summaryrefslogtreecommitdiffstats
path: root/src/core/core.pro
Commit message (Collapse)AuthorAgeFilesLines
* Remove duplicate installation of resource filesAlexandru Croitor2017-06-061-17/+0
| | | | | | | | | | | | | The resources files are currently installed twice. Once in src/core.pro and once in src/core_module.pro. The core.pro installation steps should be removed, because they do not cover the macOS framework case, thus ending up with creating resources both in the framework directory, as well as in the installation root. Task-number: QTBUG-60707 Change-Id: Id0121c82d7439949474f605c6630ae045125f7ba Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Improve Qt Creator indexingAllan Sandfeld Jensen2017-05-031-1/+1
| | | | | | | Includes gn sources, headers and defines Change-Id: I2abfb2c5238211a2305f6bdbcd082e832c048a2b Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Fix source indexing in Qt Creator 4.3Allan Sandfeld Jensen2017-04-041-0/+6
| | | | | | | | Create a fake project, just for including the files compiled by ninja in a qmake project that Qt Creator can index, but which we do not build. Change-Id: I7b4fc7ba23090bddb49ee1e85f76f71fb33544e2 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Remove gyp handlingAllan Sandfeld Jensen2017-03-221-59/+31
| | | | | | | Remove now dead GYP related code. Change-Id: I7d5b8f28f8925e553211dc88acd571b605ffe80d Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Merge dev into 5.9Oswald Buddenhagen2017-02-011-3/+26
|\ | | | | | | Change-Id: Id919bfd67d9d435fd5a05a892151a12ae5bcd3c0
| * Add gn build of qtwebengine for linuxMichal Klocek2017-01-251-3/+26
| | | | | | | | | | | | | | | | | | | | | | 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 SUBDIRS in dependency orderSamuli Piippo2017-01-311-7/+8
|/ | | | | | | | | Once more, fix the order of SUBDIRS, since recursive qmake call does not handle .depends Task-number: QTBUG-45706 Change-Id: Ibe578a9f5e80079d1ba917915f169e0e0bc4203e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Add gn generator for pro filesMichal Klocek2016-12-161-9/+15
| | | | | Change-Id: I5f28314d79b4aad587b323b027eb6d74ad422a73 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Add gn bootstrap to build systemMichal Klocek2016-12-081-29/+33
| | | | | | | Bootstraps gn wihout rebuild. Change-Id: I09ee4d6b6f458f16f0d9ac18433823153ab75995 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Add SUBDIRS in correct orderSamuli Piippo2016-02-041-2/+2
| | | | | | | | | | To workaround qmake issue, the SUBDIRS need to be in correct order. Otherwise recursive qmake call will fail with: Project ERROR: Unknown module(s) in QT_PRIVATE: webenginecoreheaders-private Task-number: QTBUG-45706 Change-Id: I0f70b468fa306406036c0425fc7ae7e7a4f0cfc7 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Fix more syncqt warningsAllan Sandfeld Jensen2016-01-051-0/+6
| | | | | | | Change include form to follow standard Change-Id: I8b30ae9a6923365d524c473f2807b76e4fccebf4 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Workaround for broken recursive qmake callSamuli Piippo2015-09-011-4/+5
| | | | | | | | | | | Running qmake recursively does not take .depends into account and goes through the SUBDIRS in the order they were added. Because of this, the qmake_extras.gypi is generated in wrong order and is not used by ninja later on. This causes cross compilation to fail. Task-number: QTBUG-45706 Change-Id: I476930233824d5414e35151e6b9a2695abb4e9dd Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Add public QtWebEngineCore C++ APIAndras Becsi2015-06-081-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* Move extra installs from core.pro to core_module.proJocelyn Turcotte2014-11-061-27/+0
| | | | | | | | | | core_module.pro is the one responsible for deployment of the binary so it makes sense to also let it handle the other files to install. This leaves core.pro to only handle sub-projects dependencies. Change-Id: Ibe433eceec7fb0a9f806dfa89dccb0bedeaccc59 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Use the toolchain from PATH on WindowsJocelyn Turcotte2014-08-141-9/+14
| | | | | | | | | | | | | | We don't want to fetch the compiler path from the mkspec on Windows the same way that we do on linux/embedded. Qt usually let the build environment decide the MSVC toolchain, as it is usually done on Windows. This patch also passes the ninja_use_custom_environment_files ninja generator option to make sure that gyp doesn't try to construct the build environment by running the env scripts itself. Change-Id: I6e04471eb994b81a9f1b8b5f149b4dbddbb320a8 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Update the QtWebEngineCore library to run on top of Chromium 37Jocelyn Turcotte2014-08-141-6/+5
| | | | | | | | | | | | | | | Most of the patch is about upstream classes/methods that changed. Other important details: - icu data files are now used by default - cygwin is no longer required to build on Windows - RenderFrameHost has been replacing RenderViewHost in a few places, following the separate process iframes support in Chromium - The user agent is accessed through ContentClient::GetUserAgent instead of from the command line switches Change-Id: I86cc93aff7ce31176a80b0b4a5d54025674a451c Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Install ICU data file to Qt on WindowsZoltan Arvai2014-06-201-0/+5
| | | | | | | ICU data file is required by Qt5WebEngineCore. Change-Id: Ifcbb1119e9dfe25b6a1bb206475176f21278c2a9 Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Fix deployment of qtwebengine_locales with make installAndras Becsi2014-03-101-2/+2
| | | | | | | | | | The install_locales target silently fails when running make install with the message "install: omitting directory." Add all the translations to the files variable and set the path to $$[QT_INSTALL_TRANSLATIONS]/qtwebengine_locales. Change-Id: I375077982d9b3e2154cf90ae13142bb42a07e38d Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Use the shadow build directory for the ninja outputJocelyn Turcotte2014-03-071-2/+2
| | | | | | | | | | | | The gyp/ninja build is moved from out/(Debug|Release) to src/core/(Debug|Release). The ninja build as well as generated gyp files and python intermediate files all stay in the source tree for the moment. Change-Id: I6948380c45896540fe508238ceef9fe48e41f5af Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Deploy QtWebEngineCore as a Qt moduleJocelyn Turcotte2014-03-071-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This delegates the linking step from ninja to qmake so that we can let qmake decide the destination of the target itself, easing the deployment and installation logic across platforms. The module is only deployed as a binary and no header are available outside of the source tree. This is only to make sure that the dependence of the QtWebEngine and QtWebEngineWidgets libraries on it is resolved at runtime exactly the same way as with other Qt modules, on all platforms. Ninja still takes care of the compilation and gyp lets qmake know how and what to link by dumping the list of flags and input files in a generated .pri file. This has to be done in a separate .pro file so that we can make sure that ninja is run inconditionally before make reaches the dependency check in core_module.pro, ensured by the parent Makefile. Note 1: This patch removes RPATH hacks that are no longer necessary Note 2: Other targets like ffmpegsumo are still linked by ninja. The same logic could be moved to a qmake file but this require some more work to make sure that some switches (e.g. -stdlib=libc++) are coordinated between gyp and qmake. Change-Id: If65968547bde5b9cf732e31e97931c17ae1921a7 Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Fix html5 videoAndras Becsi2014-01-221-1/+13
| | | | | | | | | | Deploy the built ffmpegsumo library and make chromium find it by overriding the content::DIR_MEDIA_LIBS path with the deploy location. We deploy the plugin to $$[QT_INSTALL_PLUGINS]/qtwebengine. Change-Id: I0aeb37fccd2af62b23f8e6405041655e1f66b7aa Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Use files for install instead of extraPierre Rossi2013-12-051-0/+2
| | | | | | | | | | We need to add the no_check_exist value in order for qmake to just accept that those files will eventually exist. This has the benefits of not messing with $(INSTALL_ROOT) and also stripping the library, which could prove useful. Change-Id: I43c230f185420ba92ff8e86f49b4e838ca5dd917 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Get localized strings in the render processPierre Rossi2013-12-031-1/+3
| | | | | | | | Building on top of the repacking of .pak files, we now ship the whole array of repacked locales and pick the appropriate one at runtime. Change-Id: I0096e3eac6a1fc83885fd11e0fa55a746f8e45d8 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Ship repacked .pak filesPierre Rossi2013-12-031-3/+9
| | | | | | | | | | | | | We used to wrap various .pak files in qrc files, but it turns out to be very memory inefficient compared to chromium's approach of mmaping those files. Drop the pak->qrc logic and instead add some pure gyp targets to repack the resources. We then install those with qmake and look them up with QLibraryInfo. Change-Id: I6dd3cedf6afa626ed181463911fef8885c9e9add Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Moving sources to src part 2: Adjust paths.Jocelyn Turcotte2013-11-281-0/+22
NOTE: To build after this you should rerun init-repository.py or run $> git submodule sync $> git submodule update $> git config qtwebengine.chromiumsrcdir src/3rdparty This makes everything build by adjusting paths. Other mixed-in changes: - Rename qtwebengine_src variables in scripts to qtwebengine_root to avoid confusion. - Cleanup the release and debug extra targets that were in lib.pro. This file has also been split into src.pro and core.pro. Change-Id: Ieee9158a65f526b15244eaca59e779b7069d337e Reviewed-by: Zeno Albisser <zeno.albisser@digia.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-09 16:11:55 +0000