diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-11-11 11:24:20 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-11-11 11:24:20 +0100 |
| commit | c254868dc2bd5772494a48686ebbc3e867a86adf (patch) | |
| tree | 76c33df85ab2ef13e44f7677b43439c7b0d3b36a /examples/webengine | |
| parent | fca9015175950b04bafb9b3af7d4e693eb0243d9 (diff) | |
| parent | aa1b2d20a80f53ce5e7f6097114d41a018d9350b (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/core/browser_context_qt.cpp
src/webengine/api/qquickwebengineview_p.h
Change-Id: I73bdec03b627b282851d7dda12006d4ab631072c
Diffstat (limited to 'examples/webengine')
| -rw-r--r-- | examples/webengine/quicknanobrowser/quickwindow.qml | 4 | ||||
| -rw-r--r-- | examples/webengine/quicknanobrowser/util.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/examples/webengine/quicknanobrowser/quickwindow.qml b/examples/webengine/quicknanobrowser/quickwindow.qml index c73951046..b954629fb 100644 --- a/examples/webengine/quicknanobrowser/quickwindow.qml +++ b/examples/webengine/quicknanobrowser/quickwindow.qml @@ -51,8 +51,8 @@ ApplicationWindow { function load(url) { currentWebView.url = url } property Item currentWebView: tabs.currentIndex < tabs.count ? tabs.getTab(tabs.currentIndex).item : null - height: 600 - width: 800 + width: 1300 + height: 900 visible: true title: currentWebView && currentWebView.title diff --git a/examples/webengine/quicknanobrowser/util.h b/examples/webengine/quicknanobrowser/util.h index 85db8c25b..ca0f5f1d5 100644 --- a/examples/webengine/quicknanobrowser/util.h +++ b/examples/webengine/quicknanobrowser/util.h @@ -66,7 +66,7 @@ QUrl startupUrl() if (ret.isValid()) return ret; } - return QUrl(QStringLiteral("http://qt-project.org/")); + return QUrl(QStringLiteral("http://qt.io/")); } |