ubuntu-touch-coreapps-reviewers team mailing list archive

[Victor Thompson <victor.thompson@xxxxxxxxx>]

Victor Thompson has proposed merging lp:~vthompson/ubuntu-clock-app/clock-show-all-READMEs into lp:ubuntu-clock-app.

Commit message:
* Show all README files in QtCreator

Requested reviews:
  Ubuntu Clock Developers (ubuntu-clock-dev)

For more details, see:
https://code.launchpad.net/~vthompson/ubuntu-clock-app/clock-show-all-READMEs/+merge/267439

* Show all README files in QtCreator
-- 
Your team Ubuntu Clock Developers is requested to review the proposed merge of lp:~vthompson/ubuntu-clock-app/clock-show-all-READMEs into lp:ubuntu-clock-app.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-02-26 21:16:54 +0000
+++ CMakeLists.txt	2015-08-08 18:46:09 +0000
@@ -109,6 +109,13 @@
 add_subdirectory(po)
 add_subdirectory(tests)
 
+# make the qml files visible on qtcreator
+file(GLOB QML_JS_FILES
+     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+     *.qml *.js README* *.txt)
+
+add_custom_target(com_ubuntu_clock_QMLFiles DEPENDS ubuntu-clock-app.qml SOURCES ${QML_JS_FILES})
+
 add_custom_target("autopilot" chmod +x ${CMAKE_SOURCE_DIR}/tests/autopilot/run
                     COMMAND ${CMAKE_SOURCE_DIR}/tests/autopilot/run
                     DEPENDS timezone timezone-qmldir alarmsettings alarmsettings-qmldir datetime datetime-qmldir geolocation geolocation-qmldir

=== modified file 'debian/changelog'
--- debian/changelog	2015-08-04 12:35:51 +0000
+++ debian/changelog	2015-08-08 18:46:09 +0000
@@ -6,6 +6,9 @@
   [Nekhelesh Ramananthan]
   * Increase the height of times in the alarm screen (LP: #1365428)
 
+  [Victor Thompson]
+  * Show all README files in QtCreator
+
  -- Bartosz Kosiorek <gang65@xxxxxxxxxxxxxx>  Fri, 24 Jul 2015 18:05:38 +0200
 
 ubuntu-clock-app (3.4) vivid; urgency=medium