Merge lp:~fboucault/webbrowser-app/no_qmlproject into lp:webbrowser-app

[Florian Boucault]

List all non compiled files in QtCreator via CMake project. No need for .qmlproject anylonger.

[lp:~fboucault/webbrowser-app/no_qmlproject]

624. By Florian Boucault on 2014-07-14

Added python files.

625. By Florian Boucault on 2014-07-14

Added po and qdoc files.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:625
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/941/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1940
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1620
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-amd64-ci/140
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/140
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/140/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-i386-ci/140
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2188
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3052
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3052/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9787
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1356
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1823
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1823/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/941/rebuild

review: Approve (continuous-integration)

[Olivier Tilloy (osomon)]

9 +file(GLOB_RECURSE QML_JS_FILES *.qml *.js *.png *.svg *.py *.pot *.po *.qdoc)

For completeness, can you add *.qdocconf and *.css to the list of patterns?
Also, can you rename QML_JS_FILES to something that reflects better its contents, e.g. NON_COMPILED_SOURCES ?

[Olivier Tilloy (osomon)]

And maybe add *.json to the list of patterns, too.

[Florian Boucault (fboucault)]

Done, thanks.

[lp:~fboucault/webbrowser-app/no_qmlproject]

626. By Florian Boucault on 2014-07-21

Added qdocconf and css files. Renamed variable.

[Olivier Tilloy (osomon)]

Looks good now, thanks!

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-05-30 16:16:56 +0000
+++ CMakeLists.txt	2014-07-21 14:09:17 +0000
@@ -50,6 +50,10 @@
 enable_testing()
 add_subdirectory(tests)
 
+# make non compiled files (QML, JS, images, etc.) visible in QtCreator
+file(GLOB_RECURSE NON_COMPILED_FILES *.qml *.js *.png *.svg *.py *.pot *.po *.qdoc *.qdocconf *.css)
+add_custom_target(NON_COMPILED_TARGET ALL SOURCES ${NON_COMPILED_FILES})
+
 file(GLOB_RECURSE I18N_SRC_FILES
      RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
      src/app/**.qml src/app/**.desktop.in)

=== removed file 'webbrowser-app.qmlproject'
--- webbrowser-app.qmlproject	2014-06-30 10:50:35 +0000
+++ webbrowser-app.qmlproject	1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-import QmlProject 1.1
-
-Project {
-    QmlFiles {}
-
-    JavaScriptFiles {}
-
-    ImageFiles {}
-
-    Files {
-        directory: "."
-        filter: "CMakeLists.txt;README"
-    }
-
-    Files {
-        directory: "src"
-        filter: "*.h;*.h.in;*.cpp;*.desktop.in;qmldir"
-    }
-
-    Files {
-        directory: "tests"
-        filter: "*.h;*.cpp;*.py"
-    }
-
-    Files {
-        directory: "doc"
-        filter: "*.qdoc;*.qdocconf"
-    }
-
-    /* List of plugin directories passed to QML runtime */
-    importPaths: [ "src" ]
-}