← Back to branch summary

~bpierre/ubuntu-ui-toolkit/newbutton

« back to all changes in this revision

Viewing changes to components.api

  • Committer: Pierre Bertet
  • Date: 2016-03-31 08:57:11 UTC
  • mfrom: (1851.1.64 staging)
  • Revision ID: pierre.bertet@canonical.com-20160331085711-i9tl9com945clp67
[sync] merge staging

Show diffs side-by-side

added added

removed removed

Lines of Context:
components.api
426
426
    default property list<QtObject> contents
427
427
    property double edgeMargins
428
428
    property bool modal
 
429
    property Component style
 
430
    property string styleName
429
431
    property string text
 
432
    property ThemeSettings theme
430
433
    property string title
431
434
Ubuntu.Components.ListItems.Divider 1.0 0.1: QQuickImageBase
432
435
Ubuntu.Components.ListItems.Divider 1.3: QQuickImageBase
990
993
    function var show()
991
994
    function var hide()
992
995
    property Item pointerTarget
 
996
    property Component style
 
997
    property string styleName
 
998
    property ThemeSettings theme
993
999
Ubuntu.Components.Popups.PopupBase 1.0 0.1: OrientationHelper
994
1000
    property Item dismissArea
995
1001
    property PropertyAnimation fadingAnimation