Merge lp:~nick-dedekind/unity8/plugin-qml into lp:unity8

[Nick Dedekind]

Fixed issue importing plugin qml files into qtcreator

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

 * Did you perform an exploratory manual test run of your code change and any related functionality?
yes - plugins still load

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
n/a

 * If you changed the UI, has there been a design review?
n/a

[lp:~nick-dedekind/unity8/plugin-qml]

663. By Nick Dedekind on 2014-01-29

Fixed plugin qml import into qtcreator

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:663
http://jenkins.qa.ubuntu.com/job/unity8-ci/2160/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2715
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2482/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1033/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/682
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/684
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/684/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/682
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2378
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2717
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2717/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2483
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2483/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/4920/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3447

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:663
http://jenkins.qa.ubuntu.com/job/unity8-ci/2278/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3015
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2747/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1149
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/800
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/802
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/802/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/800
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2652
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3017
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3017/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2748
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2748/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5166/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3754

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:663
http://jenkins.qa.ubuntu.com/job/unity8-ci/2280/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3017
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2749
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1151
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/802
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/804
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/804/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/802
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2654
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3019
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3019/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2750
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2750/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5168
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3756

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

review: Approve (continuous-integration)

[Michael Zanetti (mzanetti)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?

Ran QtCreator, made sure files are still in there. Built w/o QtCreator, cmake doesn't get confused by this.

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

looks good.

review: Approve

=== modified file 'cmake/modules/Plugins.cmake'
--- cmake/modules/Plugins.cmake	2013-11-25 17:26:15 +0000
+++ cmake/modules/Plugins.cmake	2014-01-29 18:15:06 +0000
@@ -24,6 +24,7 @@
     add_custom_target(${PLUGIN}-qmlfiles ALL
                         COMMAND cp ${QMLFILES} ${CMAKE_BINARY_DIR}/plugins/${PLUGIN_SUBPATH}
                         DEPENDS ${QMLFILES}
+                        SOURCES ${QMLFILES}
     )
 
     # install the qmlfiles file.