diff options
| author | Pierre Rossi <pierre.rossi@digia.com> | 2014-06-17 16:15:35 +0200 |
|---|---|---|
| committer | Pierre Rossi <pierre.rossi@gmail.com> | 2014-08-04 17:22:42 +0200 |
| commit | 7d90b44187cfa8f93df6a6341da41cf8192d18ad (patch) | |
| tree | 47384a6837549df6c80759ae270bbd8651477bde /src/core/qtwebengine.gypi | |
| parent | 35d66ce48248f07759cbe2a17437198e8e1948ed (diff) | |
Expose better error information in loadRequest.
Use the chromium localized error strings for that purpose, otherwise the
error description is always empty.
While we're at it, let's tap into the chromium error pages, which should
hopefully make sense for most errors, and add some static asserts to
check that the qt quick enum and the core one are in sync.
Change-Id: Icf8fa7c3bf4a674c60a10950422135fb6930447a
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'src/core/qtwebengine.gypi')
| -rw-r--r-- | src/core/qtwebengine.gypi | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/qtwebengine.gypi b/src/core/qtwebengine.gypi index c01998c59..d1bee5fb6 100644 --- a/src/core/qtwebengine.gypi +++ b/src/core/qtwebengine.gypi @@ -28,11 +28,12 @@ '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8', '<(chromium_src_dir)/webkit/glue/webkit_glue.gyp:*', '<(chromium_src_dir)/third_party/WebKit/Source/web/web.gyp:webkit', - 'chrome_qt.gyp:*', + 'chrome_qt.gyp:chrome_qt', ], 'include_dirs': [ '<(chromium_src_dir)', '<(SHARED_INTERMEDIATE_DIR)/net', # Needed to include grit/net_resources.h + '<(SHARED_INTERMEDIATE_DIR)/chrome', # Needed to include grit/generated_resources.h ], # Chromium code defines those in common.gypi, do the same for our code that include Chromium headers. 'defines': [ |