From e5f4e1405947bcecd78f15bd76162ad6b54c2502 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Wed, 12 Feb 2020 17:27:36 +0200 Subject: Examples: enable HighDPI scaling for examples on Android These examples show very tiny UI elements on Android devices, thus enabling HighDPI. Task-number: QTBUG-80717 Change-Id: I813801d5249dc1fcfc6f61a8d146f60dd19901f6 Reviewed-by: BogDan Vatra --- examples/widgets/graphicsview/collidingmice/main.cpp | 3 +++ examples/widgets/graphicsview/diagramscene/main.cpp | 3 +++ examples/widgets/itemviews/addressbook/main.cpp | 3 +++ examples/widgets/itemviews/spreadsheet/main.cpp | 4 ++++ examples/widgets/mainwindows/application/main.cpp | 3 +++ examples/widgets/mainwindows/dockwidgets/main.cpp | 3 +++ examples/widgets/painting/affine/main.cpp | 4 +++- examples/widgets/painting/concentriccircles/main.cpp | 3 +++ examples/widgets/painting/fontsampler/main.cpp | 3 +++ examples/widgets/painting/gradients/main.cpp | 3 +++ examples/widgets/painting/pathstroke/main.cpp | 3 +++ examples/widgets/tools/undo/main.cpp | 3 +++ examples/widgets/widgets/calculator/main.cpp | 3 +++ examples/widgets/widgets/elidedlabel/main.cpp | 3 +++ examples/widgets/widgets/scribble/main.cpp | 3 +++ examples/widgets/widgets/sliders/main.cpp | 3 +++ 16 files changed, 49 insertions(+), 1 deletion(-) (limited to 'examples') diff --git a/examples/widgets/graphicsview/collidingmice/main.cpp b/examples/widgets/graphicsview/collidingmice/main.cpp index ef6d6cca64..c9ad90260f 100644 --- a/examples/widgets/graphicsview/collidingmice/main.cpp +++ b/examples/widgets/graphicsview/collidingmice/main.cpp @@ -58,6 +58,9 @@ 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 eefaa86554..3e321259c5 100644 --- a/examples/widgets/graphicsview/diagramscene/main.cpp +++ b/examples/widgets/graphicsview/diagramscene/main.cpp @@ -55,6 +55,9 @@ 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 0731287cdd..86a11c5850 100644 --- a/examples/widgets/itemviews/addressbook/main.cpp +++ b/examples/widgets/itemviews/addressbook/main.cpp @@ -55,6 +55,9 @@ //! [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 548dc8d604..968312d097 100644 --- a/examples/widgets/itemviews/spreadsheet/main.cpp +++ b/examples/widgets/itemviews/spreadsheet/main.cpp @@ -56,6 +56,10 @@ 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); sheet.setWindowIcon(QPixmap(":/images/interview.png")); diff --git a/examples/widgets/mainwindows/application/main.cpp b/examples/widgets/mainwindows/application/main.cpp index 78db7134a3..b46e1116dc 100644 --- a/examples/widgets/mainwindows/application/main.cpp +++ b/examples/widgets/mainwindows/application/main.cpp @@ -58,6 +58,9 @@ 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 ff3ba506a8..bf3ad9bcf7 100644 --- a/examples/widgets/mainwindows/dockwidgets/main.cpp +++ b/examples/widgets/mainwindows/dockwidgets/main.cpp @@ -54,6 +54,9 @@ 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/painting/affine/main.cpp b/examples/widgets/painting/affine/main.cpp index 6ce8efe482..641fc5c204 100644 --- a/examples/widgets/painting/affine/main.cpp +++ b/examples/widgets/painting/affine/main.cpp @@ -55,7 +55,9 @@ int main(int argc, char **argv) { Q_INIT_RESOURCE(affine); - +#ifdef Q_OS_ANDROID + qputenv("QT_SCALE_FACTOR", "2"); +#endif QApplication app(argc, argv); XFormWidget xformWidget(nullptr); diff --git a/examples/widgets/painting/concentriccircles/main.cpp b/examples/widgets/painting/concentriccircles/main.cpp index d9fa2879c4..00456195d9 100644 --- a/examples/widgets/painting/concentriccircles/main.cpp +++ b/examples/widgets/painting/concentriccircles/main.cpp @@ -54,6 +54,9 @@ 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 1bf46b226f..cec6929827 100644 --- a/examples/widgets/painting/fontsampler/main.cpp +++ b/examples/widgets/painting/fontsampler/main.cpp @@ -54,6 +54,9 @@ 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/painting/gradients/main.cpp b/examples/widgets/painting/gradients/main.cpp index 0ddf7a4579..7ffb0326e9 100644 --- a/examples/widgets/painting/gradients/main.cpp +++ b/examples/widgets/painting/gradients/main.cpp @@ -55,6 +55,9 @@ int main(int argc, char *argv[]) { Q_INIT_RESOURCE(gradients); +#ifdef Q_OS_ANDROID + qputenv("QT_SCALE_FACTOR", "2"); +#endif QApplication app(argc, argv); diff --git a/examples/widgets/painting/pathstroke/main.cpp b/examples/widgets/painting/pathstroke/main.cpp index 57c85d73a3..35317480a3 100644 --- a/examples/widgets/painting/pathstroke/main.cpp +++ b/examples/widgets/painting/pathstroke/main.cpp @@ -55,6 +55,9 @@ int main(int argc, char **argv) { Q_INIT_RESOURCE(pathstroke); +#ifdef Q_OS_ANDROID + qputenv("QT_SCALE_FACTOR", "2"); +#endif QApplication app(argc, argv); diff --git a/examples/widgets/tools/undo/main.cpp b/examples/widgets/tools/undo/main.cpp index a5ec1b1b83..1a6dcf8c48 100644 --- a/examples/widgets/tools/undo/main.cpp +++ b/examples/widgets/tools/undo/main.cpp @@ -54,6 +54,9 @@ 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 a034bb262e..5f59d00ca6 100644 --- a/examples/widgets/widgets/calculator/main.cpp +++ b/examples/widgets/widgets/calculator/main.cpp @@ -54,6 +54,9 @@ 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 1c620c1d41..58507766e7 100644 --- a/examples/widgets/widgets/elidedlabel/main.cpp +++ b/examples/widgets/widgets/elidedlabel/main.cpp @@ -55,6 +55,9 @@ //! [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 1bf46b226f..cec6929827 100644 --- a/examples/widgets/widgets/scribble/main.cpp +++ b/examples/widgets/widgets/scribble/main.cpp @@ -54,6 +54,9 @@ 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 99725195e5..9bf18cb6d4 100644 --- a/examples/widgets/widgets/sliders/main.cpp +++ b/examples/widgets/widgets/sliders/main.cpp @@ -54,6 +54,9 @@ int main(int argc, char *argv[]) { +#ifdef Q_OS_ANDROID + QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); +#endif QApplication app(argc, argv); Window window; window.show(); -- cgit v1.2.3