diff options
| author | Zeno Albisser <zeno.albisser@digia.com> | 2013-08-17 20:31:40 +0200 |
|---|---|---|
| committer | Zeno Albisser <zeno.albisser@digia.com> | 2013-08-19 20:27:13 +0200 |
| commit | fada4c705acff45be8418f20d28f1a091e6afe47 (patch) | |
| tree | 1a724178b9f6b38026f15182a5c46cbfa82ca6bc /patches | |
| parent | b9a97b2c4dca50f0c13a1006130e095e85936a2a (diff) | |
Update init-repository.py to allow using upstream chromium repository.
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>
Diffstat (limited to 'patches')
| -rwxr-xr-x | patches/patch-chromium.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/patches/patch-chromium.sh b/patches/patch-chromium.sh index a1fa4261b..3a9e9278e 100755 --- a/patches/patch-chromium.sh +++ b/patches/patch-chromium.sh @@ -46,7 +46,7 @@ PATCH_DIR="$( cd "$( dirname "$0" )" && pwd )" QTWEBENGINE_SRC_DIR="$( cd $PATCH_DIR/../ && pwd )" if [ -z "$CHROMIUM_SRC_DIR" ]; then - CHROMIUM_SRC_DIR="$( cd $PATCH_DIR/../chromium && pwd )" + CHROMIUM_SRC_DIR="$( cd `git config qtwebengine.chromiumsrcdir` && pwd )" fi if [ ! -d "$CHROMIUM_SRC_DIR" ]; then |