Merge lp:~renatofilho/address-book-app/check-env-var into lp:address-book-app

Proposed by Renato Araujo Oliveira Filho
Status: Merged
Merged at revision: 194
Proposed branch: lp:~renatofilho/address-book-app/check-env-var
Merge into: lp:address-book-app
Diff against target: 38 lines (+3/-3)
3 files modified
src/imports/ContactEdit/ContactDetailSyncTargetEditor.qml (+1/-1)
src/imports/ContactView/ContactDetailSyncTargetView.qml (+1/-1)
src/imports/Ubuntu/Contacts/ContactSimpleListView.qml (+1/-1)
To merge this branch: bzr merge lp:~renatofilho/address-book-app/check-env-var
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Ubuntu Phablet Team Pending
Review via email: mp+220282@code.launchpad.net

Commit message

Check if QTCONTACTS_MANAGER_OVERRIDE was defined.

To post a comment you must log in.
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 'src/imports/ContactEdit/ContactDetailSyncTargetEditor.qml'
2--- src/imports/ContactEdit/ContactDetailSyncTargetEditor.qml 2014-05-06 13:18:07 +0000
3+++ src/imports/ContactEdit/ContactDetailSyncTargetEditor.qml 2014-05-20 14:57:27 +0000
4@@ -58,7 +58,7 @@
5 ContactModel {
6 id: sourceModel
7
8- manager: QTCONTACTS_MANAGER_OVERRIDE && QTCONTACTS_MANAGER_OVERRIDE != "" ? QTCONTACTS_MANAGER_OVERRIDE : "galera"
9+ manager: (typeof(QTCONTACTS_MANAGER_OVERRIDE) !== "undefined") && (QTCONTACTS_MANAGER_OVERRIDE != "") ? QTCONTACTS_MANAGER_OVERRIDE : "galera"
10 filter: DetailFilter {
11 detail: ContactDetail.Type
12 field: Type.TypeField
13
14=== modified file 'src/imports/ContactView/ContactDetailSyncTargetView.qml'
15--- src/imports/ContactView/ContactDetailSyncTargetView.qml 2014-05-06 13:18:07 +0000
16+++ src/imports/ContactView/ContactDetailSyncTargetView.qml 2014-05-20 14:57:27 +0000
17@@ -55,7 +55,7 @@
18 ContactModel {
19 id: sourceModel
20
21- manager: QTCONTACTS_MANAGER_OVERRIDE && QTCONTACTS_MANAGER_OVERRIDE != "" ? QTCONTACTS_MANAGER_OVERRIDE : "galera"
22+ manager: (typeof(QTCONTACTS_MANAGER_OVERRIDE) !== "undefined") && (QTCONTACTS_MANAGER_OVERRIDE != "") ? QTCONTACTS_MANAGER_OVERRIDE : "galera"
23 filter: DetailFilter {
24 detail: ContactDetail.Type
25 field: Type.TypeField
26
27=== modified file 'src/imports/Ubuntu/Contacts/ContactSimpleListView.qml'
28--- src/imports/Ubuntu/Contacts/ContactSimpleListView.qml 2014-05-08 15:45:48 +0000
29+++ src/imports/Ubuntu/Contacts/ContactSimpleListView.qml 2014-05-20 14:57:27 +0000
30@@ -183,7 +183,7 @@
31 This property holds the manager uri of the contact backend engine.
32 By default this is set to "galera"
33 */
34- property string manager: QTCONTACTS_MANAGER_OVERRIDE && QTCONTACTS_MANAGER_OVERRIDE != "" ? QTCONTACTS_MANAGER_OVERRIDE : "galera"
35+ property string manager: (typeof(QTCONTACTS_MANAGER_OVERRIDE) !== "undefined") && (QTCONTACTS_MANAGER_OVERRIDE != "") ? QTCONTACTS_MANAGER_OVERRIDE : "galera"
36
37 /*!
38 This handler is called when any error occurs in the contact model

Subscribers

People subscribed via source and target branches