Ubuntu UI Toolkit

Merge lp:~zsombi/ubuntu-ui-toolkit/fix-qmlapicheck into lp:ubuntu-ui-toolkit/staging

  1. fix-qmlapicheck
  2. Merge into staging
Proposed by Zsombor Egri
Status: Merged
Approved by: Zoltan Balogh
Approved revision: 1239
Merged at revision: 1240
Proposed branch: lp:~zsombi/ubuntu-ui-toolkit/fix-qmlapicheck
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 36 lines (+2/-13)
2 files modified
components.api (+0/-11)
tests/qmlapicheck.sh (+2/-2)
To merge this branch: bzr merge lp:~zsombi/ubuntu-ui-toolkit/fix-qmlapicheck
Reviewer Review Type Date Requested Status
Ubuntu SDK team Pending
Review via email: mp+233458@code.launchpad.net

Commit message

Exclude UbuntuColors dumped erroneously by qmlplugindump as it would be a C++ type.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'components.api'
2--- components.api 2014-09-03 12:12:50 +0000
3+++ components.api 2014-09-05 05:51:30 +0000
4@@ -934,17 +934,6 @@
5 Parameter { name: "singular"; type: "string" }
6 Parameter { name: "plural"; type: "string" }
7 Parameter { name: "n"; type: "int" }
8- prototype: "QObject"
9- name: "UbuntuColors"
10- exports: ["UbuntuColors -1.-1"]
11- Property { name: "orange"; type: "QColor"; isReadonly: true }
12- Property { name: "lightAubergine"; type: "QColor"; isReadonly: true }
13- Property { name: "midAubergine"; type: "QColor"; isReadonly: true }
14- Property { name: "darkAubergine"; type: "QColor"; isReadonly: true }
15- Property { name: "warmGrey"; type: "QColor"; isReadonly: true }
16- Property { name: "coolGrey"; type: "QColor"; isReadonly: true }
17- Property { name: "orangeGradient"; type: "QQuickGradient"; isPointer: true }
18- Property { name: "greyGradient"; type: "QQuickGradient"; isPointer: true }
19 name: "ULConditionalLayout"
20 prototype: "QObject"
21 exports: ["ConditionalLayout 0.1", "ConditionalLayout 1.0"]
22
23=== modified file 'tests/qmlapicheck.sh'
24--- tests/qmlapicheck.sh 2014-09-03 08:17:24 +0000
25+++ tests/qmlapicheck.sh 2014-09-05 05:51:30 +0000
26@@ -31,8 +31,8 @@
27 test $ERRORS = 1 && echo Error: qmlplugindump failed && exit 1
28
29 echo Running QML API check for $QML
30-# Palette gets included in Qt 5.2 qmlplugindump even though it's qml
31-BUILTINS=QQuick,QQml,U1db::,Palette python3 tests/qmlapicheck.py $QML plugins.qmltypes > components.api.new
32+# Palette and UbuntuColors gets included in Qt > 5.2 qmlplugindump even though it's qml
33+BUILTINS=QQuick,QQml,U1db::,Palette,UbuntuColors python3 tests/qmlapicheck.py $QML plugins.qmltypes > components.api.new
34 test $? != 0 && echo Error: qmlapicheck.py failed && exit 1
35
36 echo Verifying the diff between existing and generated API

Subscribers

People subscribed via source and target branches