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 /src/core/gyp_configure_target.pro | |
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 'src/core/gyp_configure_target.pro')
-rw-r--r-- | src/core/gyp_configure_target.pro | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/src/core/gyp_configure_target.pro b/src/core/gyp_configure_target.pro new file mode 100644 index 000000000..6d9f414c3 --- /dev/null +++ b/src/core/gyp_configure_target.pro @@ -0,0 +1,36 @@ +# Prevent generating a makefile that attempts to create a lib +TEMPLATE = aux + +TOOLCHAIN_INCLUDES = $${QMAKE_INCDIR_EGL} $${INCLUDEPATH} $${QMAKE_INCDIR} + +GYPI_CONTENTS += " ['CC', '$$which($$QMAKE_CC)']," \ + " ['CXX', '$$which($$QMAKE_CXX)']," \ + " ['LD', '$$which($$QMAKE_LINK)']," +GYPI_CONTENTS += " ]," \ + " 'target_defaults': {" \ + " 'target_conditions': [" \ + " ['_toolset==\"target\"', {" \ + " 'include_dirs': [" +for(includes, TOOLCHAIN_INCLUDES) { + GYPI_CONTENTS += " '$$includes'," +} +GYPI_CONTENTS += " ]," \ + " 'cflags': [" +for(cflag, QT_CFLAGS_DBUS) { + GYPI_CONTENTS += " '$$cflag'," +} +GYPI_CONTENTS += " ]," \ + " }]," \ + " ]," \ + " }," + +GYPI_CONTENTS += "}" + +GYPI_FILE = $$absolute_path('build/qmake_extras.gypi', $$QTWEBENGINE_ROOT) + +!exists($$GYPI_FILE): error("-- $$GYPI not found --") + +# Append to the file already containing the host settings. +!build_pass { + write_file($$GYPI_FILE, GYPI_CONTENTS, append) +} |