Merge lp:~vthompson/ubuntu-weather-app/reboot-remove-cpp-flag into lp:ubuntu-weather-app

[Victor Thompson]

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

* 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.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:86
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/181/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-utopic-amd64-ci/151
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/181

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/181/rebuild

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

LGTM tested via click-buddy and QtC deploying to device.

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-autolanding/84/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-utopic-amd64-autolanding/75/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-autolanding/84/console

review: Needs Fixing (continuous-integration)

[lp:~vthompson/ubuntu-weather-app/reboot-remove-cpp-flag]

87. By Victor Thompson on 2015-08-09

Merge of reboot and resolve conflict

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:87
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/189/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-utopic-amd64-ci/159
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/189

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/189/rebuild

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-08-04 03:01:45 +0000
+++ CMakeLists.txt	2015-08-09 16:08:17 +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 23:50:08 +0000
+++ debian/changelog	2015-08-09 16:08:17 +0000
@@ -12,6 +12,8 @@
   * Rename EmptyStateComponent to HomePageEmptyStateComponent
   * Add a LocationsPageEmptyStateComponent
   * Create autopilot test which removes a single location (LP: #1452499)
+  * 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