Ubuntu UI Toolkit

Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/internalApiClassName into lp:ubuntu-ui-toolkit/staging

  1. internalApiClassName
  2. Merge into staging
Proposed by Cris Dywan
Status: Merged
Approved by: Zsombor Egri
Approved revision: 1781
Merged at revision: 1787
Proposed branch: lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/internalApiClassName
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 635 lines (+182/-60)
9 files modified
apicheck/apicheck.cpp (+10/-0)
components.api (+50/-50)
tests/api/Extinct/Animals/AnimalModule.pro (+1/-1)
tests/api/Extinct/Animals/plugin/plugin.cpp (+2/-0)
tests/api/Extinct/Animals/plugin/plugin.pri (+2/-0)
tests/api/Extinct/Animals/plugin/tarpan.cpp (+59/-0)
tests/api/Extinct/Animals/plugin/tarpan.h (+46/-0)
tests/api/Extinct/Animals/qmldir (+1/-1)
tests/api/components.api (+11/-8)
To merge this branch: bzr merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/internalApiClassName
Reviewer Review Type Date Requested Status
Zsombor Egri Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+280856@code.launchpad.net

Commit message

Include filename derived QML class name in .api

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:1781
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2672/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1397
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1398
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1398/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1396

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2672/rebuild

review: Approve (continuous-integration)
Revision history for this message
Zsombor Egri (zsombi) wrote :

Good to see these, so we can detect whether we screwed up thing or not in the AP tests.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'apicheck/apicheck.cpp'
--- apicheck/apicheck.cpp 2015-12-02 09:22:28 +0000
+++ apicheck/apicheck.cpp 2015-12-18 15:28:54 +0000
@@ -484,6 +484,10 @@
484 writeMetaContent(&object, mainMeta, &knownAttributes);484 writeMetaContent(&object, mainMeta, &knownAttributes);
485485
486 object["namespace"] = nameSpace;486 object["namespace"] = nameSpace;
487 // The QML class name derived from the filename is used by AP.
488 QString className(QFileInfo(filename).baseName());
489 if (typeName != className)
490 object["className"] = className;
487 json->insert(id, object);491 json->insert(id, object);
488 }492 }
489493
@@ -552,6 +556,10 @@
552 return;556 return;
553 }557 }
554558
559 // The C++ class is used by AP.
560 QString className(meta->className());
561 if (!(isSingleton || isUncreatable || exportStrings.empty()))
562 object["className"] = className;
555 json->insert(id, object);563 json->insert(id, object);
556 }564 }
557565
@@ -1102,6 +1110,8 @@
1102 QString signature(exports);1110 QString signature(exports);
1103 if (object.contains("namespace"))1111 if (object.contains("namespace"))
1104 signature = object.take("namespace").toString() + "." + signature;1112 signature = object.take("namespace").toString() + "." + signature;
1113 if (object.contains("className"))
1114 signature += " " + object.take("className").toString();
1105 QString prototype(object.take("prototype").toString());1115 QString prototype(object.take("prototype").toString());
1106 if (!prototype.isEmpty())1116 if (!prototype.isEmpty())
1107 signature += ": " + convertToId(prototype);1117 signature += ": " + convertToId(prototype);
11081118
=== modified file 'components.api'
--- components.api 2015-12-17 13:48:23 +0000
+++ components.api 2015-12-18 15:28:54 +0000
@@ -3,12 +3,12 @@
3 signal clicked()3 signal clicked()
4 signal pressAndHold()4 signal pressAndHold()
5 property bool pressed5 property bool pressed
6Ubuntu.Components.AbstractButton 1.3: ActionItem6Ubuntu.Components.AbstractButton 1.3 UCAbstractButton: ActionItem
7 readonly property bool hovered7 readonly property bool hovered
8 signal clicked()8 signal clicked()
9 signal pressAndHold()9 signal pressAndHold()
10 readonly property bool pressed10 readonly property bool pressed
11Ubuntu.Components.Action 1.3 1.0 0.1: QtObject11Ubuntu.Components.Action 1.3 1.0 0.1 UCAction: QtObject
12 property string description12 property string description
13 property bool enabled13 property bool enabled
14 property string iconName14 property string iconName
@@ -40,12 +40,12 @@
40 property string overflowIconName40 property string overflowIconName
41 property url overflowIconSource41 property url overflowIconSource
42 property string overflowText42 property string overflowText
43Ubuntu.Components.ActionContext 1.0 0.1: QtObject43Ubuntu.Components.ActionContext 1.0 0.1 UCActionContext: QtObject
44 default property list<Action> actions44 default property list<Action> actions
45 property bool active45 property bool active
46 function addAction(Action action)46 function addAction(Action action)
47 function removeAction(Action action)47 function removeAction(Action action)
48Ubuntu.Components.ActionItem 1.0 0.1: StyledItem48Ubuntu.Components.ActionItem 1.0 0.1 UCActionItem: StyledItem
49 property Action action49 property Action action
50 property string iconName50 property string iconName
51 property url iconSource51 property url iconSource
@@ -59,7 +59,7 @@
59Ubuntu.Components.ActionList 1.3: QtObject59Ubuntu.Components.ActionList 1.3: QtObject
60 property list<Action> actions60 property list<Action> actions
61 default property list<Action> children61 default property list<Action> children
62Ubuntu.Components.ActionManager 1.0 0.1: QtObject62Ubuntu.Components.ActionManager 1.0 0.1 UCActionManager: QtObject
63 default property list<Action> actions63 default property list<Action> actions
64 readonly property ActionContext globalContext64 readonly property ActionContext globalContext
65 property list<ActionContext> localContexts65 property list<ActionContext> localContexts
@@ -90,7 +90,7 @@
90 function var removePages(var page)90 function var removePages(var page)
91 property Page primaryPage91 property Page primaryPage
92 property var primaryPageSource92 property var primaryPageSource
93Ubuntu.Components.Alarm 1.0 0.1: QtObject93Ubuntu.Components.Alarm 1.0 0.1 UCAlarm: QtObject
94 property QDateTime date94 property QDateTime date
95 property DaysOfWeek daysOfWeek95 property DaysOfWeek daysOfWeek
96 property bool enabled96 property bool enabled
@@ -144,17 +144,17 @@
144 Fail144 Fail
145 InProgress145 InProgress
146 Ready146 Ready
147Ubuntu.Components.AlarmModel 1.0 0.1: QAbstractListModel147Ubuntu.Components.AlarmModel 1.0 0.1 UCAlarmModel: QAbstractListModel
148 readonly property int count148 readonly property int count
149 function refresh() 1.0149 function refresh() 1.0
150 function UCAlarm* get(int index)150 function UCAlarm* get(int index)
151Ubuntu.Components.Argument 1.0 0.1: QtObject151Ubuntu.Components.Argument 1.0 0.1 UCArgument: QtObject
152 property string help152 property string help
153 function var at(int i)153 function var at(int i)
154 property string name154 property string name
155 property bool required155 property bool required
156 property QStringList valueNames156 property QStringList valueNames
157Ubuntu.Components.Arguments 1.0 0.1: QtObject157Ubuntu.Components.Arguments 1.0 0.1 UCArguments: QtObject
158 default property list<Argument> arguments158 default property list<Argument> arguments
159 property Argument defaultArgument159 property Argument defaultArgument
160 readonly property bool error160 readonly property bool error
@@ -175,7 +175,7 @@
175 property var icon175 property var icon
176 property bool iconFrame176 property bool iconFrame
177 property bool progression177 property bool progression
178Ubuntu.Components.BottomEdge 1.3: StyledItem178Ubuntu.Components.BottomEdge 1.3 UCBottomEdge: StyledItem
179 readonly property BottomEdgeRegion activeRegion179 readonly property BottomEdgeRegion activeRegion
180 property Component contentComponent180 property Component contentComponent
181 readonly property Item contentItem181 readonly property Item contentItem
@@ -205,7 +205,7 @@
205 Committed205 Committed
206 Hidden206 Hidden
207 Revealed207 Revealed
208Ubuntu.Components.BottomEdgeHint 1.3: ActionItem208Ubuntu.Components.BottomEdgeHint 1.3 UCBottomEdgeHint: ActionItem
209 property int deactivateTimeout209 property int deactivateTimeout
210 property Flickable flickable210 property Flickable flickable
211 signal clicked()211 signal clicked()
@@ -216,7 +216,7 @@
216 Hidden216 Hidden
217 Inactive217 Inactive
218 Locked218 Locked
219Ubuntu.Components.BottomEdgeRegion 1.3: QtObject219Ubuntu.Components.BottomEdgeRegion 1.3 UCBottomEdgeRegion: QtObject
220 property Component contentComponent220 property Component contentComponent
221 property url contentUrl221 property url contentUrl
222 property bool enabled222 property bool enabled
@@ -225,7 +225,7 @@
225 signal exited()225 signal exited()
226 signal dragEnded()226 signal dragEnded()
227 property double to227 property double to
228Ubuntu.Components.Styles.BottomEdgeStyle 1.3: Item228Ubuntu.Components.Styles.BottomEdgeStyle 1.3 UCBottomEdgeStyle: Item
229 property Item contentItem229 property Item contentItem
230 property Item panel230 property Item panel
231 property Animation panelAnimation231 property Animation panelAnimation
@@ -299,22 +299,22 @@
299Ubuntu.Components.Popups.ComposerSheet 1.3: SheetBase299Ubuntu.Components.Popups.ComposerSheet 1.3: SheetBase
300 signal cancelClicked()300 signal cancelClicked()
301 signal confirmClicked()301 signal confirmClicked()
302Ubuntu.Layouts.ConditionalLayout 1.0 0.1: QtObject302Ubuntu.Layouts.ConditionalLayout 1.0 0.1 ULConditionalLayout: QtObject
303 default property Component layout303 default property Component layout
304 property string name304 property string name
305 property QQmlBinding when305 property QQmlBinding when
306Ubuntu.PerformanceMetrics.CpuUsage 1.0 0.1: Item306Ubuntu.PerformanceMetrics.CpuUsage 1.0 0.1 UPMCpuUsage: Item
307 readonly property UPMGraphModel graphModel307 readonly property UPMGraphModel graphModel
308 property int period308 property int period
309 property int samplingInterval309 property int samplingInterval
310Ubuntu.Components.CrossFadeImage 1.0 0.1: Item310Ubuntu.Components.CrossFadeImage 1.0 0.1 CrossFadeImage10: Item
311 property int fadeDuration311 property int fadeDuration
312 property int fillMode312 property int fillMode
313 readonly property bool running313 readonly property bool running
314 property url source314 property url source
315 property QSizeF sourceSize315 property QSizeF sourceSize
316 readonly property int status316 readonly property int status
317Ubuntu.Components.CrossFadeImage 1.1: Item317Ubuntu.Components.CrossFadeImage 1.1 CrossFadeImage11: Item
318 property int fadeDuration318 property int fadeDuration
319 property string fadeStyle319 property string fadeStyle
320 property int fillMode320 property int fillMode
@@ -468,7 +468,7 @@
468 readonly property bool enabled468 readonly property bool enabled
469 function play(var customEffect)469 function play(var customEffect)
470 function play()470 function play()
471Ubuntu.Components.ListItems.Header 1.0 0.1: Item471Ubuntu.Components.ListItems.Header 1.0 0.1 ListItemHeader: Item
472 property string text472 property string text
473Ubuntu.Components.Header 1.0 0.1: AppHeader473Ubuntu.Components.Header 1.0 0.1: AppHeader
474 property string _for_autopilot474 property string _for_autopilot
@@ -486,9 +486,9 @@
486 property var tabsModel486 property var tabsModel
487 property string title487 property string title
488 property bool useDeprecatedToolbar488 property bool useDeprecatedToolbar
489Ubuntu.Components.ListItems.Header 1.3: Item489Ubuntu.Components.ListItems.Header 1.3 ListItemHeader: Item
490 property string text490 property string text
491Ubuntu.Components.Header 1.3: StyledItem491Ubuntu.Components.Header 1.3 UCHeader: StyledItem
492 property bool exposed492 property bool exposed
493 property Flickable flickable493 property Flickable flickable
494 readonly property bool moving494 readonly property bool moving
@@ -498,12 +498,12 @@
498 property string name498 property string name
499Ubuntu.Components.Icon 1.1: Icon499Ubuntu.Components.Icon 1.1: Icon
500 property url source500 property url source
501Ubuntu.Components.InverseMouse 1.0 0.1: Mouse501Ubuntu.Components.InverseMouse 1.0 0.1 UCInverseMouse: Mouse
502Ubuntu.Components.InverseMouseArea 1.0 0.1: MouseArea502Ubuntu.Components.InverseMouseArea 1.0 0.1 InverseMouseAreaType: MouseArea
503 function bool contains(QPointF point)503 function bool contains(QPointF point)
504 property Item sensingArea504 property Item sensingArea
505 property bool topmostItem505 property bool topmostItem
506Ubuntu.Layouts.ItemLayout 1.0 0.1: Item506Ubuntu.Layouts.ItemLayout 1.0 0.1 ULItemLayout: Item
507 property string item507 property string item
508Ubuntu.Components.ListItems.ItemSelector 1.0 0.1: Empty508Ubuntu.Components.ListItems.ItemSelector 1.0 0.1: Empty
509 property bool colourImage509 property bool colourImage
@@ -531,7 +531,7 @@
531 property int selectedIndex531 property int selectedIndex
532Ubuntu.Components.Label 1.0 0.1: Text532Ubuntu.Components.Label 1.0 0.1: Text
533 property string fontSize533 property string fontSize
534Ubuntu.Components.Label 1.3: Text534Ubuntu.Components.Label 1.3 UCLabel: Text
535 property string fontSize535 property string fontSize
536 property TextSize textSize536 property TextSize textSize
537Ubuntu.Components.Label.TextSize: Enum537Ubuntu.Components.Label.TextSize: Enum
@@ -541,10 +541,10 @@
541 XLarge541 XLarge
542 XSmall542 XSmall
543 XxSmall543 XxSmall
544Ubuntu.Layouts.Layouts 1.0 0.1: Item544Ubuntu.Layouts.Layouts 1.0 0.1 ULLayouts: Item
545 readonly property string currentLayout545 readonly property string currentLayout
546 property list<ConditionalLayout> layouts546 property list<ConditionalLayout> layouts
547Ubuntu.Components.ListItem 1.3 1.2: StyledItem547Ubuntu.Components.ListItem 1.3 1.2 UCListItem: StyledItem
548 property Action action548 property Action action
549 property color color549 property color color
550 readonly property Item contentItem550 readonly property Item contentItem
@@ -567,7 +567,7 @@
567 property bool swipeEnabled 1.3567 property bool swipeEnabled 1.3
568 readonly property bool swiped 1.3568 readonly property bool swiped 1.3
569 property ListItemActions trailingActions569 property ListItemActions trailingActions
570Ubuntu.Components.ListItemActions 1.2: QtObject570Ubuntu.Components.ListItemActions 1.2 UCListItemActions: QtObject
571 property list<Action> actions571 property list<Action> actions
572 default property list<QtObject> data572 default property list<QtObject> data
573 property Component delegate573 property Component delegate
@@ -582,11 +582,11 @@
582 Dropped582 Dropped
583 Moving583 Moving
584 Started584 Started
585Ubuntu.Components.ListItemLayout 1.3: SlotsLayout585Ubuntu.Components.ListItemLayout 1.3 UCListItemLayout: SlotsLayout
586 readonly property Label subtitle586 readonly property Label subtitle
587 readonly property Label summary587 readonly property Label summary
588 readonly property Label title588 readonly property Label title
589Ubuntu.Components.Styles.ListItemStyle 1.3 1.2: Item589Ubuntu.Components.Styles.ListItemStyle 1.3 1.2 UCListItemStyle: Item
590 readonly property bool animatePanels590 readonly property bool animatePanels
591 property Item dragPanel591 property Item dragPanel
592 property PropertyAnimation dropAnimation592 property PropertyAnimation dropAnimation
@@ -595,7 +595,7 @@
595 function swipeEvent(SwipeEvent event)595 function swipeEvent(SwipeEvent event)
596 function rebound()596 function rebound()
597 property Animation snapAnimation597 property Animation snapAnimation
598Ubuntu.Components.LiveTimer 1.3: QtObject598Ubuntu.Components.LiveTimer 1.3 LiveTimer: QtObject
599 property Frequency frequency599 property Frequency frequency
600 signal trigger()600 signal trigger()
601 property QDateTime relativeTime601 property QDateTime relativeTime
@@ -609,7 +609,7 @@
609 property bool automaticOrientation609 property bool automaticOrientation
610 default property list<QtObject> contentsItem610 default property list<QtObject> contentsItem
611 property bool useDeprecatedToolbar611 property bool useDeprecatedToolbar
612Ubuntu.Components.MainView 1.2: MainViewBase612Ubuntu.Components.MainView 1.2 MainView12: MainViewBase
613 property bool automaticOrientation613 property bool automaticOrientation
614 default property list<QtObject> contentsItem614 default property list<QtObject> contentsItem
615Ubuntu.Components.MainView 1.3: MainViewBase615Ubuntu.Components.MainView 1.3: MainViewBase
@@ -620,14 +620,14 @@
620 function double lerp(double delta, double from, double to)620 function double lerp(double delta, double from, double to)
621 function double projectValue(double x, double xmin, double xmax, double ymin, double ymax)621 function double projectValue(double x, double xmin, double xmax, double ymin, double ymax)
622 function double clampAndProject(double x, double xmin, double xmax, double ymin, double ymax)622 function double clampAndProject(double x, double xmin, double xmax, double ymin, double ymax)
623Ubuntu.Components.MimeData 1.0 0.1: QtObject623Ubuntu.Components.MimeData 1.0 0.1 QQuickMimeData: QtObject
624 property color color624 property color color
625 property var data625 property var data
626 readonly property QStringList formats626 readonly property QStringList formats
627 property string html627 property string html
628 property string text628 property string text
629 property list<url> urls629 property list<url> urls
630Ubuntu.Components.Mouse 1.0 0.1: QtObject630Ubuntu.Components.Mouse 1.0 0.1 UCMouse: QtObject
631 readonly property Qt.MouseButtons acceptedButtons631 readonly property Qt.MouseButtons acceptedButtons
632 property int clickAndHoldThreshold632 property int clickAndHoldThreshold
633 property bool enabled633 property bool enabled
@@ -707,12 +707,12 @@
707 property int orientationAngle707 property int orientationAngle
708 readonly property bool rotating708 readonly property bool rotating
709 property bool transitionEnabled709 property bool transitionEnabled
710Ubuntu.Components.Page 1.0 0.1: PageTreeNode710Ubuntu.Components.Page 1.0 0.1 Page10: PageTreeNode
711 property list<Action> actions711 property list<Action> actions
712 property Flickable flickable712 property Flickable flickable
713 property string title713 property string title
714 property Item tools714 property Item tools
715Ubuntu.Components.Page 1.1: Page10715Ubuntu.Components.Page 1.1 Page11: Page10
716 readonly property PageHeadConfiguration head716 readonly property PageHeadConfiguration head
717Ubuntu.Components.Page 1.3: PageTreeNode717Ubuntu.Components.Page 1.3: PageTreeNode
718 property Flickable flickable718 property Flickable flickable
@@ -810,7 +810,7 @@
810 function var push(var page, var properties)810 function var push(var page, var properties)
811 function var pop()811 function var pop()
812 function var clear()812 function var clear()
813Ubuntu.Components.PageTreeNode 1.3: StyledItem813Ubuntu.Components.PageTreeNode 1.3 UCPageTreeNode: StyledItem
814 property bool active814 property bool active
815 readonly property Item activeLeafNode815 readonly property Item activeLeafNode
816 property bool isLeaf816 property bool isLeaf
@@ -965,7 +965,7 @@
965 property double value965 property double value
966Ubuntu.Components.ProgressionSlot 1.3: Icon966Ubuntu.Components.ProgressionSlot 1.3: Icon
967 property url source967 property url source
968Ubuntu.Components.ProportionalShape 1.3: UbuntuShape968Ubuntu.Components.ProportionalShape 1.3 UCProportionalShape: UbuntuShape
969Ubuntu.Components.PullToRefresh 1.1: StyledItem969Ubuntu.Components.PullToRefresh 1.1: StyledItem
970 property Component content970 property Component content
971 signal refresh()971 signal refresh()
@@ -984,7 +984,7 @@
984 property double activationThreshold984 property double activationThreshold
985 property Component defaultContent985 property Component defaultContent
986 property bool releaseToRefresh986 property bool releaseToRefresh
987Ubuntu.PerformanceMetrics.RenderingTimes 1.0 0.1: Item987Ubuntu.PerformanceMetrics.RenderingTimes 1.0 0.1 UPMRenderingTimes: Item
988 readonly property UPMGraphModel graphModel988 readonly property UPMGraphModel graphModel
989 signal frameRendered(qlonglong renderTime)989 signal frameRendered(qlonglong renderTime)
990 property int period990 property int period
@@ -1004,7 +1004,7 @@
1004 property list<Action> actions1004 property list<Action> actions
1005 property var model1005 property var model
1006 property int selectedIndex1006 property int selectedIndex
1007Ubuntu.Components.ServiceProperties 1.1: QtObject1007Ubuntu.Components.ServiceProperties 1.1 UCServiceProperties: QtObject
1008 property string adaptorInterface 1.11008 property string adaptorInterface 1.1
1009 readonly property string error 1.11009 readonly property string error 1.1
1010 property string path 1.11010 property string path 1.1
@@ -1062,7 +1062,7 @@
1062 property bool overrideVerticalPositioning1062 property bool overrideVerticalPositioning
1063 readonly property SlotsLayoutPadding padding1063 readonly property SlotsLayoutPadding padding
1064 property SlotsLayout.UCSlotPosition position1064 property SlotsLayout.UCSlotPosition position
1065Ubuntu.Components.SlotsLayout 1.3: Item1065Ubuntu.Components.SlotsLayout 1.3 UCSlotsLayout: Item
1066 property Item mainSlot1066 property Item mainSlot
1067 readonly property SlotsLayoutPadding padding1067 readonly property SlotsLayoutPadding padding
1068Ubuntu.Components.SlotsLayout.UCSlotPosition: Enum1068Ubuntu.Components.SlotsLayout.UCSlotPosition: Enum
@@ -1078,7 +1078,7 @@
1078Ubuntu.Components.SortBehavior 1.1: QtObject1078Ubuntu.Components.SortBehavior 1.1: QtObject
1079 property Qt.SortOrder order1079 property Qt.SortOrder order
1080 property string property1080 property string property
1081Ubuntu.Components.SortFilterModel 1.1: QSortFilterProxyModel1081Ubuntu.Components.SortFilterModel 1.1 QSortFilterProxyModelQML: QSortFilterProxyModel
1082 readonly property int count1082 readonly property int count
1083 readonly property FilterBehavior filter1083 readonly property FilterBehavior filter
1084 function QVariantMap get(int row)1084 function QVariantMap get(int row)
@@ -1099,10 +1099,10 @@
1099 property var icon1099 property var icon
1100 property bool iconFrame1100 property bool iconFrame
1101 property bool progression1101 property bool progression
1102Ubuntu.Components.StateSaver 1.0 0.1: QtObject1102Ubuntu.Components.StateSaver 1.0 0.1 UCStateSaver: QtObject
1103Ubuntu.Components.StyleHints 1.3: QtObject1103Ubuntu.Components.StyleHints 1.3 UCStyleHints: QtObject
1104 property bool ignoreUnknownProperties1104 property bool ignoreUnknownProperties
1105Ubuntu.Components.StyledItem 1.3 1.3 1.1 1.0 0.1: Item1105Ubuntu.Components.StyledItem 1.3 1.3 1.1 1.0 0.1 UCStyledItemBase: Item
1106 property bool activeFocusOnPress 1.31106 property bool activeFocusOnPress 1.3
1107 readonly property bool keyNavigationFocus 1.31107 readonly property bool keyNavigationFocus 1.3
1108 signal activeFocusOnTabChanged2() 1.31108 signal activeFocusOnTabChanged2() 1.3
@@ -1115,7 +1115,7 @@
1115 property string subText1115 property string subText
1116Ubuntu.Components.ListItems.Subtitled 1.3: Base1116Ubuntu.Components.ListItems.Subtitled 1.3: Base
1117 property string subText1117 property string subText
1118Ubuntu.Components.SwipeArea 1.3: Item1118Ubuntu.Components.SwipeArea 1.3 UCSwipeArea: Item
1119 property Direction direction1119 property Direction direction
1120 readonly property double distance1120 readonly property double distance
1121 readonly property bool dragging1121 readonly property bool dragging
@@ -1447,9 +1447,9 @@
1447 readonly property int selectionStart1447 readonly property int selectionStart
1448 property QValidator validator1448 property QValidator validator
1449 property int verticalAlignment1449 property int verticalAlignment
1450Ubuntu.PerformanceMetrics.TextureFromImage 1.0 0.1: Item1450Ubuntu.PerformanceMetrics.TextureFromImage 1.0 0.1 UPMTextureFromImage: Item
1451 property QImage image1451 property QImage image
1452Ubuntu.Components.ThemeSettings 1.3: QtObject1452Ubuntu.Components.ThemeSettings 1.3 UCTheme: QtObject
1453 property string name1453 property string name
1454 property QtObject palette1454 property QtObject palette
1455 readonly property ThemeSettings parentTheme1455 readonly property ThemeSettings parentTheme
@@ -1559,14 +1559,14 @@
1559 readonly property color warmGrey1559 readonly property color warmGrey
1560Ubuntu.Components.UbuntuListView 1.0 0.1: ListView1560Ubuntu.Components.UbuntuListView 1.0 0.1: ListView
1561 property int expandedIndex1561 property int expandedIndex
1562Ubuntu.Components.UbuntuListView 1.1: UbuntuListView1562Ubuntu.Components.UbuntuListView 1.1 UbuntuListView11: UbuntuListView
1563 readonly property PullToRefresh pullToRefresh1563 readonly property PullToRefresh pullToRefresh
1564Ubuntu.Components.UbuntuListView 1.3: ListView1564Ubuntu.Components.UbuntuListView 1.3: ListView
1565 property int expandedIndex1565 property int expandedIndex
1566 readonly property PullToRefresh pullToRefresh1566 readonly property PullToRefresh pullToRefresh
1567Ubuntu.Components.UbuntuNumberAnimation 1.0 0.1: PropertyAnimation1567Ubuntu.Components.UbuntuNumberAnimation 1.0 0.1: PropertyAnimation
1568Ubuntu.Components.UbuntuNumberAnimation 1.3: PropertyAnimation1568Ubuntu.Components.UbuntuNumberAnimation 1.3: PropertyAnimation
1569Ubuntu.Components.UbuntuShape 1.3 1.2 1.0 0.1 Shape 1.0 0.1: Item1569Ubuntu.Components.UbuntuShape 1.3 1.2 1.0 0.1 Shape 1.0 0.1 UCUbuntuShape: Item
1570 property Aspect aspect 1.31570 property Aspect aspect 1.3
1571 property color backgroundColor 1.31571 property color backgroundColor 1.3
1572 property BackgroundMode backgroundMode 1.31572 property BackgroundMode backgroundMode 1.3
@@ -1612,7 +1612,7 @@
1612Ubuntu.Components.UbuntuShape.WrapMode: Enum1612Ubuntu.Components.UbuntuShape.WrapMode: Enum
1613 Repeat1613 Repeat
1614 Transparent1614 Transparent
1615Ubuntu.Components.UbuntuShapeOverlay 1.2: UbuntuShape1615Ubuntu.Components.UbuntuShapeOverlay 1.2 UCUbuntuShapeOverlay: UbuntuShape
1616 property color overlayColor1616 property color overlayColor
1617 property QRectF overlayRect1617 property QRectF overlayRect
1618Ubuntu.Test.UbuntuTestCase 1.0 0.1: TestCase1618Ubuntu.Test.UbuntuTestCase 1.0 0.1: TestCase
16191619
=== modified file 'tests/api/Extinct/Animals/AnimalModule.pro'
--- tests/api/Extinct/Animals/AnimalModule.pro 2015-11-30 15:39:52 +0000
+++ tests/api/Extinct/Animals/AnimalModule.pro 2015-12-18 15:28:54 +0000
@@ -8,7 +8,7 @@
8QML_FILES += \8QML_FILES += \
9 Andrewsarchus.qml \9 Andrewsarchus.qml \
10 Paratriisodon.qml \10 Paratriisodon.qml \
11 gigantophis.qml \11 Gigantophis.qml \
12 test.qml \12 test.qml \
13 digger.js \13 digger.js \
1414
1515
=== renamed file 'tests/api/Extinct/Animals/gigantophis.qml' => 'tests/api/Extinct/Animals/Gigantophis.qml'
=== modified file 'tests/api/Extinct/Animals/plugin/plugin.cpp'
--- tests/api/Extinct/Animals/plugin/plugin.cpp 2015-12-11 10:38:46 +0000
+++ tests/api/Extinct/Animals/plugin/plugin.cpp 2015-12-18 15:28:54 +0000
@@ -17,6 +17,7 @@
17 */17 */
1818
19#include "plugin.h"19#include "plugin.h"
20#include "tarpan.h"
20#include "smilodon.h"21#include "smilodon.h"
21#include "pangaea.h"22#include "pangaea.h"
22#include "rune.h"23#include "rune.h"
@@ -50,6 +51,7 @@
50{51{
51 Q_ASSERT(uri == QLatin1String("Extinct.Animals"));52 Q_ASSERT(uri == QLatin1String("Extinct.Animals"));
5253
54 qmlRegisterType<EATarpan>();
53 qmlRegisterType<EASmilodon>(uri, 1, 0, "Smilodon");55 qmlRegisterType<EASmilodon>(uri, 1, 0, "Smilodon");
54 qmlRegisterType<EASmilodon>(uri, 0, 1, "ScimitarCat");56 qmlRegisterType<EASmilodon>(uri, 0, 1, "ScimitarCat");
5557
5658
=== modified file 'tests/api/Extinct/Animals/plugin/plugin.pri'
--- tests/api/Extinct/Animals/plugin/plugin.pri 2015-12-02 09:22:28 +0000
+++ tests/api/Extinct/Animals/plugin/plugin.pri 2015-12-18 15:28:54 +0000
@@ -13,6 +13,7 @@
1313
14HEADERS += \14HEADERS += \
15 $$PWD/plugin.h \15 $$PWD/plugin.h \
16 $$PWD/tarpan.h \
16 $$PWD/smilodon.h \17 $$PWD/smilodon.h \
17 $$PWD/pangaea.h \18 $$PWD/pangaea.h \
18 $$PWD/rune.h \19 $$PWD/rune.h \
@@ -21,6 +22,7 @@
2122
22SOURCES += \23SOURCES += \
23 $$PWD/plugin.cpp \24 $$PWD/plugin.cpp \
25 $$PWD/tarpan.cpp \
24 $$PWD/smilodon.cpp \26 $$PWD/smilodon.cpp \
25 $$PWD/pangaea.cpp \27 $$PWD/pangaea.cpp \
26 $$PWD/rune.cpp \28 $$PWD/rune.cpp \
2729
=== added file 'tests/api/Extinct/Animals/plugin/tarpan.cpp'
--- tests/api/Extinct/Animals/plugin/tarpan.cpp 1970-01-01 00:00:00 +0000
+++ tests/api/Extinct/Animals/plugin/tarpan.cpp 2015-12-18 15:28:54 +0000
@@ -0,0 +1,59 @@
1/*
2 * Copyright 2015 Canonical Ltd.
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU Lesser General Public License as published by
6 * the Free Software Foundation; version 3.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU Lesser General Public License for more details.
12 *
13 * You should have received a copy of the GNU Lesser General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 *
16 * Author: Christian Dywan <christian.dywan@canonical.com>
17 */
18
19#include "tarpan.h"
20
21/*!
22 * \qmltype EATarpan
23 * \instantiates EATarpan
24 * \inqmlmodule Extinct.Animals 1.0
25 * \ingroup ubuntu-commandline
26 * \brief The Tarpan class specifies the behavior of a Eurasian wild horse.
27 */
28
29EATarpan::EATarpan(QObject *parent) :
30 QObject(parent)
31{
32}
33
34/*!
35 * \qmlproperty string EATarpan::name
36 *
37 * Name identifying the wild horse.
38 *
39 */
40QString EATarpan::name() const
41{
42 return m_name;
43}
44
45void EATarpan::setName(const QString &name)
46{
47 m_name = name;
48 Q_EMIT(nameChanged());
49}
50
51/*!
52 * \qmlmethod string EATarpan::kick()
53 *
54 * A generous kick, commonly towards someone's groin area.
55 *
56 */
57void EATarpan::kick() const
58{
59}
060
=== added file 'tests/api/Extinct/Animals/plugin/tarpan.h'
--- tests/api/Extinct/Animals/plugin/tarpan.h 1970-01-01 00:00:00 +0000
+++ tests/api/Extinct/Animals/plugin/tarpan.h 2015-12-18 15:28:54 +0000
@@ -0,0 +1,46 @@
1/*
2 * Copyright 2015 Canonical Ltd.
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU Lesser General Public License as published by
6 * the Free Software Foundation; version 3.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU Lesser General Public License for more details.
12 *
13 * You should have received a copy of the GNU Lesser General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 *
16 * Author: Christian Dywan <christian.dywan@canonical.com>
17 */
18
19#ifndef UCTARPAN_H
20#define UCTARPAN_H
21
22#include <QtCore/QObject>
23#include <QtCore/QString>
24
25class EATarpan : public QObject
26{
27 Q_OBJECT
28
29 Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
30
31public:
32 explicit EATarpan(QObject *parent = 0);
33
34 QString name() const;
35 void setName(const QString &name);
36
37 Q_INVOKABLE void kick() const;
38
39Q_SIGNALS:
40 void nameChanged();
41
42private:
43 QString m_name;
44};
45
46#endif // UCTARPAN_H
047
=== modified file 'tests/api/Extinct/Animals/qmldir'
--- tests/api/Extinct/Animals/qmldir 2015-12-02 09:22:28 +0000
+++ tests/api/Extinct/Animals/qmldir 2015-12-18 15:28:54 +0000
@@ -1,7 +1,7 @@
1module Extinct.Animals1module Extinct.Animals
2plugin ExtinctAnimals2plugin ExtinctAnimals
3Titanoboa 4.2 test.qml3Titanoboa 4.2 test.qml
4Gigantophis 4.3 gigantophis.qml4Gigantophis 4.3 Gigantophis.qml
5internal WoollyMammoth mammoth.qml5internal WoollyMammoth mammoth.qml
6MonsterSnake 3.1 test.qml6MonsterSnake 3.1 test.qml
7Excavator 1.0 digger.js7Excavator 1.0 digger.js
88
=== modified file 'tests/api/components.api'
--- tests/api/components.api 2015-12-11 10:38:46 +0000
+++ tests/api/components.api 2015-12-18 15:28:54 +0000
@@ -1,9 +1,12 @@
1Extinct.Animals.Andrewsarchus 2.0: Item1Extinct.Animals.Andrewsarchus 2.0 Paratriisodon: Item
2 property double saggitalCrestSize2 property double saggitalCrestSize
3 property double skullSize3 property double skullSize
4Extinct.Animals.AndrewsarchusMongoliensis 2.5: Item4Extinct.Animals.AndrewsarchusMongoliensis 2.5 Paratriisodon: Item
5 property double saggitalCrestSize5 property double saggitalCrestSize
6 property double skullSize6 property double skullSize
7EATarpan: QtObject
8 function kick()
9 property string name
7Extinct.Animals.Europe 4.1: QtObject10Extinct.Animals.Europe 4.1: QtObject
8Extinct.Animals.Europe 4.2: Europe11Extinct.Animals.Europe 4.2: Europe
9 readonly property ushort era 4.212 readonly property ushort era 4.2
@@ -23,10 +26,10 @@
23Extinct.Animals.Pangaea.ModernContinent: Enum26Extinct.Animals.Pangaea.ModernContinent: Enum
24 America27 America
25 Europe28 Europe
26Extinct.Animals.Smilodon 1.0 ScimitarCat 0.1: QtObject29Extinct.Animals.Smilodon 1.0 ScimitarCat 0.1 EASmilodon: QtObject
27 function string paw(int i)30 function string paw(int i)
28 property string name31 property string name
29Extinct.Animals.Titanoboa 4.2 MonsterSnake 3.1: Item32Extinct.Animals.Titanoboa 4.2 MonsterSnake 3.1 test: Item
30 property string bar33 property string bar
31 property var basket34 property var basket
32 property url bazz35 property url bazz

Subscribers

People subscribed via source and target branches