diff options
author | Peter Varga <pvarga@inf.u-szeged.hu> | 2021-06-08 16:28:58 +0200 |
---|---|---|
committer | Peter Varga <pvarga@inf.u-szeged.hu> | 2021-06-10 18:28:52 +0200 |
commit | 740b8c94f27930a33298c81c2284d1f0a9e2f11b (patch) | |
tree | 097150a08452efb33444b3228111fd02679dddf7 /examples/webenginewidgets | |
parent | b8804bf868c9f9b18a8b1caa9f512659113ddb98 (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.
Pick-to: 6.2
Change-Id: I18d6973b8bee574b37b73fbaaa8d57002ac8ba2d
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'examples/webenginewidgets')
-rw-r--r-- | examples/webenginewidgets/contentmanipulation/main.cpp | 1 | ||||
-rw-r--r-- | examples/webenginewidgets/cookiebrowser/main.cpp | 1 | ||||
-rw-r--r-- | examples/webenginewidgets/maps/main.cpp | 1 | ||||
-rw-r--r-- | examples/webenginewidgets/markdowneditor/main.cpp | 1 | ||||
-rw-r--r-- | examples/webenginewidgets/minimal/doc/src/minimal.qdoc | 3 | ||||
-rw-r--r-- | examples/webenginewidgets/minimal/main.cpp | 1 | ||||
-rw-r--r-- | examples/webenginewidgets/notifications/main.cpp | 1 | ||||
-rw-r--r-- | examples/webenginewidgets/printme/main.cpp | 1 | ||||
-rw-r--r-- | examples/webenginewidgets/simplebrowser/main.cpp | 2 | ||||
-rw-r--r-- | examples/webenginewidgets/spellchecker/main.cpp | 1 | ||||
-rw-r--r-- | examples/webenginewidgets/stylesheetbrowser/main.cpp | 1 | ||||
-rw-r--r-- | examples/webenginewidgets/videoplayer/main.cpp | 1 | ||||
-rw-r--r-- | examples/webenginewidgets/webui/main.cpp | 1 |
13 files changed, 0 insertions, 16 deletions
diff --git a/examples/webenginewidgets/contentmanipulation/main.cpp b/examples/webenginewidgets/contentmanipulation/main.cpp index 417b87184..b53fdef47 100644 --- a/examples/webenginewidgets/contentmanipulation/main.cpp +++ b/examples/webenginewidgets/contentmanipulation/main.cpp @@ -55,7 +55,6 @@ int main(int argc, char * argv[]) { QCoreApplication::setOrganizationName("QtExamples"); - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QApplication app(argc, argv); QUrl url; diff --git a/examples/webenginewidgets/cookiebrowser/main.cpp b/examples/webenginewidgets/cookiebrowser/main.cpp index 2a7fe6362..b3fe71840 100644 --- a/examples/webenginewidgets/cookiebrowser/main.cpp +++ b/examples/webenginewidgets/cookiebrowser/main.cpp @@ -55,7 +55,6 @@ int main(int argc, char *argv[]) { QCoreApplication::setOrganizationName("QtExamples"); - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QApplication app(argc, argv); MainWindow window(QUrl("http://qt.io")); window.resize(1024, 768); diff --git a/examples/webenginewidgets/maps/main.cpp b/examples/webenginewidgets/maps/main.cpp index cfcfa06d8..4a0fedb7b 100644 --- a/examples/webenginewidgets/maps/main.cpp +++ b/examples/webenginewidgets/maps/main.cpp @@ -54,7 +54,6 @@ int main(int argc, char *argv[]) { QCoreApplication::setOrganizationName("QtExamples"); - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QApplication app(argc, argv); MainWindow mainWindow; diff --git a/examples/webenginewidgets/markdowneditor/main.cpp b/examples/webenginewidgets/markdowneditor/main.cpp index b7a7905be..059e9e64c 100644 --- a/examples/webenginewidgets/markdowneditor/main.cpp +++ b/examples/webenginewidgets/markdowneditor/main.cpp @@ -57,7 +57,6 @@ int main(int argc, char *argv[]) { QCoreApplication::setOrganizationName("QtExamples"); - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QApplication a(argc, argv); MainWindow window; diff --git a/examples/webenginewidgets/minimal/doc/src/minimal.qdoc b/examples/webenginewidgets/minimal/doc/src/minimal.qdoc index b04390d23..9a0ee4593 100644 --- a/examples/webenginewidgets/minimal/doc/src/minimal.qdoc +++ b/examples/webenginewidgets/minimal/doc/src/minimal.qdoc @@ -57,9 +57,6 @@ \l{QWebEngineProfile::cachePath} and \l{QWebEngineProfile::persistentStoragePath}). - We also set the Qt::AA_EnableHighDpiScaling attribute. This lets the web - view automatically scale on high-dpi displays. - Next, we instantiate a QApplication and a QWebEngineView. The URL to load is taken from \c commandLineUrlArgument and loaded by calling \l QWebEngineView::setUrl. The view widget is diff --git a/examples/webenginewidgets/minimal/main.cpp b/examples/webenginewidgets/minimal/main.cpp index b31382ad5..a2c5e4873 100644 --- a/examples/webenginewidgets/minimal/main.cpp +++ b/examples/webenginewidgets/minimal/main.cpp @@ -64,7 +64,6 @@ QUrl commandLineUrlArgument() int main(int argc, char *argv[]) { QCoreApplication::setOrganizationName("QtExamples"); - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QApplication app(argc, argv); QWebEngineView view; diff --git a/examples/webenginewidgets/notifications/main.cpp b/examples/webenginewidgets/notifications/main.cpp index c3039b9e0..9a797376c 100644 --- a/examples/webenginewidgets/notifications/main.cpp +++ b/examples/webenginewidgets/notifications/main.cpp @@ -72,7 +72,6 @@ public: int main(int argc, char *argv[]) { - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QCoreApplication::setOrganizationName("QtExamples"); QApplication app(argc, argv); diff --git a/examples/webenginewidgets/printme/main.cpp b/examples/webenginewidgets/printme/main.cpp index 3993c6740..588026eb2 100644 --- a/examples/webenginewidgets/printme/main.cpp +++ b/examples/webenginewidgets/printme/main.cpp @@ -55,7 +55,6 @@ int main(int argc, char *argv[]) { - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QApplication app(argc, argv); QWebEngineView view; diff --git a/examples/webenginewidgets/simplebrowser/main.cpp b/examples/webenginewidgets/simplebrowser/main.cpp index 543742b33..19aae839c 100644 --- a/examples/webenginewidgets/simplebrowser/main.cpp +++ b/examples/webenginewidgets/simplebrowser/main.cpp @@ -68,8 +68,6 @@ QUrl commandLineUrlArgument() int main(int argc, char **argv) { QCoreApplication::setOrganizationName("QtExamples"); - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); - QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); QApplication app(argc, argv); app.setWindowIcon(QIcon(QStringLiteral(":AppLogoColor.png"))); diff --git a/examples/webenginewidgets/spellchecker/main.cpp b/examples/webenginewidgets/spellchecker/main.cpp index bf056ea9e..c2951fe00 100644 --- a/examples/webenginewidgets/spellchecker/main.cpp +++ b/examples/webenginewidgets/spellchecker/main.cpp @@ -54,7 +54,6 @@ int main(int argc, char *argv[]) { QCoreApplication::setOrganizationName("QtExamples"); - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QApplication app(argc, argv); WebView view; diff --git a/examples/webenginewidgets/stylesheetbrowser/main.cpp b/examples/webenginewidgets/stylesheetbrowser/main.cpp index 9cd294d48..571fccb11 100644 --- a/examples/webenginewidgets/stylesheetbrowser/main.cpp +++ b/examples/webenginewidgets/stylesheetbrowser/main.cpp @@ -58,7 +58,6 @@ int main(int argc, char *argv[]) qRegisterMetaType<StyleSheet>("StyleSheet"); QCoreApplication::setOrganizationName("QtExamples"); - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QApplication a(argc, argv); MainWindow w(QUrl("http://qt.io")); w.show(); diff --git a/examples/webenginewidgets/videoplayer/main.cpp b/examples/webenginewidgets/videoplayer/main.cpp index cfcfa06d8..4a0fedb7b 100644 --- a/examples/webenginewidgets/videoplayer/main.cpp +++ b/examples/webenginewidgets/videoplayer/main.cpp @@ -54,7 +54,6 @@ int main(int argc, char *argv[]) { QCoreApplication::setOrganizationName("QtExamples"); - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QApplication app(argc, argv); MainWindow mainWindow; diff --git a/examples/webenginewidgets/webui/main.cpp b/examples/webenginewidgets/webui/main.cpp index 0f6a3e87e..92c1b8e7d 100644 --- a/examples/webenginewidgets/webui/main.cpp +++ b/examples/webenginewidgets/webui/main.cpp @@ -58,7 +58,6 @@ int main(int argc, char *argv[]) { QCoreApplication::setOrganizationName("QtExamples"); - QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); WebUiHandler::registerUrlScheme(); |