Merge lp:~fboucault/ubuntu-calculator-app/noqmlproject into lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk

[Florian Boucault]

Remove the need for a qmlproject by listing all the QML files in CMakeLists.txt

Remove the need for a qmlproject by listing all the QML files in CMakeLists.txt

[Mihir Soni (mihirsoni)]

Looks good to me thanks for the MR.

review: Approve

[Riccardo Padovani (rpadovani)]

lgtm, thanks

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-calculator-app-autolanding/22/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/300
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-calculator-app-utopic-amd64-autolanding/20
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/441
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/493
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12356

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-calculator-app-autolanding/31/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/358/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-calculator-app-utopic-amd64-autolanding/29
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/497/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/562
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12734

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-calculator-app-autolanding/36/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/367
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-calculator-app-utopic-amd64-autolanding/34
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/506
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/574
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12876

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-05-16 20:21:54 +0000
+++ CMakeLists.txt	2014-08-26 20:13:38 +0000
@@ -16,6 +16,10 @@
 set(APP_HARDCODE ubuntu-calculator-app)
 set(MAIN_QML ${APP_HARDCODE}.qml)
 
+# make non compiled files visible in qtcreator
+file(GLOB_RECURSE NON_COMPILED_FILES *.qml *.js *.py *.svg *.png *.in *.json *.desktop *.pot qmldir)
+add_custom_target(NON_COMPILED_TARGET ALL SOURCES ${NON_COMPILED_FILES})
+
 if(CLICK_MODE)
     if(NOT DEFINED BZR_SOURCE)
 		set(BZR_SOURCE "lp:${APP_HARDCODE}")

=== removed file 'ubuntu-calculator-app.qmlproject'
--- ubuntu-calculator-app.qmlproject	2014-06-06 07:31:42 +0000
+++ ubuntu-calculator-app.qmlproject	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-/* File generated by Qt Creator, version 2.6.1 */
-
-import QmlProject 1.1
-
-Project {
-    mainFile: "ubuntu-calculator-app.qml"
-
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* Shows the README files in the project view */
-    Files {
-        filter: "README*"
-    }
-    /* Shows the translation files and the .pot template */
-    Files {
-        filter: "*.po*"
-    }
-    Files {
-        filter: "CMakeLists.txt"
-    }
-    /* Shows the desktop file in the project view */
-    Files {
-        filter: "*.desktop*"
-    }
-    /* List of plugin directories passed to QML runtime */
-    importPaths: [ "." ,"/usr/lib/x86_64-linux-gnu/qt5/qml" ]
-}