Merge lp:~popey/notes-app/fix-non-starting into lp:notes-app

[Alan Pope 🍺🐧🐱 🦄]

Should fix non-starting notes-app on latest images. Updated to latest Ubuntu Components. Removed old UnityActions reference.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:302
http://jenkins.qa.ubuntu.com/job/notes-app-ci/321/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/273
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-vivid-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-vivid-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/notes-app-vivid-armhf-ci/2/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-vivid-i386-ci/2
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/924
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/748
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23144

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/notes-app-ci/321/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

302. By Alan Pope 🍺🐧🐱 🦄 on 2015-09-08

Fix non-starting on latest images

=== modified file 'NotesApp.qml'
--- NotesApp.qml	2013-10-08 09:52:53 +0000
+++ NotesApp.qml	2015-09-08 16:16:50 +0000
@@ -15,9 +15,8 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
-import Ubuntu.Unity.Action 1.0 as UnityActions
 import NotesApp.Plugins 0.1
 import "Components"
 import "Models"
@@ -30,12 +29,12 @@
     automaticOrientation: true
 
     actions: [
-        UnityActions.Action {
+        Action {
             text: i18n.tr("Add")
             keywords: i18n.tr("Create New Note")
             onTriggered: notesMainWindow.createNewNote()
         },
-        UnityActions.Action {
+        Action {
             text: i18n.tr("Delete")
             keywords: i18n.tr("Trash;Erase Note")
             enabled: noteList.currentIndex !== -1