Unity 8

Merge lp:~aacid/unity8/notwohostnames into lp:unity8

  1. notwohostnames
  2. Merge into trunk
Proposed by Albert Astals Cid on 2015-02-20
Status: Merged
Approved by: Michael Terry on 2015-02-20
Approved revision: 1618
Merged at revision: 1633
Proposed branch: lp:~aacid/unity8/notwohostnames
Merge into: lp:unity8
Diff against target: 25 lines (+0/-4)
2 files modified
plugins/LightDM/liblightdm/Greeter.h (+0/-2)
tests/mocks/LightDM/liblightdm/Greeter.h (+0/-2)
To merge this branch: bzr merge lp:~aacid/unity8/notwohostnames
Reviewer Review Type Date Requested Status
Andrea Cimitan (community) Approve on 2015-02-20
Michael Terry 2015-02-20 Approve on 2015-02-20
Review via email: mp+250460@code.launchpad.net

Commit Message

Do not declare the hostname property twice

Description of the Change

 * Are there any related MPs required for this MP to build/function as expected?
No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
No, build-time warning fixing only

 * Did you make sure that your branch does not contain spurious tags?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
N/A

To post a comment you must log in.
Michael Terry (mterry) wrote :

Yup

review: Approve
Andrea Cimitan (cimi) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/LightDM/liblightdm/Greeter.h'
2--- plugins/LightDM/liblightdm/Greeter.h 2015-01-20 11:50:19 +0000
3+++ plugins/LightDM/liblightdm/Greeter.h 2015-02-20 15:32:26 +0000
4@@ -47,8 +47,6 @@
5 Q_PROPERTY(bool hasGuestAccount READ hasGuestAccountHint CONSTANT)
6 Q_PROPERTY(bool locked READ lockHint CONSTANT)
7
8- Q_PROPERTY(QString hostname READ hostname CONSTANT)
9-
10 Q_ENUMS(PromptType MessageType)
11
12 public:
13
14=== modified file 'tests/mocks/LightDM/liblightdm/Greeter.h'
15--- tests/mocks/LightDM/liblightdm/Greeter.h 2015-01-20 11:50:19 +0000
16+++ tests/mocks/LightDM/liblightdm/Greeter.h 2015-02-20 15:32:26 +0000
17@@ -43,8 +43,6 @@
18 Q_PROPERTY(bool hasGuestAccount READ hasGuestAccountHint CONSTANT)
19 Q_PROPERTY(bool locked READ lockHint CONSTANT)
20
21- Q_PROPERTY(QString hostname READ hostname CONSTANT)
22-
23 Q_ENUMS(PromptType MessageType)
24
25 //Mock-only API for testing purposes

Subscribers

People subscribed via source and target branches