summaryrefslogtreecommitdiff
path: root/Tools/MiniBrowser
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2012-06-01 10:36:58 +0200
committerSimon Hausmann <simon.hausmann@nokia.com>2012-06-01 10:36:58 +0200
commitb1e9e47fa11f608ae16bc07f97a2acf95bf80272 (patch)
treec88c45e80c9c44506e7cdf9a3bb39ebf82a8cd5b /Tools/MiniBrowser
parentbe01689f43cf6882cf670d33df49ead1f570c53a (diff)
downloadqtwebkit-b1e9e47fa11f608ae16bc07f97a2acf95bf80272.tar.gz
Imported WebKit commit 499c84c99aa98e9870fa7eaa57db476c6d160d46 (http://svn.webkit.org/repository/webkit/trunk@119200)
Weekly update :). Particularly relevant changes for Qt are the use of the WebCore image decoders and direct usage of libpng/libjpeg if available in the system.
Diffstat (limited to 'Tools/MiniBrowser')
-rw-r--r--Tools/MiniBrowser/qt/icons/favicon.pngbin891 -> 814 bytes
-rw-r--r--Tools/MiniBrowser/qt/qml/BrowserWindow.qml4
2 files changed, 3 insertions, 1 deletions
diff --git a/Tools/MiniBrowser/qt/icons/favicon.png b/Tools/MiniBrowser/qt/icons/favicon.png
index 4462752a5..325d5bd1e 100644
--- a/Tools/MiniBrowser/qt/icons/favicon.png
+++ b/Tools/MiniBrowser/qt/icons/favicon.png
Binary files differ
diff --git a/Tools/MiniBrowser/qt/qml/BrowserWindow.qml b/Tools/MiniBrowser/qt/qml/BrowserWindow.qml
index 5237c715c..0ebf02860 100644
--- a/Tools/MiniBrowser/qt/qml/BrowserWindow.qml
+++ b/Tools/MiniBrowser/qt/qml/BrowserWindow.qml
@@ -105,6 +105,7 @@ Rectangle {
if (parent.enabled) {
console.log("MiniBrowser: Going backward in session history.")
webView.goBack()
+ webView.forceActiveFocus()
}
}
}
@@ -139,6 +140,7 @@ Rectangle {
if (parent.enabled) {
console.log("MiniBrowser: Going forward in session history.")
webView.goForward()
+ webView.forceActiveFocus()
}
}
}
@@ -267,7 +269,7 @@ Rectangle {
height: 16
anchors {
left: parent.left
- leftMargin: 4
+ leftMargin: 6
verticalCenter: parent.verticalCenter
}
}