Merge lp://staging/~abreu-alexandre/oxide/add-datetime-picker-ui-support into lp://staging/~oxide-developers/oxide/oxide.trunk
Proposed by
Alexandre Abreu
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://staging/~abreu-alexandre/oxide/add-datetime-picker-ui-support |
| Merge into: | lp://staging/~oxide-developers/oxide/oxide.trunk |
| Diff against target: |
2003 lines (+1592/-0) (has conflicts) 29 files modified
patches/add-external-date-picker-embedder-hooks.patch (+182/-0) qt/core/api/oxideqdatetimeinputmode.cc (+21/-0) qt/core/api/oxideqdatetimeinputmode.h (+45/-0) qt/core/browser/oxide_qt_date_time_picker.cc (+104/-0) qt/core/browser/oxide_qt_date_time_picker.h (+62/-0) qt/core/browser/oxide_qt_web_view.cc (+11/-0) qt/core/browser/oxide_qt_web_view.h (+17/-0) qt/core/core.gyp (+24/-0) qt/core/glue/oxide_qt_date_time_picker_proxy.h (+59/-0) qt/core/glue/oxide_qt_date_time_picker_proxy_client.h (+37/-0) qt/core/glue/oxide_qt_web_view_proxy_client.h (+3/-0) qt/qmlplugin/oxide_qml_plugin.cc (+7/-0) qt/quick/CMakeLists.txt (+1/-0) qt/quick/api/oxideqquickwebview.cc (+29/-0) qt/quick/api/oxideqquickwebview_p.h (+9/-0) qt/quick/api/oxideqquickwebview_p_p.h (+3/-0) qt/quick/oxide_qquick_date_time_picker.cc (+159/-0) qt/quick/oxide_qquick_date_time_picker.h (+67/-0) qt/tests/qmltests/api/tst_WebView_dateTimePicker.html (+10/-0) qt/tests/qmltests/api/tst_WebView_dateTimePicker.qml (+125/-0) shared/browser/oxide_date_time_picker.cc (+66/-0) shared/browser/oxide_date_time_picker.h (+69/-0) shared/browser/oxide_web_view.cc (+136/-0) shared/browser/oxide_web_view.h (+105/-0) shared/renderer/oxide_content_renderer_client.cc (+48/-0) shared/renderer/oxide_content_renderer_client.h (+11/-0) shared/renderer/oxide_date_time_picker.cc (+118/-0) shared/renderer/oxide_date_time_picker.h (+60/-0) shared/shared.gyp (+4/-0) Text conflict in qt/core/browser/oxide_qt_web_view.cc Text conflict in qt/core/browser/oxide_qt_web_view.h Text conflict in qt/core/core.gyp Text conflict in qt/qmlplugin/oxide_qml_plugin.cc Text conflict in qt/quick/api/oxideqquickwebview.cc Text conflict in qt/quick/api/oxideqquickwebview_p.h Text conflict in shared/browser/oxide_web_view.cc Text conflict in shared/browser/oxide_web_view.h Text conflict in shared/renderer/oxide_content_renderer_client.cc Text conflict in shared/renderer/oxide_content_renderer_client.h |
| To merge this branch: | bzr merge lp://staging/~abreu-alexandre/oxide/add-datetime-picker-ui-support |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Chris Coulson | Pending | ||
|
Review via email:
|
|||
Commit message
Add date time picker support
Description of the change
Add date time picker support
To post a comment you must log in.
Unmerged revisions
- 1085. By Alexandre Abreu
-
tweaks
- 1084. By Alexandre Abreu
-
Add tests
- 1083. By Alexandre Abreu
-
Add date time picker support
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
