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/qtwebengine_extras.gypi | |
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/qtwebengine_extras.gypi')
-rw-r--r-- | src/core/qtwebengine_extras.gypi | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/src/core/qtwebengine_extras.gypi b/src/core/qtwebengine_extras.gypi new file mode 100644 index 000000000..2937ee423 --- /dev/null +++ b/src/core/qtwebengine_extras.gypi @@ -0,0 +1,51 @@ +{ + 'target_defaults': { + # patterns used to exclude chromium files from the build when we have a drop-in replacement + 'sources/': [ + ['exclude', 'base/resource/resource_bundle_gtk.cc$'], + ['exclude', 'base/resource/resource_bundle_mac.mm$'], + ['exclude', 'base/resource/resource_bundle_win.cc$'], + ['exclude', 'browser/web_contents/web_contents_view_gtk\\.(cc|h)$'], + ['exclude', 'browser/web_contents/web_contents_view_mac\\.(mm|h)$'], + ['exclude', 'browser/web_contents/web_contents_view_win\\.(cc|h)$'], + ['exclude', 'browser/renderer_host/gtk_im_context_wrapper\\.cc$'], + ['exclude', 'browser/renderer_host/render_widget_host_view_gtk\\.(cc|h)$'], + ['exclude', 'browser/renderer_host/render_widget_host_view_mac\\.(mm|h)$'], + ['exclude', 'browser/renderer_host/render_widget_host_view_win\\.(cc|h)$'], + + # QNX-specific excludes + ['exclude', 'base/resource/resource_bundle_qnx.cc$'], + ['exclude', 'browser/qnx/'], + ['exclude', 'browser/renderer_host/render_widget_host_view_qnx\\.(cc|h)$'], + ['exclude', 'browser/web_contents/web_contents_view_qnx\\.(cc|h)$'], + ], + }, + 'conditions': [ + [ 'OS=="linux" and qt_cross_compile==1', { + 'target_defaults': { + 'defines': [ + 'TOOLKIT_QT', + ], + 'target_conditions': [ + ['_toolset=="target"', { + 'ldflags!': ['-L/usr/lib'], # garbage added by icu-config + 'conditions': [ + [ '_target_name=="gl"', { + 'defines': [ + 'GL_GLEXT_PROTOTYPES', + 'EGL_EGLEXT_PROTOTYPES', + ], + }], + ['_type=="shared_library"', { + 'ldflags': [ + # Tell the linker to prefer symbols within the library before looking outside + '-Wl,-shared,-Bsymbolic', + ], + }], + ], + }], + ], + }, + }], + ], +} |