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

2 files changed, 19 insertions, 7 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);