← Back to team overview

ubuntu-touch-coreapps-reviewers team mailing list archive

[Merge] lp:~vthompson/music-app/show-all-READMEs into lp:music-app

 

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

Commit message:
* Show all README files in QtCreator

Requested reviews:
  Music App Developers (music-app-dev)

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

* Show all README files in QtCreator
-- 
Your team Music App Developers is requested to review the proposed merge of lp:~vthompson/music-app/show-all-READMEs into lp:music-app.
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-02-03 16:36:03 +0000
+++ CMakeLists.txt	2015-08-08 18:33:12 +0000
@@ -86,6 +86,6 @@
 # make the qml files visible on qtcreator
 file(GLOB QML_JS_FILES
      RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-     *.qml *.js *.translations *.url-dispatcher *.txt)
+     *.qml *.js README* *.url-dispatcher *.txt)
 
 add_custom_target(com_ubuntu_music_QMLFiles DEPENDS music-app.qml SOURCES ${QML_JS_FILES})

=== modified file 'debian/changelog'
--- debian/changelog	2015-08-04 23:44:41 +0000
+++ debian/changelog	2015-08-08 18:33:12 +0000
@@ -4,6 +4,7 @@
   * Fix SongsView album art for albums and genres (LP: #1477366)
   * Fix to allow the LibraryEmptyState to work again (LP: #1478162)
   * Fix typo in README.autopilot and clarify the instructions
+  * Show all README files in QtCreator
 
   [ Andrew Hayzen ]
   * Fix for console errors when using the parent changed helpers


Follow ups