diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-08-13 13:10:49 +0200 |
|---|---|---|
| committer | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-08-19 18:55:57 +0200 |
| commit | b9a97b2c4dca50f0c13a1006130e095e85936a2a (patch) | |
| tree | 5b7b9eb260c642d92770cb3f93ce0e7b76c7d18a /examples/quick/quicknanobrowser | |
| parent | b6b4418db975e3c6003376b28f74d669cdf58ea4 (diff) | |
Change "Contents" to "Engine" in API class names.
Change-Id: I58d83f4f33728f92e4bf13b6be30b15528fdd033
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'examples/quick/quicknanobrowser')
| -rw-r--r-- | examples/quick/quicknanobrowser/quickwindow.h | 2 | ||||
| -rw-r--r-- | examples/quick/quicknanobrowser/quickwindow.qml | 20 |
2 files changed, 11 insertions, 11 deletions
diff --git a/examples/quick/quicknanobrowser/quickwindow.h b/examples/quick/quicknanobrowser/quickwindow.h index 3f1f944ca..ed25a23b8 100644 --- a/examples/quick/quicknanobrowser/quickwindow.h +++ b/examples/quick/quicknanobrowser/quickwindow.h @@ -44,7 +44,7 @@ #include <QQmlApplicationEngine> -class QWebContentsView; +class QWebEngineView; class ApplicationEngine : public QQmlApplicationEngine { Q_OBJECT diff --git a/examples/quick/quicknanobrowser/quickwindow.qml b/examples/quick/quicknanobrowser/quickwindow.qml index 9086d26fa..bec301e6d 100644 --- a/examples/quick/quicknanobrowser/quickwindow.qml +++ b/examples/quick/quicknanobrowser/quickwindow.qml @@ -48,7 +48,7 @@ ApplicationWindow { height: 600 width: 800 visible: true - title: webContentsView.title + title: webEngineView.title // Focus and select text in URL bar Action { @@ -68,32 +68,32 @@ ApplicationWindow { ToolButton { id: backButton iconSource: "icons/go-previous.png" - onClicked: webContentsView.goBack() - enabled: webContentsView.canGoBack + onClicked: webEngineView.goBack() + enabled: webEngineView.canGoBack } ToolButton { id: forwardButton iconSource: "icons/go-next.png" - onClicked: webContentsView.goForward() - enabled: webContentsView.canGoForward + onClicked: webEngineView.goForward() + enabled: webEngineView.canGoForward } ToolButton { id: reloadButton - iconSource: webContentsView.loading ? "icons/process-stop.png" : "icons/view-refresh.png" - onClicked: webContentsView.reload() + iconSource: webEngineView.loading ? "icons/process-stop.png" : "icons/view-refresh.png" + onClicked: webEngineView.reload() } TextField { id: addressBar focus: true Layout.fillWidth: true - onAccepted: webContentsView.url = utils.fromUserInput(text) + onAccepted: webEngineView.url = utils.fromUserInput(text) } } } - WebContentsView { - id: webContentsView + WebEngineView { + id: webEngineView focus: true anchors.fill: parent url: utils.initialUrl() |