← Back to branch summary

~mterry/unity8/power-button-on-lock

« back to all changes in this revision

Viewing changes to tests/mocks/Ubuntu/Telephony/Telephony.qmltypes

  • Committer: Michael Terry
  • Date: 2014-11-24 15:25:42 UTC
  • mfrom: (1368.1.82 unity8)
  • Revision ID: michael.terry@canonical.com-20141124152542-5cysva8ds3qfula6
Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/mocks/Ubuntu/Telephony/Telephony.qmltypes
22
22
        exportMetaObjectRevisions: [0]
23
23
        Property { name: "phoneNumber"; type: "string" }
24
24
        Property { name: "isConference"; type: "bool" }
25
 
        Property { name: "elapsedTime"; type: "int"; isReadonly: true }
 
25
        Property { name: "elapsedTime"; type: "int" }
 
26
        Property { name: "elapsedTimerRunning"; type: "bool" }
26
27
    }
27
28
    Component {
28
29
        name: "MockCallManager"