Ubuntu Notes app

Merge lp:~dpm/reminders-app/drop-qtwebkit into lp:reminders-app

  1. drop-qtwebkit
  2. Merge into trunk
Proposed by David Planella
Status: Merged
Approved by: Michael Zanetti
Approved revision: 122
Merged at revision: 121
Proposed branch: lp:~dpm/reminders-app/drop-qtwebkit
Merge into: lp:reminders-app
Diff against target: 25 lines (+0/-5)
2 files modified
src/app/qml/ui/NotePage.qml (+0/-3)
src/app/qml/ui/NoteView.qml (+0/-2)
To merge this branch: bzr merge lp:~dpm/reminders-app/drop-qtwebkit
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Michael Zanetti (community) Approve
Review via email: mp+218560@code.launchpad.net

Commit message

Drop unused imports to QtWebkit

Description of the change

When creating a click package, the click reviewers tools complain on:

Found files that use unsupported QtWebKit (should use UbuntuWebview or Oxide instead): qml/ui/NoteView.qml ,qml/ui/NotePage.qml ,usr/local/share/reminders/qml/ui/NoteView.qml ,usr/local/share/reminders/qml/ui/NotePage.qml

I've initially removed the (unused) imports on NotePage.qml and NoteView.qml.

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:122
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~dpm/reminders-app/drop-qtwebkit/+merge/218560/+edit-commit-message

http://91.189.93.70:8080/job/reminders-app-ci/297/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2476
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/297
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/297

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Michael Zanetti (mzanetti) wrote :

still works.

review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.
https://code.launchpad.net/~dpm/reminders-app/drop-qtwebkit/+merge/218560/+edit-commit-message

review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
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/app/qml/ui/NotePage.qml'
2--- src/app/qml/ui/NotePage.qml 2014-02-18 22:47:45 +0000
3+++ src/app/qml/ui/NotePage.qml 2014-05-07 07:55:26 +0000
4@@ -18,9 +18,6 @@
5
6 import QtQuick 2.0
7 import Ubuntu.Components 0.1
8-import Ubuntu.Components.Extras.Browser 0.1
9-import QtWebKit 3.1
10-import QtWebKit.experimental 1.0
11 import Evernote 0.1
12 import "../components"
13
14
15=== modified file 'src/app/qml/ui/NoteView.qml'
16--- src/app/qml/ui/NoteView.qml 2014-02-18 22:47:45 +0000
17+++ src/app/qml/ui/NoteView.qml 2014-05-07 07:55:26 +0000
18@@ -19,8 +19,6 @@
19 import QtQuick 2.0
20 import Ubuntu.Components 0.1
21 import Ubuntu.Components.Extras.Browser 0.1
22-import QtWebKit 3.1
23-import QtWebKit.experimental 1.0
24 import Evernote 0.1
25 import "../components"
26

Subscribers

People subscribed via source and target branches