diff options
30 files changed, 9 insertions, 82 deletions
diff --git a/examples/corelib/threads/mandelbrot/main.cpp b/examples/corelib/threads/mandelbrot/main.cpp index 1aa4fa4104..9832d55514 100644 --- a/examples/corelib/threads/mandelbrot/main.cpp +++ b/examples/corelib/threads/mandelbrot/main.cpp @@ -55,7 +55,6 @@ //! [0] int main(int argc, char *argv[]) { - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QApplication app(argc, argv); MandelbrotWidget widget; widget.show(); diff --git a/examples/widgets/gallery/main.cpp b/examples/widgets/gallery/main.cpp index 688a1d6039..a32c8eb8e1 100644 --- a/examples/widgets/gallery/main.cpp +++ b/examples/widgets/gallery/main.cpp @@ -61,11 +61,8 @@ int main(int argc, char *argv[]) useHighDpiScaling = false; } - if (useHighDpiScaling) { - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); - } else { + if (!useHighDpiScaling) QCoreApplication::setAttribute(Qt::AA_DisableHighDpiScaling); - } QApplication app(argc, argv); WidgetGallery gallery; diff --git a/examples/widgets/graphicsview/collidingmice/main.cpp b/examples/widgets/graphicsview/collidingmice/main.cpp index c9ad90260f..ef6d6cca64 100644 --- a/examples/widgets/graphicsview/collidingmice/main.cpp +++ b/examples/widgets/graphicsview/collidingmice/main.cpp @@ -58,9 +58,6 @@ static constexpr int MouseCount = 7; //! [0] int main(int argc, char **argv) { -#ifdef Q_OS_ANDROID - QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); -#endif QApplication app(argc, argv); //! [0] diff --git a/examples/widgets/graphicsview/diagramscene/main.cpp b/examples/widgets/graphicsview/diagramscene/main.cpp index 3e321259c5..eefaa86554 100644 --- a/examples/widgets/graphicsview/diagramscene/main.cpp +++ b/examples/widgets/graphicsview/diagramscene/main.cpp @@ -55,9 +55,6 @@ int main(int argv, char *args[]) { Q_INIT_RESOURCE(diagramscene); -#ifdef Q_OS_ANDROID - QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); -#endif QApplication app(argv, args); MainWindow mainWindow; diff --git a/examples/widgets/itemviews/addressbook/main.cpp b/examples/widgets/itemviews/addressbook/main.cpp index 86a11c5850..0731287cdd 100644 --- a/examples/widgets/itemviews/addressbook/main.cpp +++ b/examples/widgets/itemviews/addressbook/main.cpp @@ -55,9 +55,6 @@ //! [0] int main(int argc, char *argv[]) { -#ifdef Q_OS_ANDROID - QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); -#endif QApplication app(argc, argv); MainWindow mw; mw.show(); diff --git a/examples/widgets/itemviews/spreadsheet/main.cpp b/examples/widgets/itemviews/spreadsheet/main.cpp index 968312d097..9a6dbf6817 100644 --- a/examples/widgets/itemviews/spreadsheet/main.cpp +++ b/examples/widgets/itemviews/spreadsheet/main.cpp @@ -56,9 +56,6 @@ int main(int argc, char **argv) { Q_INIT_RESOURCE(spreadsheet); -#ifdef Q_OS_ANDROID - QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); -#endif QApplication app(argc, argv); SpreadSheet sheet(10, 6); diff --git a/examples/widgets/mainwindows/application/main.cpp b/examples/widgets/mainwindows/application/main.cpp index b46e1116dc..78db7134a3 100644 --- a/examples/widgets/mainwindows/application/main.cpp +++ b/examples/widgets/mainwindows/application/main.cpp @@ -58,9 +58,6 @@ int main(int argc, char *argv[]) { Q_INIT_RESOURCE(application); -#ifdef Q_OS_ANDROID - QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); -#endif QApplication app(argc, argv); QCoreApplication::setOrganizationName("QtProject"); diff --git a/examples/widgets/mainwindows/dockwidgets/main.cpp b/examples/widgets/mainwindows/dockwidgets/main.cpp index bf3ad9bcf7..ff3ba506a8 100644 --- a/examples/widgets/mainwindows/dockwidgets/main.cpp +++ b/examples/widgets/mainwindows/dockwidgets/main.cpp @@ -54,9 +54,6 @@ int main(int argc, char *argv[]) { -#ifdef Q_OS_ANDROID - QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); -#endif QApplication app(argc, argv); Q_INIT_RESOURCE(dockwidgets); MainWindow mainWin; diff --git a/examples/widgets/mainwindows/mainwindow/main.cpp b/examples/widgets/mainwindows/mainwindow/main.cpp index dcaabd195f..b68be3cdf6 100644 --- a/examples/widgets/mainwindows/mainwindow/main.cpp +++ b/examples/widgets/mainwindows/mainwindow/main.cpp @@ -175,7 +175,6 @@ static ParseCommandLineArgumentsResult int main(int argc, char **argv) { - QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QApplication app(argc, argv); MainWindow::CustomSizeHintMap customSizeHints; switch (parseCustomSizeHints(QCoreApplication::arguments(), &customSizeHints)) { diff --git a/examples/widgets/painting/concentriccircles/main.cpp b/examples/widgets/painting/concentriccircles/main.cpp index 00456195d9..d9fa2879c4 100644 --- a/examples/widgets/painting/concentriccircles/main.cpp +++ b/examples/widgets/painting/concentriccircles/main.cpp @@ -54,9 +54,6 @@ int main(int argc, char *argv[]) { -#ifdef Q_OS_ANDROID - QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); -#endif QApplication app(argc, argv); Window window; window.show(); diff --git a/examples/widgets/painting/fontsampler/main.cpp b/examples/widgets/painting/fontsampler/main.cpp index cec6929827..1bf46b226f 100644 --- a/examples/widgets/painting/fontsampler/main.cpp +++ b/examples/widgets/painting/fontsampler/main.cpp @@ -54,9 +54,6 @@ int main(int argc, char *argv[]) { -#ifdef Q_OS_ANDROID - QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); -#endif QApplication app(argc, argv); MainWindow window; window.show(); diff --git a/examples/widgets/tools/undo/main.cpp b/examples/widgets/tools/undo/main.cpp index 1a6dcf8c48..a5ec1b1b83 100644 --- a/examples/widgets/tools/undo/main.cpp +++ b/examples/widgets/tools/undo/main.cpp @@ -54,9 +54,6 @@ int main(int argc, char **argv) { Q_INIT_RESOURCE(undo); -#ifdef Q_OS_ANDROID - QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); -#endif QApplication app(argc, argv); diff --git a/examples/widgets/widgets/calculator/main.cpp b/examples/widgets/widgets/calculator/main.cpp index 5f59d00ca6..a034bb262e 100644 --- a/examples/widgets/widgets/calculator/main.cpp +++ b/examples/widgets/widgets/calculator/main.cpp @@ -54,9 +54,6 @@ int main(int argc, char *argv[]) { -#ifdef Q_OS_ANDROID - QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); -#endif QApplication app(argc, argv); Calculator calc; calc.show(); diff --git a/examples/widgets/widgets/elidedlabel/main.cpp b/examples/widgets/widgets/elidedlabel/main.cpp index 58507766e7..1c620c1d41 100644 --- a/examples/widgets/widgets/elidedlabel/main.cpp +++ b/examples/widgets/widgets/elidedlabel/main.cpp @@ -55,9 +55,6 @@ //! [0] int main( int argc, char *argv[] ) { -#ifdef Q_OS_ANDROID - QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); -#endif QApplication application( argc, argv ); TestWidget w; w.showFullScreen(); diff --git a/examples/widgets/widgets/scribble/main.cpp b/examples/widgets/widgets/scribble/main.cpp index cec6929827..1bf46b226f 100644 --- a/examples/widgets/widgets/scribble/main.cpp +++ b/examples/widgets/widgets/scribble/main.cpp @@ -54,9 +54,6 @@ int main(int argc, char *argv[]) { -#ifdef Q_OS_ANDROID - QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); -#endif QApplication app(argc, argv); MainWindow window; window.show(); diff --git a/examples/widgets/widgets/sliders/main.cpp b/examples/widgets/widgets/sliders/main.cpp index 9bf18cb6d4..99725195e5 100644 --- a/examples/widgets/widgets/sliders/main.cpp +++ b/examples/widgets/widgets/sliders/main.cpp @@ -54,9 +54,6 @@ int main(int argc, char *argv[]) { -#ifdef Q_OS_ANDROID - QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); -#endif QApplication app(argc, argv); Window window; window.show(); diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index 9dda3572b4..01138e58ed 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -487,7 +487,9 @@ namespace Qt { AA_UseSoftwareOpenGL = 17, AA_ShareOpenGLContexts = 18, AA_SetPalette = 19, - AA_EnableHighDpiScaling = 20, +#if QT_DEPRECATED_SINCE(6, 0) + AA_EnableHighDpiScaling Q_DECL_ENUMERATOR_DEPRECATED = 20, +#endif AA_DisableHighDpiScaling = 21, AA_UseStyleSheetPropagationInWidgetStyles = 22, AA_DontUseNativeDialogs = 23, diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index a3d1564b06..6532f3bbab 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -215,15 +215,6 @@ \value AA_SetPalette Indicates whether a palette was explicitly set on the QGuiApplication. This value was added in Qt 5.5. - \value AA_EnableHighDpiScaling Enables high-DPI scaling in Qt on supported - platforms (see also \l{High DPI Displays}). Supported platforms are - X11, Windows and Android. Enabling makes Qt scale the main (device - independent) coordinate system according to display scale factors - provided by the operating system. This corresponds to setting the - QT_AUTO_SCREEN\unicode{0x200b}_SCALE_FACTOR environment variable to - 1. This attribute must be set before QGuiApplication is constructed. - This value was added in Qt 5.6. - \value AA_DisableHighDpiScaling Disables high-DPI scaling in Qt, exposing window system coordinates. Note that the window system may do its own scaling, so this does not guarantee that QPaintDevice::devicePixelRatio() will @@ -305,6 +296,7 @@ This value was added in 5.15 \omitvalue AA_AttributeCount + \omitvalue AA_EnableHighDpiScaling */ /*! @@ -3270,7 +3262,6 @@ environment variable. \sa QGuiApplication::setHighDpiScaleFactorRoundingPolicy() - \sa AA_EnableHighDpiScaling. \omitvalue Unset \value Round Round up for .5 and above. diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp index ab1d500087..3bda921820 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp @@ -952,7 +952,6 @@ void QCoreApplication::setAttribute(Qt::ApplicationAttribute attribute, bool on) if (Q_UNLIKELY(QCoreApplicationPrivate::is_app_running)) { #endif switch (attribute) { - case Qt::AA_EnableHighDpiScaling: case Qt::AA_DisableHighDpiScaling: case Qt::AA_PluginApplication: case Qt::AA_UseDesktopOpenGL: diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index 81ee315c0d..d3e97ebe5c 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -3699,7 +3699,7 @@ Qt::ApplicationState QGuiApplication::applicationState() Sets the high-DPI scale factor rounding policy for the application. The \a policy decides how non-integer scale factors (such as Windows 150%) are - handled, for applications that have AA_EnableHighDpiScaling enabled. + handled. The two principal options are whether fractional scale factors should be rounded to an integer or not. Keeping the scale factor as-is will diff --git a/src/widgets/widgets/qdockwidget.cpp b/src/widgets/widgets/qdockwidget.cpp index df335c9ca6..fd9e98c795 100644 --- a/src/widgets/widgets/qdockwidget.cpp +++ b/src/widgets/widgets/qdockwidget.cpp @@ -1586,8 +1586,8 @@ bool QDockWidget::event(QEvent *event) // Usually the window won't get resized while it's being moved, but it can happen, // for example on Windows when moving to a screen with bigger scale factor - // (and Qt::AA_EnableHighDpiScaling is enabled). If that happens we should - // update state->pressPos, otherwise it will be outside the window when the window shrinks. + // If that happens we should update state->pressPos, otherwise it will be outside + // the window when the window shrinks. if (d->state && d->state->dragging) d->recalculatePressPos(static_cast<QResizeEvent*>(event)); break; diff --git a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp index aa08f1c44d..3d4c50f19a 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp @@ -496,10 +496,6 @@ private: void tst_QGraphicsItem::initMain() { -#ifdef Q_OS_WIN - // Ensure minimum size constraints of framed windows on High DPI screens - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); -#endif } void tst_QGraphicsItem::cleanup() diff --git a/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp index 3da8e344bd..ef417bf914 100644 --- a/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp +++ b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp @@ -267,10 +267,6 @@ protected: void tst_QHeaderView::initMain() { -#ifdef Q_OS_WIN - // Ensure minimum size constraints of framed windows on High DPI screens - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); -#endif } class QtTestModel: public QAbstractTableModel diff --git a/tests/manual/highdpi/main.cpp b/tests/manual/highdpi/main.cpp index f976d1c590..4d70198d29 100644 --- a/tests/manual/highdpi/main.cpp +++ b/tests/manual/highdpi/main.cpp @@ -1458,7 +1458,6 @@ void MetricsTest::logScreenChangeSignal(const QObject *o, const char *name, cons int main(int argc, char **argv) { #define NOSCALINGOPTION "noscaling" -#define SCALINGOPTION "scaling" qInfo("High DPI tester %s", QT_VERSION_STR); @@ -1468,10 +1467,6 @@ int main(int argc, char **argv) QCoreApplication::setAttribute(Qt::AA_DisableHighDpiScaling); preAppOptionCount++; qInfo("AA_DisableHighDpiScaling"); - } else if (qstrcmp(argv[a], "--" SCALINGOPTION) == 0) { - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); - preAppOptionCount++; - qInfo("AA_EnableHighDpiScaling"); } } @@ -1489,7 +1484,6 @@ int main(int argc, char **argv) QCommandLineOption controllerOption("interactive", "Show configuration window."); parser.addOption(controllerOption); parser.addOption(QCommandLineOption(NOSCALINGOPTION, "Set AA_DisableHighDpiScaling")); - parser.addOption(QCommandLineOption(SCALINGOPTION, "Set AA_EnableHighDpiScaling")); DemoContainerList demoList; demoList << new DemoContainer<PixmapPainter>("pixmap", "Test pixmap painter"); diff --git a/tests/manual/qcursor/qcursorhighdpi/main.cpp b/tests/manual/qcursor/qcursorhighdpi/main.cpp index 5a8bc542b9..2e920ab231 100644 --- a/tests/manual/qcursor/qcursorhighdpi/main.cpp +++ b/tests/manual/qcursor/qcursorhighdpi/main.cpp @@ -339,9 +339,7 @@ int main(int argc, char *argv[]) std::copy(argv + 1, argv + argc, std::back_inserter(arguments)); #if QT_VERSION > 0x050000 - if (arguments.contains("-s")) - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); - else if (arguments.contains("-n")) + if (arguments.contains("-n")) QCoreApplication::setAttribute(Qt::AA_DisableHighDpiScaling); #endif // Qt 5 diff --git a/tests/manual/rhi/hellominimalcrossgfxtriangle/main.cpp b/tests/manual/rhi/hellominimalcrossgfxtriangle/main.cpp index 4ef3359ed0..8e04e8303d 100644 --- a/tests/manual/rhi/hellominimalcrossgfxtriangle/main.cpp +++ b/tests/manual/rhi/hellominimalcrossgfxtriangle/main.cpp @@ -77,7 +77,6 @@ QString graphicsApiName(QRhi::Implementation graphicsApi) int main(int argc, char **argv) { - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QGuiApplication app(argc, argv); QRhi::Implementation graphicsApi; diff --git a/tests/manual/rhi/multiwindow/multiwindow.cpp b/tests/manual/rhi/multiwindow/multiwindow.cpp index 222f82b472..f48b931b01 100644 --- a/tests/manual/rhi/multiwindow/multiwindow.cpp +++ b/tests/manual/rhi/multiwindow/multiwindow.cpp @@ -525,7 +525,6 @@ void closeWindow() int main(int argc, char **argv) { - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QApplication app(argc, argv); #if defined(Q_OS_WIN) diff --git a/tests/manual/rhi/multiwindow_threaded/multiwindow_threaded.cpp b/tests/manual/rhi/multiwindow_threaded/multiwindow_threaded.cpp index 3a2de89291..2e80cea9b3 100644 --- a/tests/manual/rhi/multiwindow_threaded/multiwindow_threaded.cpp +++ b/tests/manual/rhi/multiwindow_threaded/multiwindow_threaded.cpp @@ -725,7 +725,6 @@ void closeWindow() int main(int argc, char **argv) { - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QApplication app(argc, argv); #if defined(Q_OS_WIN) diff --git a/tests/manual/rhi/offscreen/offscreen.cpp b/tests/manual/rhi/offscreen/offscreen.cpp index 2e2f505efb..81356c02b2 100644 --- a/tests/manual/rhi/offscreen/offscreen.cpp +++ b/tests/manual/rhi/offscreen/offscreen.cpp @@ -125,7 +125,6 @@ QString graphicsApiName() int main(int argc, char **argv) { - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QGuiApplication app(argc, argv); #if defined(Q_OS_WIN) diff --git a/tests/manual/rhi/shared/examplefw.h b/tests/manual/rhi/shared/examplefw.h index 880efb546e..cac9a5cfdf 100644 --- a/tests/manual/rhi/shared/examplefw.h +++ b/tests/manual/rhi/shared/examplefw.h @@ -440,7 +440,6 @@ void Window::render() int main(int argc, char **argv) { - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QGuiApplication app(argc, argv); QLoggingCategory::setFilterRules(QLatin1String("qt.rhi.*=true")); |