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

[Zsombor Egri]

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

=== modified file 'components.api'
--- components.api	2014-09-03 12:12:50 +0000
+++ components.api	2014-09-05 05:51:30 +0000
@@ -934,17 +934,6 @@
     Parameter { name: "singular"; type: "string" }
     Parameter { name: "plural"; type: "string" }
     Parameter { name: "n"; type: "int" }
-    prototype: "QObject"
-    name: "UbuntuColors"
-    exports: ["UbuntuColors -1.-1"]
-    Property { name: "orange"; type: "QColor"; isReadonly: true }
-    Property { name: "lightAubergine"; type: "QColor"; isReadonly: true }
-    Property { name: "midAubergine"; type: "QColor"; isReadonly: true }
-    Property { name: "darkAubergine"; type: "QColor"; isReadonly: true }
-    Property { name: "warmGrey"; type: "QColor"; isReadonly: true }
-    Property { name: "coolGrey"; type: "QColor"; isReadonly: true }
-    Property { name: "orangeGradient"; type: "QQuickGradient"; isPointer: true }
-    Property { name: "greyGradient"; type: "QQuickGradient"; isPointer: true }
     name: "ULConditionalLayout"
     prototype: "QObject"
     exports: ["ConditionalLayout 0.1", "ConditionalLayout 1.0"]
 
=== modified file 'tests/qmlapicheck.sh'
--- tests/qmlapicheck.sh	2014-09-03 08:17:24 +0000
+++ tests/qmlapicheck.sh	2014-09-05 05:51:30 +0000
@@ -31,8 +31,8 @@
 test $ERRORS = 1 && echo Error: qmlplugindump failed && exit 1
 
 echo Running QML API check for $QML
-# Palette gets included in Qt 5.2 qmlplugindump even though it's qml
-BUILTINS=QQuick,QQml,U1db::,Palette python3 tests/qmlapicheck.py $QML plugins.qmltypes > components.api.new
+# Palette and UbuntuColors gets included in Qt > 5.2 qmlplugindump even though it's qml
+BUILTINS=QQuick,QQml,U1db::,Palette,UbuntuColors python3 tests/qmlapicheck.py $QML plugins.qmltypes > components.api.new
 test $? != 0 && echo Error: qmlapicheck.py failed && exit 1
 
 echo Verifying the diff between existing and generated API