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

Proposed by Victor Thompson on 2015-08-08
Status: Merged
Approved by: Andrew Hayzen on 2015-08-09
Approved revision: 87
Merged at revision: 88
Proposed branch: lp:~vthompson/ubuntu-weather-app/reboot-remove-cpp-flag
Merge into: lp:ubuntu-weather-app
Diff against target: 37 lines (+9/-1)
2 files modified
CMakeLists.txt (+7/-1)
debian/changelog (+2/-0)
To merge this branch: bzr merge lp:~vthompson/ubuntu-weather-app/reboot-remove-cpp-flag
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2015-08-09
Andrew Hayzen 2015-08-08 Approve on 2015-08-09
Review via email: mp+267437@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Andrew Hayzen (ahayzen) wrote :

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

review: Approve
87. By Victor Thompson on 2015-08-09

Merge of reboot and resolve conflict

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2015-08-04 03:01:45 +0000
3+++ CMakeLists.txt 2015-08-09 16:08:17 +0000
4@@ -11,7 +11,6 @@
5 endif()
6
7 set (UBUNTU_MANIFEST_PATH "manifest.json.in" CACHE INTERNAL "Relative path to the manifest file")
8-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-permissive -pedantic -Wall -Wextra")
9
10 find_package(Qt5Core REQUIRED)
11 find_package(Qt5Qml REQUIRED)
12@@ -97,5 +96,12 @@
13 add_subdirectory(po)
14 add_subdirectory(tests)
15
16+# make the qml files visible on qtcreator
17+file(GLOB QML_JS_FILES
18+ RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
19+ *.qml *.js README* *.txt)
20+
21+add_custom_target(com_ubuntu_weather_QMLFiles DEPENDS ubuntu-weather-app.qml SOURCES ${QML_JS_FILES})
22+
23 # TODO: Add custom target for autopilot and run.
24
25
26=== modified file 'debian/changelog'
27--- debian/changelog 2015-08-07 23:50:08 +0000
28+++ debian/changelog 2015-08-09 16:08:17 +0000
29@@ -12,6 +12,8 @@
30 * Rename EmptyStateComponent to HomePageEmptyStateComponent
31 * Add a LocationsPageEmptyStateComponent
32 * Create autopilot test which removes a single location (LP: #1452499)
33+ * Remove C++ flag from CMakeLists.txt
34+ * Show README files in QtCreator
35
36 [ Andrew Hayzen ]
37 * Add mocked locations for autopilot and add a test using the data

Subscribers

People subscribed via source and target branches

to all changes: