← Back to branch summary

~osomon/oxide/touch-selection-api

« back to all changes in this revision

Viewing changes to qt/qmlplugin/oxide.qmltypes

  • Committer: Olivier Tilloy
  • Date: 2016-01-12 11:45:54 UTC
  • mfrom: (1272.1.36 oxide)
  • Revision ID: olivier.tilloy@canonical.com-20160112114554-kt57hdrqixa2zqy4
Merge the latest changes from trunk and resolve a minor conflict.

Show diffs side-by-side

added added

removed removed

Lines of Context:
qt/qmlplugin/oxide.qmltypes
638
638
            isPointer: true
639
639
        }
640
640
        Property { name: "webProcessStatus"; revision: 4; type: "WebProcessStatus"; isReadonly: true }
641
 
        Property { name: "hoveredUrl"; type: "QUrl"; isReadonly: true }
 
641
        Property { name: "hoveredUrl"; revision: 7; type: "QUrl"; isReadonly: true }
642
642
        Property {
643
643
            name: "touchSelectionController"
644
644
            revision: 7