diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-11-16 14:57:44 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-11-16 14:57:44 +0100 |
commit | ef177a48f2c6c41549ef9d11a985ab2661942638 (patch) | |
tree | d6bc5aa8cbde95d9e9857ead4b509e8b04b524b9 /examples/webengine/minimal/doc/src/minimal.qdoc | |
parent | 396ca081d7b0d9dab7de14ebaec7943c3f857a24 (diff) | |
parent | e5bc5a6dbdd915e0b19cfc43e7af17e43c1a7878 (diff) |
Merge branch '5.12' into dev
Conflicts:
src/core/compositor/compositor.cpp
src/core/compositor/compositor.h
Change-Id: I8a4d73d728d93d95e499849f8778cc88dda2105e
Diffstat (limited to 'examples/webengine/minimal/doc/src/minimal.qdoc')
-rw-r--r-- | examples/webengine/minimal/doc/src/minimal.qdoc | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/examples/webengine/minimal/doc/src/minimal.qdoc b/examples/webengine/minimal/doc/src/minimal.qdoc index e021a81d1..8d12afc7c 100644 --- a/examples/webengine/minimal/doc/src/minimal.qdoc +++ b/examples/webengine/minimal/doc/src/minimal.qdoc @@ -50,9 +50,15 @@ \skipto #include \printto main - 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. + In the \c main function we first set the + \l{QCoreApplication::organizationName} property. This affects the locations + where Qt WebEngine stores persistent and cached data (see also + \l{WebEngineProfile::cachePath} and + \l{WebEngineProfile::persistentStoragePath}). + + We also 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 |