Merge lp://staging/~nick-dedekind/qmenumodel/lp1385331.led into lp://staging/qmenumodel

PASSED: Continuous integration, rev:115
http://jenkins.qa.ubuntu.com/job/qmenumodel-ci/54/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qmenumodel-vivid-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qmenumodel-vivid-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/qmenumodel-vivid-armhf-ci/1/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qmenumodel-ci/54/rebuild

FAILED: Continuous integration, rev:116
http://jenkins.qa.ubuntu.com/job/qmenumodel-ci/55/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qmenumodel-vivid-amd64-ci/2/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qmenumodel-vivid-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/qmenumodel-vivid-armhf-ci/2/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qmenumodel-ci/55/rebuild

PASSED: Continuous integration, rev:116
http://jenkins.qa.ubuntu.com/job/qmenumodel-ci/56/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qmenumodel-vivid-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qmenumodel-vivid-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/qmenumodel-vivid-armhf-ci/3/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qmenumodel-ci/56/rebuild

Should we delete m_actionStateParser in m_actionStateParser ?

I meant:

Should we delete m_actionStateParser in setActionStateParser ?

But...

Having a look at how setActionStateParser is used in https://code.launchpad.net/~nick-dedekind/unity8/lp1385331.led/+merge/241417 it seems it should not be deleted, but the code still makes me a bit unhappy since it's the typical structure in which you need to delete m_actionStateParser otherwise you leak the one you created in the constructor.

What about instead this change adding a
  Q_INVOKABLE QVariant actionState(const QString &name, ActionStateParser* actionStateParser);
?

So if it is passed you use it and otherwise you use Converter::toQVariant ?

After reading the code more i see my suggestion is not implementable without a big-ish rework (and maybe not at all) so i'll be happy enough if you add a comment to setActionStateParser saying that the class does not take ownership of actionStateParser

> After reading the code more i see my suggestion is not implementable without a
> big-ish rework (and maybe not at all) so i'll be happy enough if you add a
> comment to setActionStateParser saying that the class does not take ownership
> of actionStateParser

done

Looks good.