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

[Renato Araujo Oliveira Filho]

Check if QTCONTACTS_MANAGER_OVERRIDE was defined.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:194
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/576/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-amd64-ci/29
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-armhf-ci/29
        deb: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-armhf-ci/29/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-i386-ci/29
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/351
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/306
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/824
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/691
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/691/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/7400
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/272
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/393
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/393/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-app-ci/576/rebuild

review: Approve (continuous-integration)

=== modified file 'src/imports/ContactEdit/ContactDetailSyncTargetEditor.qml'
--- src/imports/ContactEdit/ContactDetailSyncTargetEditor.qml	2014-05-06 13:18:07 +0000
+++ src/imports/ContactEdit/ContactDetailSyncTargetEditor.qml	2014-05-20 14:57:27 +0000
@@ -58,7 +58,7 @@
     ContactModel {
         id: sourceModel
 
-        manager: QTCONTACTS_MANAGER_OVERRIDE && QTCONTACTS_MANAGER_OVERRIDE != "" ? QTCONTACTS_MANAGER_OVERRIDE : "galera"
+        manager: (typeof(QTCONTACTS_MANAGER_OVERRIDE) !== "undefined") && (QTCONTACTS_MANAGER_OVERRIDE != "") ? QTCONTACTS_MANAGER_OVERRIDE : "galera"
         filter:  DetailFilter {
             detail: ContactDetail.Type
             field: Type.TypeField

=== modified file 'src/imports/ContactView/ContactDetailSyncTargetView.qml'
--- src/imports/ContactView/ContactDetailSyncTargetView.qml	2014-05-06 13:18:07 +0000
+++ src/imports/ContactView/ContactDetailSyncTargetView.qml	2014-05-20 14:57:27 +0000
@@ -55,7 +55,7 @@
     ContactModel {
         id: sourceModel
 
-        manager: QTCONTACTS_MANAGER_OVERRIDE && QTCONTACTS_MANAGER_OVERRIDE != "" ? QTCONTACTS_MANAGER_OVERRIDE : "galera"
+        manager: (typeof(QTCONTACTS_MANAGER_OVERRIDE) !== "undefined") && (QTCONTACTS_MANAGER_OVERRIDE != "") ? QTCONTACTS_MANAGER_OVERRIDE : "galera"
         filter:  DetailFilter {
             detail: ContactDetail.Type
             field: Type.TypeField

=== modified file 'src/imports/Ubuntu/Contacts/ContactSimpleListView.qml'
--- src/imports/Ubuntu/Contacts/ContactSimpleListView.qml	2014-05-08 15:45:48 +0000
+++ src/imports/Ubuntu/Contacts/ContactSimpleListView.qml	2014-05-20 14:57:27 +0000
@@ -183,7 +183,7 @@
       This property holds the manager uri of the contact backend engine.
       By default this is set to "galera"
     */
-    property string manager: QTCONTACTS_MANAGER_OVERRIDE && QTCONTACTS_MANAGER_OVERRIDE != "" ? QTCONTACTS_MANAGER_OVERRIDE : "galera"
+    property string manager: (typeof(QTCONTACTS_MANAGER_OVERRIDE) !== "undefined") && (QTCONTACTS_MANAGER_OVERRIDE != "") ? QTCONTACTS_MANAGER_OVERRIDE : "galera"
 
     /*!
       This handler is called when any error occurs in the contact model