ubuntu-touch-coreapps-reviewers team mailing list archive

[Victor Thompson <victor.thompson@xxxxxxxxx>]

Victor Thompson has proposed merging lp:~vthompson/ubuntu-weather-app/reboot-remove-cpp-flag into lp:ubuntu-weather-app/reboot.

Commit message:
* Remove C++ flag from CMakeLists.txt
* Show README files in QtCreator

Requested reviews:
  Ubuntu Weather Developers (ubuntu-weather-dev)

For more details, see:
https://code.launchpad.net/~vthompson/ubuntu-weather-app/reboot-remove-cpp-flag/+merge/267437

* Remove C++ flag from CMakeLists.txt
* Show README files in QtCreator

Please double check that the app still builds OK via the command line and with QtCreator.
-- 
Your team Ubuntu Weather Developers is requested to review the proposed merge of lp:~vthompson/ubuntu-weather-app/reboot-remove-cpp-flag into lp:ubuntu-weather-app/reboot.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-08-04 03:01:45 +0000
+++ CMakeLists.txt	2015-08-08 18:29:25 +0000
@@ -11,7 +11,6 @@
 endif()
 
 set (UBUNTU_MANIFEST_PATH "manifest.json.in" CACHE INTERNAL "Relative path to the manifest file")
-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-permissive -pedantic -Wall -Wextra")
 
 find_package(Qt5Core REQUIRED)
 find_package(Qt5Qml REQUIRED)
@@ -97,5 +96,12 @@
 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_weather_QMLFiles DEPENDS ubuntu-weather-app.qml SOURCES ${QML_JS_FILES})
+	  
 # TODO: Add custom target for autopilot and run.
 

=== modified file 'debian/changelog'
--- debian/changelog	2015-08-07 01:22:44 +0000
+++ debian/changelog	2015-08-08 18:29:25 +0000
@@ -11,6 +11,8 @@
   * Fix the CMakeLists.txt to include the app icon
   * Rename EmptyStateComponent to HomePageEmptyStateComponent
   * Add a LocationsPageEmptyStateComponent
+  * Remove C++ flag from CMakeLists.txt
+  * Show README files in QtCreator
 
   [ Andrew Hayzen ]
   * Add mocked locations for autopilot and add a test using the data