Viewing all changes in revision 328.
- Committer: Olivier Tilloy
- Date: 2014-03-20 12:20:00 UTC
- mfrom: (312.2.111 oxide)
- Revision ID: olivier.tilloy@canonical.com-20140320122000-s57xcaubm268o9n4
Merged the latest changes from trunk and resolved a conflict.
- files added:
- build/cmake
- qt/build
- qt/build/cmake
- qt/build/scripts
- qt/core/api/internal
- qt/core/gl
- qt/examples
- qt/examples/oxide-test-browser
- qt/tests/qmltests/core
- qt/tests/qmltests/crash
- files removed:
- patches/add-frame-created-for-render-view.patch
- files renamed:
- qt/core/glue/oxide_qt_message_handler_adapter.cc => qt/core/glue/oxide_qt_script_message_handler_adapter.cc
- qt/core/glue/oxide_qt_message_handler_adapter.h => qt/core/glue/oxide_qt_script_message_handler_adapter.h
- qt/core/glue/private/oxide_qt_message_handler_adapter_p.h => qt/core/glue/oxide_qt_script_message_handler_adapter_p.h
- qt/core/glue/oxide_qt_outgoing_message_request_adapter.cc => qt/core/glue/oxide_qt_script_message_request_adapter.cc
- qt/core/glue/oxide_qt_outgoing_message_request_adapter.h => qt/core/glue/oxide_qt_script_message_request_adapter.h
- qt/core/glue/private/oxide_qt_outgoing_message_request_adapter_p.h => qt/core/glue/oxide_qt_script_message_request_adapter_p.h
- qt/core/glue/private/oxide_qt_user_script_adapter_p.h => qt/core/glue/oxide_qt_user_script_adapter_p.h
- qt/core/glue/private/oxide_qt_web_context_adapter_p.h => qt/core/glue/oxide_qt_web_context_adapter_p.h
- qt/core/glue/private/oxide_qt_web_frame_adapter_p.h => qt/core/glue/oxide_qt_web_frame_adapter_p.h
- qt/core/api/oxideqincomingmessage.cc => qt/quick/api/oxideqquickscriptmessage.cc
- qt/core/api/oxideqincomingmessage.h => qt/quick/api/oxideqquickscriptmessage_p.h
- qt/core/api/oxideqincomingmessage_p.h => qt/quick/api/oxideqquickscriptmessage_p_p.h
- qt/quick/api/oxideqquickmessagehandler.cc => qt/quick/api/oxideqquickscriptmessagehandler.cc
- qt/quick/api/oxideqquickmessagehandler_p.h => qt/quick/api/oxideqquickscriptmessagehandler_p.h
- qt/quick/api/oxideqquickmessagehandler_p_p.h => qt/quick/api/oxideqquickscriptmessagehandler_p_p.h
- qt/quick/api/oxideqquickoutgoingmessagerequest.cc => qt/quick/api/oxideqquickscriptmessagerequest.cc
- qt/quick/api/oxideqquickoutgoingmessagerequest_p.h => qt/quick/api/oxideqquickscriptmessagerequest_p.h
- qt/quick/api/oxideqquickoutgoingmessagerequest_p_p.h => qt/quick/api/oxideqquickscriptmessagerequest_p_p.h
- qt/tests/qmltests/api/tst_OxideSettings.qml => qt/tests/qmltests/api/tst_OxideGlobal.qml
- qt/tests/qmltests/api/tst_IncomingMessage.qml => qt/tests/qmltests/api/tst_ScriptMessage.qml
- qt/tests/qmltests/api/tst_MessageHandler.qml => qt/tests/qmltests/api/tst_ScriptMessageHandler.qml
- qt/tests/qmltests/api/tst_WebView_incognito1.html => qt/tests/qmltests/api/tst_WebView_incognito.html
- qt/tests/qmltests/api/tst_WebView_incognito1.qml => qt/tests/qmltests/api/tst_WebView_incognito.qml
- qt/tests/qmltests/api/tst_WebView_messageHandlers_dynamic.qml => qt/tests/qmltests/api/tst_WebView_messageHandlers.qml
- shared/browser/oxide_incoming_message.cc => shared/browser/oxide_script_message_impl_browser.cc
- shared/browser/oxide_incoming_message.h => shared/browser/oxide_script_message_impl_browser.h
- shared/browser/oxide_outgoing_message_request.cc => shared/browser/oxide_script_message_request_impl_browser.cc
- shared/browser/oxide_outgoing_message_request.h => shared/browser/oxide_script_message_request_impl_browser.h
- shared/browser/oxide_message_target.h => shared/browser/oxide_script_message_target.h
- shared/renderer/oxide_message_dispatcher_renderer.cc => shared/renderer/oxide_script_message_dispatcher_renderer.cc
- shared/renderer/oxide_message_dispatcher_renderer.h => shared/renderer/oxide_script_message_dispatcher_renderer.h
- shared/renderer/oxide_v8_message_manager.cc => shared/renderer/oxide_script_message_manager.cc
- shared/renderer/oxide_v8_message_manager.h => shared/renderer/oxide_script_message_manager.h
- shared/renderer/oxide_v8_message_manager_bindings.js => shared/renderer/oxide_script_message_manager_bindings.js
- files modified:
- .bzrignore
expand all
collapse all
added
removed
