Merge lp:~zsombi/ubuntu-ui-toolkit/deprecatedQtFuncs into lp:ubuntu-ui-toolkit/staging

Proposed by Zsombor Egri
Status: Merged
Approved by: Zoltan Balogh
Approved revision: 1729
Merged at revision: 1729
Proposed branch: lp:~zsombi/ubuntu-ui-toolkit/deprecatedQtFuncs
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 21 lines (+6/-0)
2 files modified
features/ubuntu_qml_plugin.prf (+3/-0)
features/ubuntu_qt_module.prf (+3/-0)
To merge this branch: bzr merge lp:~zsombi/ubuntu-ui-toolkit/deprecatedQtFuncs
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Zoltan Balogh Approve
Review via email: mp+278907@code.launchpad.net

Description of the change

Remove build failure on Xenial caused by deprecated Qt functions.

To post a comment you must log in.
Revision history for this message
Zoltan Balogh (bzoltan) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'features/ubuntu_qml_plugin.prf'
2--- features/ubuntu_qml_plugin.prf 2015-11-05 11:00:10 +0000
3+++ features/ubuntu_qml_plugin.prf 2015-11-29 15:35:00 +0000
4@@ -79,3 +79,6 @@
5
6 QMAKE_CXXFLAGS += -Werror
7
8+#do not warn for deprecated declarations
9+QMAKE_CXXFLAGS -= -Werror=deprecated-declarations
10+
11
12=== modified file 'features/ubuntu_qt_module.prf'
13--- features/ubuntu_qt_module.prf 2015-11-05 11:03:03 +0000
14+++ features/ubuntu_qt_module.prf 2015-11-29 15:35:00 +0000
15@@ -17,3 +17,6 @@
16 }
17
18 QMAKE_CXXFLAGS += -Werror
19+
20+#do not warn for deprecated declarations
21+QMAKE_CXXFLAGS -= -Werror=deprecated-declarations

Subscribers

People subscribed via source and target branches