Merge lp:~osomon/oxide/typeinfo-qt55 into lp:~oxide-developers/oxide/oxide.trunk

Proposed by Olivier Tilloy on 2016-01-13
Status: Needs review
Proposed branch: lp:~osomon/oxide/typeinfo-qt55
Merge into: lp:~oxide-developers/oxide/oxide.trunk
Diff against target: 11 lines (+1/-0)
1 file modified
qt/qmlplugin/oxide_qml_plugin.cc (+1/-0)
To merge this branch: bzr merge lp:~osomon/oxide/typeinfo-qt55
Reviewer Review Type Date Requested Status
Chris Coulson 2016-01-13 Pending
Review via email: mp+282429@code.launchpad.net

Commit message

Generate type info for all types (including those that don’t expose enums) with Qt 5.5.

To post a comment you must log in.

Unmerged revisions

1311. By Olivier Tilloy on 2016-01-13

Generate type info for all types (including those that don’t expose enums) with Qt 5.5.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'qt/qmlplugin/oxide_qml_plugin.cc'
2--- qt/qmlplugin/oxide_qml_plugin.cc 2016-01-12 11:45:54 +0000
3+++ qt/qmlplugin/oxide_qml_plugin.cc 2016-01-13 12:23:27 +0000
4@@ -103,6 +103,7 @@
5 qmlRegisterUncreatableType<oxide::qmlplugin::SslCertificate>(uri, 1, 0, "SslCertificate",
6 "SslCertificate is accessed via SecurityStatus.certificate");
7 #else
8+ qmlRegisterValueTypeEnums<OxideQDownloadRequest>(uri, 1, 0, "DownloadRequest");
9 qmlRegisterValueTypeEnums<OxideQLoadEvent>(uri, 1, 0, "LoadEvent");
10 qmlRegisterValueTypeEnums<OxideQSslCertificate>(uri, 1, 0, "SslCertificate");
11 #endif

Subscribers

People subscribed via source and target branches