Merge remote-tracking branch 'origin/5.15' into dev

Change-Id: I99ee6f8b4bdc372437ee60d1feab931487fe55c4

7 files changed, 48 insertions, 13 deletions

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/affine/xform.cpp b/examples/widgets/painting/affine/xform.cpp
index 4e7cb91ce1..d7ed2125d2 100644
--- a/examples/widgets/painting/affine/xform.cpp
+++ b/examples/widgets/painting/affine/xform.cpp
@@ -787,8 +787,8 @@ XFormWidget::XFormWidget(QWidget *parent)
     view = new XFormView(this);
     view->setMinimumSize(200, 200);
 
-    QGroupBox *mainGroup = new QGroupBox(this);
-    mainGroup->setFixedWidth(180);
+    QWidget *mainContentWidget = new QWidget();
+    QGroupBox *mainGroup = new QGroupBox(mainContentWidget);
     mainGroup->setTitle(tr("Affine Transformations"));
 
     QGroupBox *rotateGroup = new QGroupBox(mainGroup);
@@ -837,10 +837,6 @@ XFormWidget::XFormWidget(QWidget *parent)
     whatsThisButton->setText(tr("What's This?"));
     whatsThisButton->setCheckable(true);
 
-    QHBoxLayout *viewLayout = new QHBoxLayout(this);
-    viewLayout->addWidget(view);
-    viewLayout->addWidget(mainGroup);
-
     QVBoxLayout *rotateGroupLayout = new QVBoxLayout(rotateGroup);
     rotateGroupLayout->addWidget(rotateSlider);
 
@@ -871,6 +867,20 @@ XFormWidget::XFormWidget(QWidget *parent)
 #endif
     mainGroupLayout->addWidget(whatsThisButton);
 
+    mainGroup->setLayout(mainGroupLayout);
+
+    QVBoxLayout *mainContentLayout = new QVBoxLayout();
+    mainContentLayout->addWidget(mainGroup);
+    mainContentWidget->setLayout(mainContentLayout);
+
+    QScrollArea *mainScrollArea = new QScrollArea();
+    mainScrollArea->setWidget(mainContentWidget);
+    mainScrollArea->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred);
+
+    QHBoxLayout *viewLayout = new QHBoxLayout(this);
+    viewLayout->addWidget(view);
+    viewLayout->addWidget(mainScrollArea);
+
     connect(rotateSlider, &QSlider::valueChanged, view, &XFormView::changeRotation);
     connect(shearSlider, &QSlider::valueChanged, view, &XFormView::changeShear);
     connect(scaleSlider, &QSlider::valueChanged, view, &XFormView::changeScale);
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/gradients.cpp b/examples/widgets/painting/gradients/gradients.cpp
index d62ae93a15..cb1a0177e9 100644
--- a/examples/widgets/painting/gradients/gradients.cpp
+++ b/examples/widgets/painting/gradients/gradients.cpp
@@ -282,7 +282,8 @@ GradientWidget::GradientWidget(QWidget *parent)
 
     m_renderer = new GradientRenderer(this);
 
-    QGroupBox *mainGroup = new QGroupBox(this);
+    QWidget *mainContentWidget = new QWidget();
+    QGroupBox *mainGroup = new QGroupBox(mainContentWidget);
     mainGroup->setTitle(tr("Gradients"));
 
     QGroupBox *editorGroup = new QGroupBox(mainGroup);
@@ -327,11 +328,6 @@ GradientWidget::GradientWidget(QWidget *parent)
     whatsThisButton->setText(tr("What's This?"));
     whatsThisButton->setCheckable(true);
 
-    // Layouts
-    QHBoxLayout *mainLayout = new QHBoxLayout(this);
-    mainLayout->addWidget(m_renderer);
-    mainLayout->addWidget(mainGroup);
-
     mainGroup->setFixedWidth(200);
     QVBoxLayout *mainGroupLayout = new QVBoxLayout(mainGroup);
     mainGroupLayout->addWidget(editorGroup);
@@ -370,6 +366,21 @@ GradientWidget::GradientWidget(QWidget *parent)
     defaultsGroupLayout->addWidget(default3Button);
     editorGroupLayout->addWidget(default4Button);
 
+    mainGroup->setLayout(mainGroupLayout);
+
+    QVBoxLayout *mainContentLayout = new QVBoxLayout();
+    mainContentLayout->addWidget(mainGroup);
+    mainContentWidget->setLayout(mainContentLayout);
+
+    QScrollArea *mainScrollArea = new QScrollArea();
+    mainScrollArea->setWidget(mainContentWidget);
+    mainScrollArea->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred);
+
+    // Layouts
+    QHBoxLayout *mainLayout = new QHBoxLayout(this);
+    mainLayout->addWidget(m_renderer);
+    mainLayout->addWidget(mainScrollArea);
+
     connect(m_editor, &GradientEditor::gradientStopsChanged,
             m_renderer, &GradientRenderer::setGradientStops);
     connect(m_linearButton, &QRadioButton::clicked,
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);