Merge lp:~zsombi/webbrowser-app/fixToolbarCollision into lp:webbrowser-app

[Zsombor Egri]

Fix local Toolbar collision with UITK 1.3 Toolbar.

[Olivier Tilloy (osomon)]

LGTM.

review: Approve

[Olivier Tilloy (osomon)]

Note: you’re also going to need to add https://code.launchpad.net/~osomon/webbrowser-app/workaround-1526940/+merge/280771 to silo 45 for it to successfully build.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1298
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2546/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5858
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1299/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1299
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1299/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1299/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4515
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5869
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5869/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26188

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

review: Needs Fixing (continuous-integration)

[Zoltan Balogh (bzoltan)]

This made the MR work the browser just as before

http://people.canonical.com/~bzoltan/ap-2015_12_16-VIVID-SILO45-MAKO/ap-2015_12_17-23_08_48-webbrowser_app-1-045.tests

http://people.canonical.com/~bzoltan/ap-2015_12_16-VIVID-SILO45-MAKO/ap-2015_12_17-23_08_48-webbrowser_app-2-045.tests

review: Approve

[Zoltan Balogh (bzoltan)]

And added the MR from Oliver's comment to the landing silo (45)

=== modified file 'src/app/webbrowser/BookmarksView.qml'
--- src/app/webbrowser/BookmarksView.qml	2015-11-12 16:16:45 +0000
+++ src/app/webbrowser/BookmarksView.qml	2015-12-17 20:26:43 +0000
@@ -20,6 +20,7 @@
 import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.3 as ListItems
 import webbrowserapp.private 0.1
+import "." as Local
 
 FocusScope {
     id: bookmarksView
@@ -58,7 +59,7 @@
         }
     }
 
-    Toolbar {
+    Local.Toolbar {
         id: topBar
 
         height: units.gu(7)
@@ -90,7 +91,7 @@
         }
     }
 
-    Toolbar {
+    Local.Toolbar {
         id: toolbar
         height: units.gu(7)
 

=== modified file 'src/app/webbrowser/BookmarksViewWide.qml'
--- src/app/webbrowser/BookmarksViewWide.qml	2015-11-12 16:16:45 +0000
+++ src/app/webbrowser/BookmarksViewWide.qml	2015-12-17 20:26:43 +0000
@@ -20,6 +20,7 @@
 import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.3 as ListItems
 import webbrowserapp.private 0.1
+import "." as Local
 
 FocusScope {
     id: bookmarksViewWide
@@ -56,7 +57,7 @@
         }
     }
 
-    Toolbar {
+    Local.Toolbar {
         id: topBar
 
         height: units.gu(7)
@@ -88,7 +89,7 @@
         }
     }
 
-    Toolbar {
+    Local.Toolbar {
         id: toolbar
         height: units.gu(7)
 

=== modified file 'src/app/webbrowser/Browser.qml'
--- src/app/webbrowser/Browser.qml	2015-12-04 11:06:47 +0000
+++ src/app/webbrowser/Browser.qml	2015-12-17 20:26:43 +0000
@@ -28,6 +28,7 @@
 import "../UrlUtils.js" as UrlUtils
 import ".."
 import "."
+import "." as Local
 
 BrowserView {
     id: browser
@@ -365,7 +366,7 @@
             onTabClosed: internal.closeTab(index)
         }
 
-        Toolbar {
+        Local.Toolbar {
             id: recentToolbar
             objectName: "recentToolbar"
 

=== modified file 'src/app/webbrowser/HistoryView.qml'
--- src/app/webbrowser/HistoryView.qml	2015-11-23 09:41:48 +0000
+++ src/app/webbrowser/HistoryView.qml	2015-12-17 20:26:43 +0000
@@ -20,6 +20,7 @@
 import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.3 as ListItems
 import webbrowserapp.private 0.1
+import "." as Local
 
 Item {
     id: historyView
@@ -94,7 +95,7 @@
         }
     }
 
-    Toolbar {
+    Local.Toolbar {
         id: toolbar
         height: units.gu(7)
 
@@ -137,7 +138,7 @@
         }
     }
 
-    Toolbar {
+    Local.Toolbar {
         id: topBar
 
         visible: domainsListView.ViewItems.selectMode

=== modified file 'src/app/webbrowser/HistoryViewWide.qml'
--- src/app/webbrowser/HistoryViewWide.qml	2015-12-04 11:06:47 +0000
+++ src/app/webbrowser/HistoryViewWide.qml	2015-12-17 20:26:43 +0000
@@ -21,6 +21,7 @@
 import Ubuntu.Components.ListItems 1.3 as ListItems
 import webbrowserapp.private 0.1
 import "Highlight.js" as Highlight
+import "." as Local
 
 FocusScope {
     id: historyViewWide
@@ -345,7 +346,7 @@
         }
     }
 
-    Toolbar {
+    Local.Toolbar {
         id: topBar
 
         height: units.gu(7)
@@ -484,7 +485,7 @@
         }
     }
 
-    Toolbar {
+    Local.Toolbar {
         id: bottomToolbar
         height: units.gu(7)