summaryrefslogtreecommitdiffstats
path: root/examples/webengine
diff options
context:
space:
mode:
authorPeter Varga <pvarga@inf.u-szeged.hu>2021-06-08 16:28:58 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-06-10 23:20:07 +0000
commitee3e1886d6154a3faaf7536986e8c70ec4f3c373 (patch)
tree0603c3e229f865001cdd4678a2c8812aa1cbd21c /examples/webengine
parentd627842e98c1cbaec0123566dc1af7b6018e5dc1 (diff)
Fix some compiler warnings
- Remove deprecated Qt::AA_EnableHighDpiScaling and Qt::AA_UseHighDpiPixmaps from examples. High-DPI scaling is always enabled. - Reorder initialization of members of QWebEngineDownloadRequestPrivate. Also remove m_ prefix from public members' name. - Remove unused parameters from methods of DummyDelegate. - Add missing overrides in auto tests. Change-Id: I18d6973b8bee574b37b73fbaaa8d57002ac8ba2d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 740b8c94f27930a33298c81c2284d1f0a9e2f11b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'examples/webengine')
-rw-r--r--examples/webengine/customdialogs/main.cpp1
-rw-r--r--examples/webengine/lifecycle/main.cpp1
-rw-r--r--examples/webengine/minimal/doc/src/minimal.qdoc4
-rw-r--r--examples/webengine/minimal/main.cpp1
-rw-r--r--examples/webengine/quicknanobrowser/main.cpp1
-rw-r--r--examples/webengine/recipebrowser/doc/src/recipebrowser.qdoc3
-rw-r--r--examples/webengine/recipebrowser/main.cpp1
-rw-r--r--examples/webengine/webengineaction/main.cpp1
8 files changed, 1 insertions, 12 deletions
diff --git a/examples/webengine/customdialogs/main.cpp b/examples/webengine/customdialogs/main.cpp
index 5aad8affb..e3c4ad085 100644
--- a/examples/webengine/customdialogs/main.cpp
+++ b/examples/webengine/customdialogs/main.cpp
@@ -66,7 +66,6 @@ typedef QGuiApplication Application;
int main(int argc, char *argv[])
{
QCoreApplication::setOrganizationName("QtExamples");
- QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
QtWebEngine::initialize();
Application app(argc, argv);
diff --git a/examples/webengine/lifecycle/main.cpp b/examples/webengine/lifecycle/main.cpp
index bb93d64a7..3972639c5 100644
--- a/examples/webengine/lifecycle/main.cpp
+++ b/examples/webengine/lifecycle/main.cpp
@@ -57,7 +57,6 @@
int main(int argc, char *argv[])
{
QCoreApplication::setOrganizationName("QtExamples");
- QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
QtWebEngine::initialize();
QGuiApplication app(argc, argv);
QQmlApplicationEngine engine;
diff --git a/examples/webengine/minimal/doc/src/minimal.qdoc b/examples/webengine/minimal/doc/src/minimal.qdoc
index 4fc62bddb..1e629f689 100644
--- a/examples/webengine/minimal/doc/src/minimal.qdoc
+++ b/examples/webengine/minimal/doc/src/minimal.qdoc
@@ -56,10 +56,6 @@
\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
process (\c QtWebEngineProcess). This method needs to be called before
diff --git a/examples/webengine/minimal/main.cpp b/examples/webengine/minimal/main.cpp
index 86109f97a..fde716451 100644
--- a/examples/webengine/minimal/main.cpp
+++ b/examples/webengine/minimal/main.cpp
@@ -55,7 +55,6 @@
int main(int argc, char *argv[])
{
QCoreApplication::setOrganizationName("QtExamples");
- QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts);
QtWebEngine::initialize();
QGuiApplication app(argc, argv);
diff --git a/examples/webengine/quicknanobrowser/main.cpp b/examples/webengine/quicknanobrowser/main.cpp
index f804c0d14..4c4c80390 100644
--- a/examples/webengine/quicknanobrowser/main.cpp
+++ b/examples/webengine/quicknanobrowser/main.cpp
@@ -79,7 +79,6 @@ static QUrl startupUrl()
int main(int argc, char **argv)
{
QCoreApplication::setOrganizationName("QtExamples");
- QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
QtWebEngine::initialize();
Application app(argc, argv);
diff --git a/examples/webengine/recipebrowser/doc/src/recipebrowser.qdoc b/examples/webengine/recipebrowser/doc/src/recipebrowser.qdoc
index 63a0af361..6e1ed84e3 100644
--- a/examples/webengine/recipebrowser/doc/src/recipebrowser.qdoc
+++ b/examples/webengine/recipebrowser/doc/src/recipebrowser.qdoc
@@ -47,8 +47,7 @@
In \c main.cpp, we use the \l{QGuiApplication} and \l{QQmlApplicationEngine}
classes to set up and load the main QML file. We call \l{QtWebEngine::initialize} so we can use
- \l{WebEngineView} in our QML code. We enable high DPI screen support by setting the
- \l{Qt::AA_EnableHighDpiScaling} attribute. We set the default Qt Quick Controls 2 style
+ \l{WebEngineView} in our QML code. We set the default Qt Quick Controls 2 style
to the Material style, so we do not have to specify it for each new item we add. Finally, we use
a C++ define to check whether the application is compiled for an embedded platform.
The value will be used in the main QML code to determine the window size.
diff --git a/examples/webengine/recipebrowser/main.cpp b/examples/webengine/recipebrowser/main.cpp
index e61b9e0f5..b5e5224ed 100644
--- a/examples/webengine/recipebrowser/main.cpp
+++ b/examples/webengine/recipebrowser/main.cpp
@@ -57,7 +57,6 @@
int main(int argc, char *argv[])
{
QCoreApplication::setOrganizationName("QtExamples");
- QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
QtWebEngine::initialize();
QGuiApplication app(argc, argv);
diff --git a/examples/webengine/webengineaction/main.cpp b/examples/webengine/webengineaction/main.cpp
index f2dec9655..b0ef0848a 100644
--- a/examples/webengine/webengineaction/main.cpp
+++ b/examples/webengine/webengineaction/main.cpp
@@ -55,7 +55,6 @@
int main(int argc, char *argv[])
{
QCoreApplication::setOrganizationName("QtExamples");
- QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
QtWebEngine::initialize();
QGuiApplication app(argc, argv);