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

[Cris Dywan]

Special-case leaked QQuickImageBase properties

[Zsombor Egri (zsombi)]

Looks reasonable change, thanks for it!

review: Approve

[Timo Jyrinki (timo-jyrinki)]

Works, awesome!

https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/landing-012/+sourcepub/5563493/+listing-archive-extra

[Timo Jyrinki (timo-jyrinki)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1694
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2409/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1137
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1139
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1139/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1136

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

review: Approve (continuous-integration)

=== modified file 'components.api'
--- components.api	2015-10-20 16:13:48 +0000
+++ components.api	2015-10-22 11:57:22 +0000
@@ -366,25 +366,7 @@
     property string text
     property string title
 Ubuntu.Components.ListItems.Divider 1.0 0.1: QQuickImageBase
-    property FillMode fillMode
-    property HAlignment horizontalAlignment
-    signal horizontalAlignmentChanged(HAlignment alignment)
-    signal verticalAlignmentChanged(VAlignment alignment)
-    signal mipmapChanged(bool )
-    property bool mipmap
-    readonly property double paintedHeight
-    readonly property double paintedWidth
-    property VAlignment verticalAlignment
 Ubuntu.Components.ListItems.Divider 1.3: QQuickImageBase
-    property FillMode fillMode
-    property HAlignment horizontalAlignment
-    signal horizontalAlignmentChanged(HAlignment alignment)
-    signal verticalAlignmentChanged(VAlignment alignment)
-    signal mipmapChanged(bool )
-    property bool mipmap
-    readonly property double paintedHeight
-    readonly property double paintedWidth
-    property VAlignment verticalAlignment
 Ubuntu.Components.ListItems.Empty 1.0 0.1: AbstractButton
     readonly property Item backgroundIndicator
     property bool confirmRemoval

=== modified file 'tests/apicheck/apicheck.cpp'
--- tests/apicheck/apicheck.cpp	2015-09-01 08:44:11 +0000
+++ tests/apicheck/apicheck.cpp	2015-10-22 11:57:22 +0000
@@ -359,11 +359,17 @@
 
     void writeMetaContent(QJsonObject* object, const QMetaObject *meta, KnownAttributes *knownAttributes = 0)
     {
+        QSet<QString> internalSignals;
         QSet<QString> implicitSignals;
         for (int index = meta->propertyOffset(); index < meta->propertyCount(); ++index) {
             const QMetaProperty &property = meta->property(index);
             const QMetaObject* superClass(meta->superClass());
-            if (!(superClass && superClass->indexOfProperty(property.name()) > -1))
+            // FIXME: Work-around to omit properties from Qt superclasses
+            bool isQtAPI(QString(superClass->className()) == "QQuickImageBase"
+             && QString("autoTransform,fillMode,horizontalAlignment,mipmap,paintedWidth,paintedHeight,verticalAlignment").contains(property.name()));
+            if (isQtAPI)
+                internalSignals.insert(property.notifySignal().name());
+            else if (!(superClass && superClass->indexOfProperty(property.name()) > -1))
                 dump(object, property, knownAttributes);
             if (knownAttributes)
                 knownAttributes->knownMethod(property.notifySignal().name(),
@@ -415,6 +421,8 @@
                 QByteArray methName(meth.name());
                 if (!methName.isEmpty() && methName.endsWith("Changed") && !meth.parameterCount())
                     continue;
+                if (internalSignals.contains(methName))
+                    continue;
                 dump(object, &methods, meta->method(index), implicitSignals, knownAttributes);
             }
         }
@@ -904,7 +912,8 @@
         // Create a component with all QML types to add them to the type system
         QByteArray code = importCode;
         Q_FOREACH(const QString& version, importVersions) {
-            QString pluginAlias(QString("%1.%2").arg(pluginImportUri).arg(version).replace(".", "_"));
+            // First letter must be uppercase
+            QString pluginAlias(QString("A%1.%2").arg(pluginImportUri).arg(version).replace(".", "_"));
             code += QString("import %1 %2 as %3\n").arg(pluginImportUri).arg(version).arg(pluginAlias);
         }
         code += "Item {\n";
@@ -923,6 +932,8 @@
                 std::cerr << "Public QML type " << qPrintable(c.typeName) << " in qmldir has no version!" << std::endl;
                 return EXIT_IMPORTERROR;
             }
+            if (exportedTypes.contains(QFileInfo(c.fileName).fileName()))
+                continue;
             exportedTypes.append(QFileInfo(c.fileName).fileName());
         }