diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-29 12:18:48 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-29 12:18:57 +0100 |
| commit | 4c01d0526ba4dd8cff0c0ff22a6f0ab5eb973064 (patch) | |
| tree | bed2fe914fe0f7ec70abfb47d2d84af8a3604d09 /Source/WebKit/chromium/WebKit.gyp | |
| parent | 01485457c9a5da3f1121015afd25bb53af77662e (diff) | |
| download | qtwebkit-4c01d0526ba4dd8cff0c0ff22a6f0ab5eb973064.tar.gz | |
Imported WebKit commit c60cfe0fc09efd257aa0111d7b133b02deb8a63e (http://svn.webkit.org/repository/webkit/trunk@136119)
New snapshot that includes the fix for installing the QtWebProcess into libexec
Change-Id: I01344e079cbdac5678c4cba6ffcc05f4597cf0d7
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'Source/WebKit/chromium/WebKit.gyp')
| -rw-r--r-- | Source/WebKit/chromium/WebKit.gyp | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/Source/WebKit/chromium/WebKit.gyp b/Source/WebKit/chromium/WebKit.gyp index 92afddaa0..0e6f0c9a0 100644 --- a/Source/WebKit/chromium/WebKit.gyp +++ b/Source/WebKit/chromium/WebKit.gyp @@ -108,6 +108,7 @@ 'public/WebBindings.h', 'public/WebBlob.h', 'public/WebCache.h', + 'public/WebCachedURLRequest.h', 'public/WebColorChooser.h', 'public/WebColorChooserClient.h', 'public/WebColorName.h', @@ -288,6 +289,7 @@ 'public/WebWorkerInfo.h', 'public/android/WebInputEventFactory.h', 'public/android/WebSandboxSupport.h', + 'public/default/WebRenderTheme.h', 'public/gtk/WebInputEventFactory.h', 'public/linux/WebFontRenderStyle.h', 'public/linux/WebFontRendering.h', @@ -432,6 +434,7 @@ 'src/PrerendererClientImpl.h', 'src/PrerendererClientImpl.cpp', 'src/android/WebInputEventFactory.cpp', + 'src/default/WebRenderTheme.cpp', 'src/linux/WebFontInfo.cpp', 'src/linux/WebFontRendering.cpp', 'src/linux/WebFontRenderStyle.cpp', @@ -489,6 +492,7 @@ 'src/WebBlob.cpp', 'src/WebBlobData.cpp', 'src/WebCache.cpp', + 'src/WebCachedURLRequest.cpp', 'src/WebColorName.cpp', 'src/WebCommon.cpp', 'src/WebCompositorInputHandlerImpl.cpp', @@ -840,6 +844,20 @@ }], ], }], + ['use_default_render_theme==1', { + 'sources/': [ + ['exclude', 'src/linux/WebRenderTheme.cpp'], + ['exclude', 'public/linux/WebRenderTheme.h'], + ], + 'include_dirs': [ + 'public/default', + ], + }, { # else use_default_render_theme==0 + 'sources/': [ + ['exclude', 'src/default/WebRenderTheme.cpp'], + ['exclude', 'public/default/WebRenderTheme.h'], + ], + }], ], 'target_conditions': [ ['OS=="android"', { |