From ba0d515330d1127baeec6f21ca476d37574f4e21 Mon Sep 17 00:00:00 2001
From: Sergio Martins <sergio.martins@kdab.com>
Date: Sun, 2 May 2021 00:19:47 +0100
Subject: [PATCH] qtquick: Don't run tst_maxSizedFloatingWindow

We only support max-size constraints for QtWidgets, for now.
---
 tests/tst_docks.cpp | 96 ++++++++++++++++++++++-----------------------
 tests/tst_docks.h   |  2 +-
 2 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/tests/tst_docks.cpp b/tests/tst_docks.cpp
index ea6aa4bc..41ea1ecd 100644
--- a/tests/tst_docks.cpp
+++ b/tests/tst_docks.cpp
@@ -5474,6 +5474,54 @@ void TestDocks::tst_maxSizePropagates()
     delete dock1->window();
 }
 
+void TestDocks::tst_maxSizedFloatingWindow()
+{
+    // Tests that FloatingWindows get a proper max-size, if its dock widget has one
+    EnsureTopLevelsDeleted e;
+    auto dock1 = new DockWidgetType("dock1");
+    auto dock2 = new DockWidgetType("dock2");
+    auto w = new MyWidget("foo");
+    w->setMinimumSize(120, 100);
+    w->setMaximumSize(300, 300);
+    dock1->setWidget(w);
+
+    dock1->show();
+    dock2->show();
+
+    auto window1 = dock1->window();
+    auto window2 = dock2->window();
+    Testing::waitForEvent(window1, QEvent::LayoutRequest);
+
+    QVERIFY(window1->maximumSize().width() < 500);
+    QVERIFY(window1->maximumSize().height() < 500);
+    QVERIFY(window2->maximumSize().width() > 500);
+    QVERIFY(window2->maximumSize().height() > 500);
+
+    auto hasMax = [window1] {
+        const QSize max = window1->maximumSize();
+        return max.width() < 500 && max.height() < 500;
+    };
+
+    // Adding side-by-side, we don't honour max size (yet)
+    dock1->addDockWidgetToContainingWindow(dock2, Location_OnBottom);
+    Testing::waitForEvent(window1, QEvent::LayoutRequest);
+    QVERIFY(window1->maximumSize().width() > 500);
+    QVERIFY(window1->maximumSize().height() > 500);
+
+    // Close dw2, we have a single dock widget again, we honour max-size
+    dock2->close();
+    Testing::waitForEvent(window1, QEvent::LayoutRequest);
+    QVERIFY(hasMax());
+
+    dock1->addDockWidgetAsTab(dock2);
+    Testing::waitForEvent(window1, QEvent::LayoutRequest);
+    QVERIFY(!hasMax());
+
+    dock2->close();
+    Testing::waitForEvent(window1, QEvent::LayoutRequest);
+    QVERIFY(hasMax());
+}
+
 void TestDocks::tst_maxSizeHonouredWhenAnotherDropped()
 {
     // dock1 is docked, and has small max-height.
@@ -6267,54 +6315,6 @@ void TestDocks::tst_flagDoubleClick()
     }
 }
 
-void TestDocks::tst_maxSizedFloatingWindow()
-{
-    // Tests that FloatingWindows get a proper max-size, if its dock widget has one
-    EnsureTopLevelsDeleted e;
-    auto dock1 = new DockWidgetType("dock1");
-    auto dock2 = new DockWidgetType("dock2");
-    auto w = new MyWidget("foo");
-    w->setMinimumSize(120, 100);
-    w->setMaximumSize(300, 300);
-    dock1->setWidget(w);
-
-    dock1->show();
-    dock2->show();
-
-    auto window1 = dock1->window();
-    auto window2 = dock2->window();
-    Testing::waitForEvent(window1, QEvent::LayoutRequest);
-
-    QVERIFY(window1->maximumSize().width() < 500);
-    QVERIFY(window1->maximumSize().height() < 500);
-    QVERIFY(window2->maximumSize().width() > 500);
-    QVERIFY(window2->maximumSize().height() > 500);
-
-    auto hasMax = [window1] {
-        const QSize max = window1->maximumSize();
-        return max.width() < 500 && max.height() < 500;
-    };
-
-    // Adding side-by-side, we don't honour max size (yet)
-    dock1->addDockWidgetToContainingWindow(dock2, Location_OnBottom);
-    Testing::waitForEvent(window1, QEvent::LayoutRequest);
-    QVERIFY(window1->maximumSize().width() > 500);
-    QVERIFY(window1->maximumSize().height() > 500);
-
-    // Close dw2, we have a single dock widget again, we honour max-size
-    dock2->close();
-    Testing::waitForEvent(window1, QEvent::LayoutRequest);
-    QVERIFY(hasMax());
-
-    dock1->addDockWidgetAsTab(dock2);
-    Testing::waitForEvent(window1, QEvent::LayoutRequest);
-    QVERIFY(!hasMax());
-
-    dock2->close();
-    Testing::waitForEvent(window1, QEvent::LayoutRequest);
-    QVERIFY(hasMax());
-}
-
 void TestDocks::tst_maxSizedHonouredAfterRemoved()
 {
     EnsureTopLevelsDeleted e;
diff --git a/tests/tst_docks.h b/tests/tst_docks.h
index 3708c93f..3804253b 100644
--- a/tests/tst_docks.h
+++ b/tests/tst_docks.h
@@ -204,7 +204,6 @@ private Q_SLOTS:
     void tst_titlebar_getter();
     void tst_raise();
     void tst_addingOptionHiddenTabbed();
-    void tst_maxSizedFloatingWindow();
     void tst_maxSizedHonouredAfterRemoved();
     void tst_addDockWidgetAsTabToDockWidget();
     void tst_close();
@@ -262,6 +261,7 @@ private Q_SLOTS:
     void tst_minSizeChanges();
     void tst_maxSizePropagates();
     void tst_maxSizePropagates2();
+    void tst_maxSizedFloatingWindow();
     void tst_restoreResizesLayout();
     void tst_restoreNonRelativeFloatingWindowGeometry();
     void tst_maxSizeHonouredWhenDropped();