From c3a4d3608245c5614fcaf95bbe37f2300bbac4cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= Date: Thu, 12 Sep 2019 12:03:17 +0200 Subject: High-DPI: Remove usages of Qt::AA_UseHighDpiPixmaps MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove usages of Qt::AA_UseHighDpiPixmaps from examples/. This flag is now on by default, and can't be disabled. Task-number: QTBUG-83092 Change-Id: Ie28622f816da2fe28d4ab272d45ea20bd051d5f3 Reviewed-by: Tor Arne Vestbø Reviewed-by: Friedemann Kleint --- examples/corelib/threads/mandelbrot/main.cpp | 1 - examples/widgets/desktop/systray/main.cpp | 2 -- examples/widgets/dialogs/classwizard/main.cpp | 2 -- examples/widgets/dialogs/licensewizard/main.cpp | 2 -- examples/widgets/dialogs/standarddialogs/main.cpp | 1 - examples/widgets/dialogs/trivialwizard/trivialwizard.cpp | 2 -- examples/widgets/gallery/main.cpp | 1 - examples/widgets/mainwindows/mainwindow/main.cpp | 1 - examples/widgets/widgets/icons/main.cpp | 6 ------ examples/widgets/widgets/icons/mainwindow.cpp | 10 ---------- examples/widgets/widgets/icons/mainwindow.h | 1 - 11 files changed, 29 deletions(-) diff --git a/examples/corelib/threads/mandelbrot/main.cpp b/examples/corelib/threads/mandelbrot/main.cpp index c5d4835192..1aa4fa4104 100644 --- a/examples/corelib/threads/mandelbrot/main.cpp +++ b/examples/corelib/threads/mandelbrot/main.cpp @@ -56,7 +56,6 @@ int main(int argc, char *argv[]) { QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); - QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); QApplication app(argc, argv); MandelbrotWidget widget; widget.show(); diff --git a/examples/widgets/desktop/systray/main.cpp b/examples/widgets/desktop/systray/main.cpp index 2d91e4ac36..4e3e628767 100644 --- a/examples/widgets/desktop/systray/main.cpp +++ b/examples/widgets/desktop/systray/main.cpp @@ -59,8 +59,6 @@ int main(int argc, char *argv[]) { Q_INIT_RESOURCE(systray); - QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); - QApplication app(argc, argv); if (!QSystemTrayIcon::isSystemTrayAvailable()) { diff --git a/examples/widgets/dialogs/classwizard/main.cpp b/examples/widgets/dialogs/classwizard/main.cpp index 221e81aae4..901ef91265 100644 --- a/examples/widgets/dialogs/classwizard/main.cpp +++ b/examples/widgets/dialogs/classwizard/main.cpp @@ -59,8 +59,6 @@ int main(int argc, char *argv[]) { Q_INIT_RESOURCE(classwizard); - QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); - QApplication app(argc, argv); #ifndef QT_NO_TRANSLATION diff --git a/examples/widgets/dialogs/licensewizard/main.cpp b/examples/widgets/dialogs/licensewizard/main.cpp index 112fcc7aa0..88eb59c88e 100644 --- a/examples/widgets/dialogs/licensewizard/main.cpp +++ b/examples/widgets/dialogs/licensewizard/main.cpp @@ -59,8 +59,6 @@ int main(int argc, char *argv[]) { Q_INIT_RESOURCE(licensewizard); - QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); - QApplication app(argc, argv); #ifndef QT_NO_TRANSLATION diff --git a/examples/widgets/dialogs/standarddialogs/main.cpp b/examples/widgets/dialogs/standarddialogs/main.cpp index 19ed2bf66f..42be1ad34b 100644 --- a/examples/widgets/dialogs/standarddialogs/main.cpp +++ b/examples/widgets/dialogs/standarddialogs/main.cpp @@ -59,7 +59,6 @@ int main(int argc, char *argv[]) { - QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); QApplication app(argc, argv); QGuiApplication::setApplicationDisplayName(Dialog::tr("Standard Dialogs")); diff --git a/examples/widgets/dialogs/trivialwizard/trivialwizard.cpp b/examples/widgets/dialogs/trivialwizard/trivialwizard.cpp index 75a373f990..4c87327cd3 100644 --- a/examples/widgets/dialogs/trivialwizard/trivialwizard.cpp +++ b/examples/widgets/dialogs/trivialwizard/trivialwizard.cpp @@ -123,8 +123,6 @@ QWizardPage *createConclusionPage() int main(int argc, char *argv[]) //! [9] //! [11] { - QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); - QApplication app(argc, argv); #ifndef QT_NO_TRANSLATION diff --git a/examples/widgets/gallery/main.cpp b/examples/widgets/gallery/main.cpp index 7f1782c84e..688a1d6039 100644 --- a/examples/widgets/gallery/main.cpp +++ b/examples/widgets/gallery/main.cpp @@ -62,7 +62,6 @@ int main(int argc, char *argv[]) } if (useHighDpiScaling) { - QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); } else { QCoreApplication::setAttribute(Qt::AA_DisableHighDpiScaling); diff --git a/examples/widgets/mainwindows/mainwindow/main.cpp b/examples/widgets/mainwindows/mainwindow/main.cpp index b82f67b361..ae4634e3be 100644 --- a/examples/widgets/mainwindows/mainwindow/main.cpp +++ b/examples/widgets/mainwindows/mainwindow/main.cpp @@ -176,7 +176,6 @@ static ParseCommandLineArgumentsResult int main(int argc, char **argv) { QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); - QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); QApplication app(argc, argv); MainWindow::CustomSizeHintMap customSizeHints; switch (parseCustomSizeHints(QCoreApplication::arguments(), &customSizeHints)) { diff --git a/examples/widgets/widgets/icons/main.cpp b/examples/widgets/widgets/icons/main.cpp index 632795c18c..aff2d2013e 100644 --- a/examples/widgets/widgets/icons/main.cpp +++ b/examples/widgets/widgets/icons/main.cpp @@ -64,15 +64,9 @@ int main(int argc, char *argv[]) commandLineParser.setSingleDashWordOptionMode(QCommandLineParser::ParseAsLongOptions); commandLineParser.addHelpOption(); commandLineParser.addVersionOption(); - QCommandLineOption noHighDpiPixmapOption("no-highdpi-pixmaps", - "Disable High DPI image loading (Qt::AA_UseHighDpiPixmaps)"); - commandLineParser.addOption(noHighDpiPixmapOption); commandLineParser.addPositionalArgument(MainWindow::tr("[file]"), MainWindow::tr("Icon file(s) to open.")); commandLineParser.process(QCoreApplication::arguments()); - if (!commandLineParser.isSet(noHighDpiPixmapOption)) - QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); - MainWindow mainWin; if (!commandLineParser.positionalArguments().isEmpty()) mainWin.loadImages(commandLineParser.positionalArguments()); diff --git a/examples/widgets/widgets/icons/mainwindow.cpp b/examples/widgets/widgets/icons/mainwindow.cpp index aa5ed852fd..bd14bff518 100644 --- a/examples/widgets/widgets/icons/mainwindow.cpp +++ b/examples/widgets/widgets/icons/mainwindow.cpp @@ -320,12 +320,6 @@ void MainWindow::loadImages(const QStringList &fileNames) } } -void MainWindow::useHighDpiPixmapsChanged(int checkState) -{ - QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps, checkState == Qt::Checked); - changeIcon(); -} - //! [20] void MainWindow::removeAllImages() { @@ -444,10 +438,6 @@ QWidget *MainWindow::createHighDpiIconSizeGroupBox() screenNameLabel = new QLabel(highDpiGroupBox); layout->addRow(tr("Screen:"), screenNameLabel); layout->addRow(tr("Device pixel ratio:"), devicePixelRatioLabel); - QCheckBox *highDpiPixmapsCheckBox = new QCheckBox(QLatin1String("Qt::AA_UseHighDpiPixmaps")); - highDpiPixmapsCheckBox->setChecked(QCoreApplication::testAttribute(Qt::AA_UseHighDpiPixmaps)); - connect(highDpiPixmapsCheckBox, &QCheckBox::stateChanged, this, &MainWindow::useHighDpiPixmapsChanged); - layout->addRow(highDpiPixmapsCheckBox); return highDpiGroupBox; } diff --git a/examples/widgets/widgets/icons/mainwindow.h b/examples/widgets/widgets/icons/mainwindow.h index 9250711ecc..cd77dae8e8 100644 --- a/examples/widgets/widgets/icons/mainwindow.h +++ b/examples/widgets/widgets/icons/mainwindow.h @@ -88,7 +88,6 @@ private slots: void addSampleImages(); void addOtherImages(); void removeAllImages(); - void useHighDpiPixmapsChanged(int checkState); void screenChanged(); private: -- cgit v1.2.3