diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-11-18 14:23:25 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-28 16:16:28 +0100 |
| commit | 1c5e30928bd3ec31747276ff60940ec144a2cc16 (patch) | |
| tree | 7ccc07f0687bae9b2fd6b6eb494d8e3b8663690b /tools/qmake/mkspecs/features/default_pre.prf | |
| parent | fd61d752e313bf91a09c85020b3fb50067c610c8 (diff) | |
Moving sources to src part 2: Adjust paths.
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>
Diffstat (limited to 'tools/qmake/mkspecs/features/default_pre.prf')
| -rw-r--r-- | tools/qmake/mkspecs/features/default_pre.prf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/qmake/mkspecs/features/default_pre.prf b/tools/qmake/mkspecs/features/default_pre.prf index 1e751b740..cec9be1bd 100644 --- a/tools/qmake/mkspecs/features/default_pre.prf +++ b/tools/qmake/mkspecs/features/default_pre.prf @@ -1,12 +1,12 @@ # Resolve root directories for sources -QTWEBENGINE_ROOT = $$replace(PWD, /build/qmake/mkspecs/features$,) +QTWEBENGINE_ROOT = $$replace(PWD, /tools/qmake/mkspecs/features$,) QTWEBENGINEPROCESS_NAME = QtWebEngineProcess git_chromium_src_dir = $$system("git config qtwebengine.chromiumsrcdir") # Fall back to the snapshot path if git does not know about chromium sources (i.e. init-repository.py has not been used) -isEmpty(git_chromium_src_dir): git_chromium_src_dir = "3rdparty/chromium" +isEmpty(git_chromium_src_dir): git_chromium_src_dir = "src/3rdparty/chromium" CHROMIUM_SRC_DIR = $$absolute_path("$$QTWEBENGINE_ROOT/$$git_chromium_src_dir") |