Merge lp:~rpadovani/reminders-app/contentImport into lp:reminders-app

[Riccardo Padovani]

Updated ContentImportHint to ContentTransferHint due new API implementation

Updated ContentImportHint to ContentTransferHint due new API implementation

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:94
http://91.189.93.70:8080/job/reminders-app-ci/239/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1873
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/239
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/239

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/239/rebuild

review: Approve (continuous-integration)

[David Planella (dpm)]

Looks good to me thanks and sorry for the delay in reviewing!

review: Approve

=== modified file 'src/app/qml/ui/EditNoteView.qml'
--- src/app/qml/ui/EditNoteView.qml	2014-02-18 22:58:40 +0000
+++ src/app/qml/ui/EditNoteView.qml	2014-03-26 22:19:07 +0000
@@ -36,8 +36,8 @@
         property var activeTransfer
     }
 
-    ContentImportHint {
-        id: importHint
+    ContentTransferHint {
+        id: transferHint
         anchors.fill: parent
         activeTransfer: root.activeTransfer
     }