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

Change-Id: I01dfc41e18333ac55954296cef8f01475adab27e

3 files changed, 21 insertions, 4 deletions

diff --git a/tests/manual/windowflags/controllerwindow.cpp b/tests/manual/windowflags/controllerwindow.cpp
index 4b380d5355..6334ea588f 100644
--- a/tests/manual/windowflags/controllerwindow.cpp
+++ b/tests/manual/windowflags/controllerwindow.cpp
@@ -59,7 +59,7 @@ ControllerWidget::ControllerWidget(QWidget *parent)
     QLabel *label = new QLabel(tr("Parent window"));
     parentWindow->setCentralWidget(label);
 
-    previewWindow = new QWindow;
+    previewWindow = new PreviewWindow;
     previewWindow->installEventFilter(this);
     previewWidget = new PreviewWidget;
     previewWidget->installEventFilter(this);
@@ -123,8 +123,8 @@ void ControllerWidget::updatePreview(QWindow *preview)
     preview->setFlags(flags);
 
     if (fixedSizeWindowCheckBox->isChecked()) {
-        preview->setMinimumSize(QSize(300, 300));
-        preview->setMaximumSize(QSize(300, 300));
+        preview->setMinimumSize(preview->size());
+        preview->setMaximumSize(preview->size());
     } else {
         preview->setMinimumSize(QSize(0, 0));
         preview->setMaximumSize(QSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX));
@@ -153,7 +153,7 @@ void ControllerWidget::updatePreview(QWidget *preview)
     preview->setWindowFlags(flags);
 
     QSize fixedSize = fixedSizeWindowCheckBox->isChecked() ?
-        QSize(300, 300) : QSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX);
+        preview->size() : QSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX);
     preview->setFixedSize(fixedSize);
 
     QPoint pos = preview->pos();
diff --git a/tests/manual/windowflags/previewwindow.cpp b/tests/manual/windowflags/previewwindow.cpp
index 19473c9eee..ef3966830b 100644
--- a/tests/manual/windowflags/previewwindow.cpp
+++ b/tests/manual/windowflags/previewwindow.cpp
@@ -32,9 +32,20 @@
 #include <QVBoxLayout>
 #include <QTextStream>
 #include <QTimer>
+#include <QPainter>
+#include <QLinearGradient>
 
 #include "previewwindow.h"
 
+void PreviewWindow::paintEvent(QPaintEvent *event)
+{
+    QPainter painter(this);
+    QLinearGradient gradient(0, 0, width(), height());
+    gradient.setColorAt(0, QColor("#64b3f4"));
+    gradient.setColorAt(1, QColor("#c2e59c"));
+    painter.fillRect(QRect(0, 0, width(), height()), gradient);
+}
+
 static void formatWindowFlags(QTextStream &str, Qt::WindowFlags flags)
 {
     str << "Window flags: " << hex << showbase << unsigned(flags) << noshowbase << dec << ' ';
diff --git a/tests/manual/windowflags/previewwindow.h b/tests/manual/windowflags/previewwindow.h
index 023ddd910c..8f8fc39211 100644
--- a/tests/manual/windowflags/previewwindow.h
+++ b/tests/manual/windowflags/previewwindow.h
@@ -30,11 +30,17 @@
 #define PREVIEWWINDOW_H
 
 #include <QDialog>
+#include <QRasterWindow>
 
 QT_BEGIN_NAMESPACE
 class QPlainTextEdit;
 QT_END_NAMESPACE
 
+class PreviewWindow : public QRasterWindow
+{
+    void paintEvent(QPaintEvent *event);
+};
+
 class PreviewWidget : public QWidget
 {
     Q_OBJECT