| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
|
|
|
|
|
|
| |
sys.path.insert(0,... can be harmful, let's not take that chance
Change-Id: I00e5c70ba97cddbc596a6a0efb1019a08d3f4ff7
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
| |
Via QLibraryInfo. Also pick the name from qmake, and drop the
hardcoded value.
Add better error reporting when this fails.
Change-Id: I44891a16f079b6c3c334f7f2bafa9edc0b4d69e4
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: I6b4d1ec92b3adc2145a1f2aeec7038eac079d4e8
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
| |
Seems more robust than a regexp, and the right thing to use in this case.
Change-Id: I1ca320606c50fb3d5f593025e23b3e08ae77a124
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
|
|
|
|
| |
Git submodule works only with cygwin on Windows. MSys Git has
problems with long paths. So matchesOS needs to identify
cygwin environment as Windows to get the right submodules.
Change-Id: Ie7acfaa4d1ef3d891710a39651049c4e5a9f3570
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This only move files without adjusting any paths.
This moves:
- lib/quick -> src/webengine/api (API files)
lib/quick -> src/webengine (other files)
This contains the main QtWebEngine module library since
<ec7b2ee70a8b2db7fb87f50671a001ddd54697b0>.
- lib/widgets -> src/webenginewidgets
Also rename this directory to match its module name and rename Api to api.
- lib -> src/core
- process -> src/process
- resources -> src/core/resources
- tools/* -> tools/scripts/
The build directory is spread as follow:
- build/build.pro -> src/core/gyp_run.pro
- build/qmake_extras/* -> src/core/ (for the host and target .pro files)
- build/qmake -> tools/qmake
- Build related scripts -> tools/buildscripts
Change-Id: I0cded1de772c99c0c1da6536c9afea353236b4a1
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
| |
Change-Id: I08edcd97e9e2c38d9984b8ed2fbc9b64c88f8dd5
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The updating procedure for chromium is now as follows:
- update 3rdparty_upstream to the requested state for the snapshot
- initialize 3rdparty submodule by executing
git submodule init -- 3rdparty
git submodule update -- 3rdparty
- execute the export_from_git.py script from the QtWebEngine
top level directory.
- do a "git commit -a" in 3rdparty/ and write an appropriate
commit message mentioning the exact state from where the snapshot
was taken from.
- do a "git show" to double check the changes for the snapshot look
reasonable.
- push the changes to the 3rdparty repository.
Change-Id: I7806d284c9a146f857600cfef0face8331af646a
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
| |
While we're at it, also remove a stray currentDir variable
in readSubmodules.
Change-Id: Ia814906597f436513c4e57ed487ba478154eee4f
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
|
|
|
|
|
|
|
|
|
| |
These functions are shims for subprocess.call and
subprocess.check_output and allow to display the
command being executed on screen as well.
Change-Id: I9507b8b4f0c006572211620c935e673f848dbbbc
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This is necessary to be able to checkout a chromium
release branch. Chromium release branches do not
make use of git submodule.
Instead the dependencies or submodules are specified
in a .DEPS.git file.
Given some python scopes and callbacks for resolving
variables, such a file can be invoked like a python
script. The dependencies will then be exported
into the provided scopes and we can use that
information to initialize git submodules.
Change-Id: Ibab09b1077720b73f89efff16d38b308f31cf2ab
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
|
|
|
|
|
| |
Change-Id: I7dd9f77c131afdaaae476a8574bae114540f1ee6
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
|
|
|
|
|
|
|
|
|
| |
This option initializes the upstream chromium repository
and additionally to the submodules needed for the matching
OS it also clones submodules needed for Android.
Change-Id: I1df84973aabc10f5c839bc4e3db7c6024f2c5145
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The regular workflow now is just to clone the qtwebengine repository
and then execute the following commands.
git submodule init && git submodule update --recursive && qmake && make
This will also clone a submodule called 3rdparty which contains the
chromium and ninja sources without pulling in further submodules
and without a complete history.
Developers that do want to have a complete chromium checkout instead
should not use the above command sequence.
Instead they should just clone qtwebengine, execute the
init-repository.py script, run qmake and make.
The init-repository.py script will then checkout the complete
chromium sources into a subdirectory called 3rdparty_upstream.
The location of these sources will be picked up by qmake automatically.
Change-Id: I0fa4f1d554bdca2e852b6a97aa2e5462d90d8664
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
Split out the Submodule class and related functions from
init-repository.py into a separate python module git_submodule.py.
This is necessary in order to reuse the code for the export script.
The export_from_git.py script can be used to export files
from a git repository into an arbitrary directory.
It spiders submodules and applies some pattern matching to remove
unwanted files.
This script can be used to create flattened chromium snapshots
to be used in our CI system.
Change-Id: Iade8126fae6c28b5347c9d6e08941e28d3e0e7be
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
|