diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-04 07:29:26 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-05 11:35:18 +0200 |
| commit | 179463fd2b17343dae291ab6f7617311bcfbdb75 (patch) | |
| tree | e32e298ca5d6e2b6e206dab7d42538a6ce68eba1 /examples/webengine | |
| parent | c8851dd1a77e730bc6a3c17b7c75b1a4c6b41f53 (diff) | |
| parent | 336e706cbc839dd7b7c1d461b6b015600b5f009e (diff) | |
| download | qtwebengine-179463fd2b17343dae291ab6f7617311bcfbdb75.tar.gz | |
Merge remote-tracking branch 'origin/5.7' into dev
Also blacklist tst_QWebEnginePage::comboBoxPopupPositionAfterChildMove()
and comboBoxPopupPositionAfterMove().
Conflicts:
.qmake.conf
src/3rdparty
src/core/render_widget_host_view_qt.cpp
src/core/resources/resources.gyp
src/webengine/doc/src/qtwebengine-platform-notes.qdoc
src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h
tests/auto/widgets/qwebenginepage/BLACKLIST
tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
tools/qmake/mkspecs/features/functions.prf
Task-number: QTBUG-55158
Change-Id: I1d73ac9b3ca5293ad3c7e3a56f4c395da930e6f4
Diffstat (limited to 'examples/webengine')
| -rw-r--r-- | examples/webengine/minimal/doc/src/minimal.qdoc | 7 | ||||
| -rw-r--r-- | examples/webengine/minimal/main.cpp | 2 | ||||
| -rw-r--r-- | examples/webengine/quicknanobrowser/main.cpp | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/examples/webengine/minimal/doc/src/minimal.qdoc b/examples/webengine/minimal/doc/src/minimal.qdoc index c0b89ba5a..5d7ca45e7 100644 --- a/examples/webengine/minimal/doc/src/minimal.qdoc +++ b/examples/webengine/minimal/doc/src/minimal.qdoc @@ -50,8 +50,11 @@ \skipto #include \printto main - In the main function we first instantiate a QGuiApplication object. - We then call \l{QtWebEngine::initialize}, which makes sure that OpenGL + In the \c main function we first set the Qt::AA_EnableHighDpiScaling + attribute. This lets the web view automatically scale on high-dpi displays. + Then we instantiate a QGuiApplication object. + + Next, we call \l{QtWebEngine::initialize}, which makes sure that OpenGL contexts can be shared between the main process and the dedicated renderer process (\c QtWebEngineProcess). This method needs to be called before any OpenGL context is created. diff --git a/examples/webengine/minimal/main.cpp b/examples/webengine/minimal/main.cpp index cc5a1f61e..099b70707 100644 --- a/examples/webengine/minimal/main.cpp +++ b/examples/webengine/minimal/main.cpp @@ -44,7 +44,9 @@ int main(int argc, char *argv[]) { + QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QGuiApplication app(argc, argv); + QtWebEngine::initialize(); QQmlApplicationEngine engine; diff --git a/examples/webengine/quicknanobrowser/main.cpp b/examples/webengine/quicknanobrowser/main.cpp index 779648fac..94d6f8519 100644 --- a/examples/webengine/quicknanobrowser/main.cpp +++ b/examples/webengine/quicknanobrowser/main.cpp @@ -78,6 +78,8 @@ static QUrl startupUrl() int main(int argc, char **argv) { + QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); + Application app(argc, argv); QtWebEngine::initialize(); |