From 153c0ee3c415f4f8bfb854b68565d10f7fc6e404 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Wed, 16 Sep 2020 00:46:15 +0200 Subject: Fix more compiler warnings from deprecated application attributes Also cleanup documentation, with the exception of the "High-DPI Support in Qt Quick Controls" page, which needs to be either removed or rewritten after some fact checking. Change-Id: I3cdf1f8554f8f26627a9a5f17c2ee0038c933468 Reviewed-by: Mitch Curtis --- examples/quickcontrols2/flatstyle/main.cpp | 1 - examples/quickcontrols2/imagine/automotive/automotive.cpp | 2 -- examples/quickcontrols2/imagine/musicplayer/musicplayer.cpp | 2 -- examples/quickcontrols2/texteditor/texteditor.cpp | 1 - examples/quickcontrols2/wearable/wearable.cpp | 1 - src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc | 1 - src/imports/controls/doc/src/qtquickcontrols2-gettingstarted.qdoc | 1 - src/imports/platform/doc/src/includes/widgets.qdocinc | 1 - src/quickcontrols2/qquickstyle.cpp | 1 - tests/auto/qquickiconimage/tst_qquickiconimage.cpp | 1 - tests/manual/buttons/buttons.cpp | 1 - tests/manual/dialogs/dialogs.cpp | 1 - tests/manual/headerview/main.cpp | 1 - tests/manual/nativestyle/main.cpp | 1 - tests/manual/testbench/main.cpp | 1 - 15 files changed, 17 deletions(-) diff --git a/examples/quickcontrols2/flatstyle/main.cpp b/examples/quickcontrols2/flatstyle/main.cpp index 93f856a9..ccc12492 100644 --- a/examples/quickcontrols2/flatstyle/main.cpp +++ b/examples/quickcontrols2/flatstyle/main.cpp @@ -53,7 +53,6 @@ int main(int argc, char *argv[]) { - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QApplication app(argc, argv); QQmlApplicationEngine engine; diff --git a/examples/quickcontrols2/imagine/automotive/automotive.cpp b/examples/quickcontrols2/imagine/automotive/automotive.cpp index 63cc702d..dc1d83e4 100644 --- a/examples/quickcontrols2/imagine/automotive/automotive.cpp +++ b/examples/quickcontrols2/imagine/automotive/automotive.cpp @@ -59,8 +59,6 @@ int main(int argc, char *argv[]) { QGuiApplication::setApplicationName("Automotive"); QGuiApplication::setOrganizationName("QtProject"); - QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling); - QGuiApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); QGuiApplication app(argc, argv); diff --git a/examples/quickcontrols2/imagine/musicplayer/musicplayer.cpp b/examples/quickcontrols2/imagine/musicplayer/musicplayer.cpp index a9fc2b9e..bd125625 100644 --- a/examples/quickcontrols2/imagine/musicplayer/musicplayer.cpp +++ b/examples/quickcontrols2/imagine/musicplayer/musicplayer.cpp @@ -57,8 +57,6 @@ int main(int argc, char *argv[]) { QGuiApplication::setApplicationName("Music Player"); QGuiApplication::setOrganizationName("QtProject"); - QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling); - QGuiApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); QGuiApplication app(argc, argv); diff --git a/examples/quickcontrols2/texteditor/texteditor.cpp b/examples/quickcontrols2/texteditor/texteditor.cpp index e3d9ad79..040ca6d0 100644 --- a/examples/quickcontrols2/texteditor/texteditor.cpp +++ b/examples/quickcontrols2/texteditor/texteditor.cpp @@ -66,7 +66,6 @@ int main(int argc, char *argv[]) { QGuiApplication::setApplicationName("Text Editor"); QGuiApplication::setOrganizationName("QtProject"); - QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling); #ifdef QT_WIDGETS_LIB QApplication app(argc, argv); diff --git a/examples/quickcontrols2/wearable/wearable.cpp b/examples/quickcontrols2/wearable/wearable.cpp index 68dee7c0..a602eddc 100644 --- a/examples/quickcontrols2/wearable/wearable.cpp +++ b/examples/quickcontrols2/wearable/wearable.cpp @@ -55,7 +55,6 @@ int main(int argc, char *argv[]) { - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QCoreApplication::setApplicationName("Wearable"); QCoreApplication::setOrganizationName("QtProject"); diff --git a/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc index 9b686070..484cc5b2 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc @@ -400,7 +400,6 @@ int main(int argc, char *argv[]) { - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QGuiApplication app(argc, argv); qmlRegisterUncreatableType("MyStyle", 1, 0, "MyStyle", "MyStyle is an attached property"); diff --git a/src/imports/controls/doc/src/qtquickcontrols2-gettingstarted.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-gettingstarted.qdoc index 22187bf4..377b55ed 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-gettingstarted.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-gettingstarted.qdoc @@ -67,7 +67,6 @@ int main(int argc, char *argv[]) { - QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QGuiApplication app(argc, argv); QQmlApplicationEngine engine; engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); diff --git a/src/imports/platform/doc/src/includes/widgets.qdocinc b/src/imports/platform/doc/src/includes/widgets.qdocinc index c89c3ca0..44ebba6d 100644 --- a/src/imports/platform/doc/src/includes/widgets.qdocinc +++ b/src/imports/platform/doc/src/includes/widgets.qdocinc @@ -19,7 +19,6 @@ Create an instance of \l QApplication in \c main(): int main(int argc, char *argv[]) { - QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QApplication app(argc, argv); QQmlApplicationEngine engine; engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); diff --git a/src/quickcontrols2/qquickstyle.cpp b/src/quickcontrols2/qquickstyle.cpp index 2564a49b..fd81d1dd 100644 --- a/src/quickcontrols2/qquickstyle.cpp +++ b/src/quickcontrols2/qquickstyle.cpp @@ -76,7 +76,6 @@ Q_LOGGING_CATEGORY(lcQtQuickControlsStyle, "qt.quick.controls.style") int main(int argc, char *argv[]) { - QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QGuiApplication app(argc, argv); QQuickStyle::setStyle("Material"); diff --git a/tests/auto/qquickiconimage/tst_qquickiconimage.cpp b/tests/auto/qquickiconimage/tst_qquickiconimage.cpp index bcf1231f..7dacda35 100644 --- a/tests/auto/qquickiconimage/tst_qquickiconimage.cpp +++ b/tests/auto/qquickiconimage/tst_qquickiconimage.cpp @@ -561,7 +561,6 @@ void tst_qquickiconimage::translucentColors() int main(int argc, char *argv[]) { - QGuiApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); QGuiApplication app(argc, argv); Q_UNUSED(app); tst_qquickiconimage test; diff --git a/tests/manual/buttons/buttons.cpp b/tests/manual/buttons/buttons.cpp index 1e90930d..0272522a 100644 --- a/tests/manual/buttons/buttons.cpp +++ b/tests/manual/buttons/buttons.cpp @@ -52,7 +52,6 @@ int main(int argc, char *argv[]) { - QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QGuiApplication app(argc, argv); QQmlApplicationEngine engine; diff --git a/tests/manual/dialogs/dialogs.cpp b/tests/manual/dialogs/dialogs.cpp index 73faa175..79d26c2b 100644 --- a/tests/manual/dialogs/dialogs.cpp +++ b/tests/manual/dialogs/dialogs.cpp @@ -53,7 +53,6 @@ int main(int argc, char *argv[]) { - QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QGuiApplication app(argc, argv); QQmlApplicationEngine engine; diff --git a/tests/manual/headerview/main.cpp b/tests/manual/headerview/main.cpp index b1573f08..a11f8627 100644 --- a/tests/manual/headerview/main.cpp +++ b/tests/manual/headerview/main.cpp @@ -204,7 +204,6 @@ private: int main(int argc, char *argv[]) { - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QGuiApplication app(argc, argv); qmlRegisterType("TestTableModel", 0, 1, "TestTableModel"); diff --git a/tests/manual/nativestyle/main.cpp b/tests/manual/nativestyle/main.cpp index aee43242..536625fb 100644 --- a/tests/manual/nativestyle/main.cpp +++ b/tests/manual/nativestyle/main.cpp @@ -40,7 +40,6 @@ int main(int argc, char *argv[]) { - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QGuiApplication app(argc, argv); // Todo: rename the "default" style to e.g "simple" diff --git a/tests/manual/testbench/main.cpp b/tests/manual/testbench/main.cpp index 0584bd6d..0ac446f4 100644 --- a/tests/manual/testbench/main.cpp +++ b/tests/manual/testbench/main.cpp @@ -65,7 +65,6 @@ int main(int argc, char *argv[]) { QGuiApplication::setApplicationName("testbench"); QGuiApplication::setOrganizationName("QtProject"); - QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QGuiApplication app(argc, argv); -- cgit v1.2.3