diff options
author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-11-19 17:55:49 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-28 16:15:59 +0100 |
commit | fd61d752e313bf91a09c85020b3fb50067c610c8 (patch) | |
tree | 5aeff0a1039acc3e7bf7ced21870cac42d491f9e /tools/qmake/mkspecs/features/default_pre.prf | |
parent | 84a400e80d7e40aba2853411fdfb22f244c3e728 (diff) |
Moving sources to src part 1: Move files.
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>
Diffstat (limited to 'tools/qmake/mkspecs/features/default_pre.prf')
-rw-r--r-- | tools/qmake/mkspecs/features/default_pre.prf | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/tools/qmake/mkspecs/features/default_pre.prf b/tools/qmake/mkspecs/features/default_pre.prf new file mode 100644 index 000000000..1e751b740 --- /dev/null +++ b/tools/qmake/mkspecs/features/default_pre.prf @@ -0,0 +1,29 @@ +# Resolve root directories for sources +QTWEBENGINE_ROOT = $$replace(PWD, /build/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" + +CHROMIUM_SRC_DIR = $$absolute_path("$$QTWEBENGINE_ROOT/$$git_chromium_src_dir") + +INCLUDEPATH += $$CHROMIUM_SRC_DIR + +# Tweaks that shouldn't affect our examples +!contains(_PRO_FILE_PWD_, $$QTWEBENGINE_ROOT/examples) { + # Used for our export macros + DEFINES += BUILDING_CHROMIUM + # We have to disable RTTI for now since that's how chromium builds on linux + unix:QMAKE_CXXFLAGS += -fno-rtti +} +# Location of sync.profile +MODULE_BASE_DIR = $$QTWEBENGINE_ROOT + + +load(functions) + +# Call the original default_pre. +load(default_pre) |