summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar.sletta@digia.com>2012-12-11 15:28:20 +0100
committerGunnar Sletta <gunnar.sletta@digia.com>2012-12-11 15:28:20 +0100
commit8e924832cdee1a73cba91ef3adeccc16fcc606c7 (patch)
treee3777d08892d4a804c6b2304c13c27e023398032
parent32f88a0724856e0c941db3e9bc830d0c5ffcc8dc (diff)
Made a dedicated webkit slide
-rw-r--r--SlideDeck.qml16
-rw-r--r--WebkitSlide.qml39
2 files changed, 52 insertions, 3 deletions
diff --git a/SlideDeck.qml b/SlideDeck.qml
index ef0f89e..5775eda 100644
--- a/SlideDeck.qml
+++ b/SlideDeck.qml
@@ -105,7 +105,9 @@ We hope you will enjoy Qt 5.0 as much as we have enjoyed creating it."
title: "Qt 5.0 - Features"
writeInText: "OpenGL based scene graph for Qt Quick 2.0 - providing velvet animations, particles and impressive graphical effects
-Multimedia - Audio, Video and Camera support on all major platforms"
+Multimedia - Audio, Video and Camera support on all major platforms
+
+WebKit - Full HTML 5 support from the worlds most popular web engine, including WebKit2 process separation"
}
@@ -157,6 +159,16 @@ It also integrates nicely with the Qt Graphical Effects module."
/********************************************************************************
*
+ * Multimedia
+ *
+ */
+
+ WebkitSlide { }
+
+
+
+ /********************************************************************************
+ *
* The rest
*
*/
@@ -171,8 +183,6 @@ It also integrates nicely with the Qt Graphical Effects module."
Qt Platform Abstraction - Unifying the Qt codebase across platforms and greatly reducing the effort needed to port to new platforms
-WebKit - Full HTML 5 support from the worlds most popular web engine, including WebKit2 process separation
-
Wayland support - Wayland 1.0 compatible Qt backend and compositor framework"
}
diff --git a/WebkitSlide.qml b/WebkitSlide.qml
new file mode 100644
index 0000000..a049f98
--- /dev/null
+++ b/WebkitSlide.qml
@@ -0,0 +1,39 @@
+import QtQuick 2.0
+import QtWebKit 3.0
+import Qt.labs.presentation 1.0
+
+Slide {
+ id: slide
+
+ title: "Qt WebKit - WebView Element"
+
+ WebView {
+ id: browser
+ anchors.fill: parent
+ url: textInput.text
+
+ layer.enabled: true
+ }
+
+ Rectangle {
+ border.width: 2
+ border.color: "black"
+ opacity: 0.5
+ color: "black"
+ anchors.fill: textInput
+ anchors.margins: -textInput.height * 0.2;
+
+ radius: -anchors.margins
+ antialiasing: true
+ }
+
+ TextInput {
+ id: textInput
+ anchors.top: browser.bottom;
+ anchors.horizontalCenter: browser.horizontalCenter
+ font.pixelSize: slide.baseFontSize;
+ text: "http://www.google.com"
+ onAccepted: browser.reload();
+ color: "white"
+ }
+}