Merge lp:~osomon/webbrowser-app/new-panel-api into lp:webbrowser-app
- new-panel-api
- Merge into trunk
Status: | Merged |
---|---|
Merge reported by: | Olivier Tilloy |
Merged at revision: | not available |
Proposed branch: | lp:~osomon/webbrowser-app/new-panel-api |
Merge into: | lp:webbrowser-app |
Diff against target: |
46 lines (+5/-5) 1 file modified
src/app/Browser.qml (+5/-5) |
To merge this branch: | bzr merge lp:~osomon/webbrowser-app/new-panel-api |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Needs Fixing | |
Tim Peeters (community) | Approve | ||
Review via email: mp+185222@code.launchpad.net |
Commit message
Use the new Panel API (open() and close() methods instead of setting the value of the 'opened' property).
Description of the change
PS Jenkins bot (ps-jenkins) wrote : | # |
Tim Peeters (tpeeters) wrote : | # |
Code looks good, but it looks as if jenkins uses an UITK version from before the changes that add open() and close() to the Panel.
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:303
http://
Executed test runs:
UNSTABLE: http://
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
UNSTABLE: http://
UNSTABLE: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:303
http://
Executed test runs:
UNSTABLE: http://
FAILURE: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
UNSTABLE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:303
http://
Executed test runs:
UNSTABLE: http://
FAILURE: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
FAILURE: http://
UNSTABLE: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:303
http://
Executed test runs:
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
UNSTABLE: http://
UNSTABLE: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:303
http://
Executed test runs:
UNSTABLE: http://
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
UNSTABLE: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:303
http://
Executed test runs:
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:303
http://
Executed test runs:
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:303
http://
Executed test runs:
FAILURE: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
FAILURE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:303
http://
Executed test runs:
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:303
http://
Executed test runs:
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
ABORTED: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:303
http://
Executed test runs:
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
FAILURE: http://
SUCCESS: http://
deb: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:303
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Autolanding.
More details in the following jenkins job:
http://
Executed test runs:
FAILURE: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
PS Jenkins bot (ps-jenkins) : | # |
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Autolanding.
More details in the following jenkins job:
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Autolanding.
More details in the following jenkins job:
http://
Executed test runs:
UNSTABLE: http://
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
UNSTABLE: http://
Preview Diff
1 | === modified file 'src/app/Browser.qml' |
2 | --- src/app/Browser.qml 2013-08-30 15:07:14 +0000 |
3 | +++ src/app/Browser.qml 2013-09-12 09:14:52 +0000 |
4 | @@ -170,7 +170,7 @@ |
5 | if (currentWebview) { |
6 | currentWebview.forceActiveFocus() |
7 | } |
8 | - panel.item.opened = false |
9 | + panel.item.close() |
10 | } |
11 | } |
12 | |
13 | @@ -198,7 +198,7 @@ |
14 | } |
15 | height: units.gu(8) |
16 | |
17 | - opened: true |
18 | + Component.onCompleted: open() |
19 | onOpenedChanged: { |
20 | if (!opened) { |
21 | Qt.inputMethod.hide() |
22 | @@ -225,13 +225,13 @@ |
23 | onLoadingChanged: { |
24 | if (loading) { |
25 | if (panel.item) { |
26 | - panel.item.opened = true |
27 | + panel.item.open() |
28 | } |
29 | } else if (stopped) { |
30 | stopped = false |
31 | } else if (!addressBar.activeFocus) { |
32 | if (panel.item) { |
33 | - panel.item.opened = false |
34 | + panel.item.close() |
35 | } |
36 | if (currentWebview) { |
37 | currentWebview.forceActiveFocus() |
38 | @@ -386,7 +386,7 @@ |
39 | if (!browser.chromeless) { |
40 | if (!url) { |
41 | panel.chrome.addressBar.forceActiveFocus() |
42 | - panel.item.opened = true |
43 | + panel.item.open() |
44 | } |
45 | } |
46 | } |
FAILED: Continuous integration, rev:303 jenkins. qa.ubuntu. com/job/ webbrowser- app-ci/ 316/ jenkins. qa.ubuntu. com/job/ generic- mediumtests- saucy/3330 jenkins. qa.ubuntu. com/job/ generic- mediumtests- touch/868 jenkins. qa.ubuntu. com/job/ webbrowser- app-saucy- amd64-ci/ 199 jenkins. qa.ubuntu. com/job/ webbrowser- app-saucy- armhf-ci/ 199 jenkins. qa.ubuntu. com/job/ webbrowser- app-saucy- armhf-ci/ 199/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ webbrowser- app-saucy- i386-ci/ 199 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- saucy-i386/ 3338 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- saucy-i386/ 3338/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ generic- mediumtests- runner- saucy/2814 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- saucy-armhf/ 870 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- saucy-armhf/ 870/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ generic- mediumtests- runner- maguro/ 722 jenkins. qa.ubuntu. com/job/ generic- mediumtests- runner- mako/732
http://
Executed test runs:
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
UNSTABLE: http://
UNSTABLE: http://
Click here to trigger a rebuild: s-jenkins: 8080/job/ webbrowser- app-ci/ 316/rebuild
http://