diff options
| -rw-r--r-- | .gitmodules | 11 | ||||
| m--------- | 3rdparty | 0 | ||||
| -rwxr-xr-x | build/gyp_qtwebengine | 2 | ||||
| m--------- | build/ninja | 0 | ||||
| -rw-r--r-- | build/qmake/mkspecs/features/default_pre.prf | 2 | ||||
| -rw-r--r-- | build/qmake/mkspecs/features/functions.prf | 8 | ||||
| -rwxr-xr-x | build/scripts/build_resources.py | 2 | ||||
| m--------- | chromium | 0 |
8 files changed, 14 insertions, 11 deletions
diff --git a/.gitmodules b/.gitmodules index 337420757..c9096a28b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,4 @@ -[submodule "build/ninja"] - path = build/ninja - url = https://github.com/martine/ninja.git -[submodule "chromium"] - path = chromium - url = https://chromium.googlesource.com/chromium/src.git - ignore = all +[submodule "3rdparty"] + path = 3rdparty + url = git://gitorious.org/qt-labs/chromium.git + ignore = all diff --git a/3rdparty b/3rdparty new file mode 160000 +Subproject 679147eead574d186ebf3069647b4c23e8ccace diff --git a/build/gyp_qtwebengine b/build/gyp_qtwebengine index 23d065831..322d7e62a 100755 --- a/build/gyp_qtwebengine +++ b/build/gyp_qtwebengine @@ -10,7 +10,7 @@ chrome_src = os.environ.get('CHROMIUM_SRC_DIR') if chrome_src: chrome_src = os.path.abspath(chrome_src) if not chrome_src or not os.path.isdir(chrome_src): - chrome_src = os.path.join(qtwebengine_src, 'chromium') + chrome_src = os.path.join(qtwebengine_src, '3rdparty/chromium') print 'CHROMIUM_SRC_DIR not set, falling back to ' + chrome_src script_dir = os.path.abspath(os.path.join(chrome_src, 'build')) diff --git a/build/ninja b/build/ninja deleted file mode 160000 -Subproject c8ac05c871a22cdd3b41ab76e72544524cedafa diff --git a/build/qmake/mkspecs/features/default_pre.prf b/build/qmake/mkspecs/features/default_pre.prf index 26e5e3428..75427b605 100644 --- a/build/qmake/mkspecs/features/default_pre.prf +++ b/build/qmake/mkspecs/features/default_pre.prf @@ -5,7 +5,7 @@ QTWEBENGINEPROCESS_NAME = QtWebEngineProcess # Fetched from environment for now CHROMIUM_SRC_DIR = $$(CHROMIUM_SRC_DIR) -isEmpty(CHROMIUM_SRC_DIR): CHROMIUM_SRC_DIR=$$QTWEBENGINE_ROOT/chromium +isEmpty(CHROMIUM_SRC_DIR): CHROMIUM_SRC_DIR=$$QTWEBENGINE_ROOT/3rdparty/chromium INCLUDEPATH += $$CHROMIUM_SRC_DIR diff --git a/build/qmake/mkspecs/features/functions.prf b/build/qmake/mkspecs/features/functions.prf index 72a225916..c712912b4 100644 --- a/build/qmake/mkspecs/features/functions.prf +++ b/build/qmake/mkspecs/features/functions.prf @@ -75,7 +75,13 @@ defineReplace(findNinja) { !isEmpty(CACHED_NINJA_EXECUTABLE):exists($$CACHED_NINJA_EXECUTABLE): return($$CACHED_NINJA_EXECUTABLE) out = $$which(ninja) # Try to be smart about it if we know where the chromium sources are located - !exists($$out): out = $$absolute_path("$$QTWEBENGINE_ROOT/build/ninja/ninja") + !exists($$out): out = $$absolute_path("$$QTWEBENGINE_ROOT/3rdparty/ninja/ninja") + # If we still did not find ninja, then we bootstrap it. + !exists($$out) { + message("bootstrapping ninja...") + system("python $$QTWEBENGINE_ROOT/3rdparty/ninja/bootstrap.py") + } + message("using $$out") cache(CACHED_NINJA_EXECUTABLE, set, out) return($$out) } diff --git a/build/scripts/build_resources.py b/build/scripts/build_resources.py index 6dd350fc6..d060db1f7 100755 --- a/build/scripts/build_resources.py +++ b/build/scripts/build_resources.py @@ -54,7 +54,7 @@ chrome_src = os.environ.get('CHROMIUM_SRC_DIR') if chrome_src: chrome_src = os.path.abspath(chrome_src) if not chrome_src or not os.path.isdir(chrome_src): - chrome_src = os.path.join(qtwebengine_src, 'chromium') + chrome_src = os.path.join(qtwebengine_src, '3rdparty/chromium') print 'CHROMIUM_SRC_DIR not set, falling back to ' + chrome_src grit_tool = os.path.join(chrome_src, 'tools/grit/grit.py') diff --git a/chromium b/chromium deleted file mode 160000 -Subproject abd5181174761e1cb14fcbd697b6a3705ee907b |