summaryrefslogtreecommitdiffstats
path: root/build/gyp_qtwebengine
diff options
context:
space:
mode:
authorJocelyn Turcotte <jocelyn.turcotte@digia.com>2013-07-31 12:49:02 +0200
committerJocelyn Turcotte <jocelyn.turcotte@digia.com>2013-08-01 12:20:37 +0200
commitf3db445d66924153905997c91f6aa4b36e787ea7 (patch)
tree5200f7aa13796e1e56d861bad09a67324f045495 /build/gyp_qtwebengine
parent6bce05748e7ff25f2e487357e3fa40b5943ec664 (diff)
Transform QTouchEvent into ui::TouchEvent first.
WebTouchEvents have a slightly different behavior than QTouchEvent in that the type of the event is TouchStart for each new point press, while Qt sends a TouchBegin only for the first point press. Since we already need to use ui::TouchEvent to be able to use ui::GestureRecognizer, always do this conversion first to also let UpdateWebTouchEventAfterDispatch chose the proper event type. Some of the code from render_widget_host_view_aura.cc was copied into render_widget_host_view_qt.cpp to fill the needed functionality. Change-Id: Iab1ca0c449b5256a39b5479ce89b662d4e133935 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'build/gyp_qtwebengine')
-rwxr-xr-xbuild/gyp_qtwebengine2
1 files changed, 2 insertions, 0 deletions
diff --git a/build/gyp_qtwebengine b/build/gyp_qtwebengine
index 04dece7eb..23d065831 100755
--- a/build/gyp_qtwebengine
+++ b/build/gyp_qtwebengine
@@ -134,6 +134,8 @@ if __name__ == '__main__':
# Disable it along with the -Wl,--threads flag just in case gold isn't installed on the system.
args.extend(['-D', 'linux_use_gold_binary=0'])
args.extend(['-D', 'linux_use_gold_flags=0'])
+ # Trigger Qt-specific build conditions.
+ args.extend(['-D', 'use_qt=1'])
# Tweak the output location and format (hardcode ninja for now)
args.extend(['--generator-output', os.path.abspath(get_output_dir())])
args.extend(['-Goutput_dir='+ os.path.abspath(get_output_dir())])