Viewing all changes in revision 1025.
- Committer: Olivier Tilloy
- Date: 2015-05-18 14:31:37 UTC
- mfrom: (1022.1.58 oxide)
- Revision ID: olivier.tilloy@canonical.com-20150518143137-omciv1buwk0t5r6o
Merge the latest changes from trunk and resolve a couple of conflicts.
- files added:
- qt/core/api/oxideqmediacapturedevice.cc
- files removed:
- patches/arm-neon.patch
- files renamed:
- qt/core/glue/oxide_qt_file_picker_delegate.h => qt/core/glue/oxide_qt_file_picker_proxy.h
- qt/core/glue/oxide_qt_javascript_dialog_delegate.h => qt/core/glue/oxide_qt_javascript_dialog_proxy.h
- qt/core/glue/oxide_qt_script_message_handler_adapter.cc => qt/core/glue/oxide_qt_script_message_handler_proxy.cc
- qt/core/glue/oxide_qt_script_message_handler_adapter.h => qt/core/glue/oxide_qt_script_message_handler_proxy.h
- qt/core/glue/oxide_qt_script_message_adapter.h => qt/core/glue/oxide_qt_script_message_proxy.h
- qt/core/glue/oxide_qt_script_message_request_adapter.cc => qt/core/glue/oxide_qt_script_message_request_proxy.cc
- qt/core/glue/oxide_qt_script_message_request_adapter.h => qt/core/glue/oxide_qt_script_message_request_proxy.h
- qt/core/glue/oxide_qt_user_script_adapter.cc => qt/core/glue/oxide_qt_user_script_proxy.cc
- qt/core/glue/oxide_qt_user_script_adapter.h => qt/core/glue/oxide_qt_user_script_proxy.h
- qt/core/glue/oxide_qt_web_context_adapter.cc => qt/core/glue/oxide_qt_web_context_proxy.cc
- qt/core/glue/oxide_qt_web_context_adapter.h => qt/core/glue/oxide_qt_web_context_proxy.h
- qt/core/glue/oxide_qt_web_frame_adapter.h => qt/core/glue/oxide_qt_web_frame_proxy.h
- qt/core/glue/oxide_qt_web_popup_menu_delegate.h => qt/core/glue/oxide_qt_web_popup_menu_proxy.h
- qt/core/glue/oxide_qt_web_view_adapter.cc => qt/core/glue/oxide_qt_web_view_proxy.cc
- qt/core/glue/oxide_qt_web_view_adapter.h => qt/core/glue/oxide_qt_web_view_proxy.h
- qt/quick/oxide_qquick_alert_dialog_delegate.cc => qt/quick/oxide_qquick_alert_dialog.cc
- qt/quick/oxide_qquick_alert_dialog_delegate.h => qt/quick/oxide_qquick_alert_dialog.h
- qt/quick/oxide_qquick_before_unload_dialog_delegate.cc => qt/quick/oxide_qquick_before_unload_dialog.cc
- qt/quick/oxide_qquick_before_unload_dialog_delegate.h => qt/quick/oxide_qquick_before_unload_dialog.h
- qt/quick/oxide_qquick_confirm_dialog_delegate.cc => qt/quick/oxide_qquick_confirm_dialog.cc
- qt/quick/oxide_qquick_confirm_dialog_delegate.h => qt/quick/oxide_qquick_confirm_dialog.h
- qt/quick/oxide_qquick_file_picker_delegate.cc => qt/quick/oxide_qquick_file_picker.cc
- qt/quick/oxide_qquick_file_picker_delegate.h => qt/quick/oxide_qquick_file_picker.h
- qt/quick/oxide_qquick_javascript_dialog_delegate.cc => qt/quick/oxide_qquick_javascript_dialog.cc
- qt/quick/oxide_qquick_javascript_dialog_delegate.h => qt/quick/oxide_qquick_javascript_dialog.h
- qt/quick/oxide_qquick_prompt_dialog_delegate.cc => qt/quick/oxide_qquick_prompt_dialog.cc
- qt/quick/oxide_qquick_prompt_dialog_delegate.h => qt/quick/oxide_qquick_prompt_dialog.h
- qt/quick/oxide_qquick_web_popup_menu_delegate.cc => qt/quick/oxide_qquick_web_popup_menu.cc
- qt/quick/oxide_qquick_web_popup_menu_delegate.h => qt/quick/oxide_qquick_web_popup_menu.h
- qt/tests/qmltests/api/tst_NetworkCallbackEvents_Redirect.html => qt/tests/qmltests/api/tst_NetworkCallbackEvents4.html
- qt/tests/qmltests/api/redirect.py => qt/tests/qmltests/api/tst_NetworkCallbackEvents_redirect.py
- shared/browser/oxide_browser_context_anchor.cc => shared/browser/oxide_browser_context_destroyer.cc
- shared/browser/oxide_browser_context_anchor.h => shared/browser/oxide_browser_context_destroyer.h
- files modified:
- CHROMIUM_VERSION
expand all
collapse all
added
removed
