| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
|
|
|
|
|
|
| |
Chromium requires relative paths for output-dir and
for generator-output. Also output-dir is expected to
be a subdirectory of generator-output.
This now allows building on windows without running
qmake in recursive mode.
Change-Id: Ie0f9965c1fbfd63eb3cb9c360b29f210128a5c3e
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
qtwe_chromium_obj_dir wasn't falling back to src/3rdparty if the
config couldn't be found in git.
Move the fallback logic to a getChromiumSrcDir qmake function, and
use it in both places.
The build system will now also print that the Chromium sources will
follow the git config if found instead of the other way around,
since this should now be the normal case as part of Qt5.
Change-Id: I5ab972ab53156c1bd033518e2eb51013559491ac
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
| |
|
|
|
| |
Change-Id: Id794add1267ebea804b050bb50e232bcf5f7dd13
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
| |
|
|
|
|
|
|
|
| |
The || true syntax does not work on Windows.
Also, normalize the paths to the underlying OS style.
Change-Id: Ie13d2646fe239fccb9ab7b558a6c8d56b779b206
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Working directory can be wrong when calling getChromiumSrcDir.
On Windows cwd is inside Chrome source directory when it called
from repack_locales.py that causes git config to return empty
value. This causes the function to fall back to snapshot directory
even if upstream is used.
Changing cwd to qtwebengine_root, running git config and restoring
original cwd resolves the problem.
Change-Id: I1bef84ce791f63d3c9e7d6c9506e99c0c53cfc3e
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
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>
|
