Merge lp:~ken-vandine/content-hub/abi-fix into lp:content-hub

[Ken VanDine]

reorder virtual functions added with download support, to fix abi compatibility.

reorder virtual functions added with download support, to fix abi compatibility.

[Ken VanDine (ken-vandine)]

Are there any related MPs required for this MP to build/function as expected? Please list.

 * No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)

 * Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?

 * Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/content-hub) on device or emulator?

 * Yes

If you changed the UI, was the change specified/approved by design?

 * No change

If you changed the packaging (debian), did you subscribe a core-dev to this MP?

 * No change

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:99
http://jenkins.qa.ubuntu.com/job/content-hub-ci/148/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-amd64-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-armhf-ci/5
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-armhf-ci/5/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-i386-ci/5

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/148/rebuild

review: Approve (continuous-integration)

[Michael Sheldon (michael-sheldon)]

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?

 * Yes

Did CI run pass? If not, please explain why.

 * Yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?

 * Yes

review: Approve

[Brendan Donegan (brendan-donegan)]

@Ken - can a test be added to cover this case? Wouldn't ABI breakage something that can be statically checked?

review: Needs Information

[Ken VanDine (ken-vandine)]

I don't think this is something we can reliably test from the content-hub package, but we need a way to validate the platform as a whole. I think there is work underway for that, which can check for ABI breakages across the supported platform.

=== modified file 'include/com/ubuntu/content/transfer.h'
--- include/com/ubuntu/content/transfer.h	2014-04-03 12:00:41 +0000
+++ include/com/ubuntu/content/transfer.h	2014-05-21 08:31:42 +0000
@@ -101,7 +101,6 @@
     Q_INVOKABLE virtual bool start();
     Q_INVOKABLE virtual bool abort();
     Q_INVOKABLE virtual bool finalize();
-    Q_INVOKABLE virtual bool download();
     Q_INVOKABLE virtual bool charge(const QVector<Item>& items);
     Q_INVOKABLE virtual QVector<Item> collect();
     Q_INVOKABLE virtual Store store() const;
@@ -109,6 +108,7 @@
     Q_INVOKABLE virtual bool setSelectionType(const SelectionType&);
     Q_INVOKABLE virtual QString downloadId() const;
     Q_INVOKABLE virtual bool setDownloadId(const QString);
+    Q_INVOKABLE virtual bool download();
 
     Q_SIGNAL void stateChanged();
     Q_SIGNAL void storeChanged();