1 files changed, 29 insertions, 4 deletions
diff --git a/tests/auto/widgets/kernel/qtooltip/tst_qtooltip.cpp b/tests/auto/widgets/kernel/qtooltip/tst_qtooltip.cpp
index b959d8982f..bc0624c9ab 100644
--- a/tests/auto/widgets/kernel/qtooltip/tst_qtooltip.cpp
+++ b/tests/auto/widgets/kernel/qtooltip/tst_qtooltip.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 
 #include <QTest>
@@ -26,6 +26,7 @@ private slots:
     void setPalette();
     void qtbug64550_stylesheet();
     void dontCrashOutsideScreenGeometry();
+    void marginSetWithStyleSheet();
 };
 
 void tst_QToolTip::init()
@@ -97,7 +98,6 @@ void tst_QToolTip::keyEvent()
     widget.setWindowTitle(QLatin1String(QTest::currentTestFunction())
                           + QLatin1Char(' ') + QLatin1String(QTest::currentDataTag()));
     widget.show();
-    QApplicationPrivate::setActiveWindow(&widget);
     QVERIFY(QTest::qWaitForWindowActive(&widget));
 
     widget.showDelayedToolTip(100);
@@ -117,7 +117,8 @@ void tst_QToolTip::keyEvent()
 
 static QWidget *findWhatsThat()
 {
-    foreach (QWidget *widget, QApplication::topLevelWidgets()) {
+    const auto widgets = QApplication::topLevelWidgets();
+    for (QWidget *widget : widgets) {
         if (widget->inherits("QWhatsThat"))
             return widget;
     }
@@ -191,7 +192,6 @@ void tst_QToolTip::qtbug64550_stylesheet()
     Widget widget;
     widget.setStyleSheet(QStringLiteral("* { font-size: 48pt; }\n"));
     widget.show();
-    QApplicationPrivate::setActiveWindow(&widget);
     QVERIFY(QTest::qWaitForWindowActive(&widget));
 
     widget.showDelayedToolTip(100);
@@ -213,5 +213,30 @@ void tst_QToolTip::dontCrashOutsideScreenGeometry() {
     QToolTip::hideText();
 }
 
+void tst_QToolTip::marginSetWithStyleSheet()
+{
+    const char *toolTipText = "Test Tool Tip";
+
+    qApp->setStyleSheet("QToolTip {font-size: 8px; margin: 5px;}");
+    QToolTip::showText(QGuiApplication::primaryScreen()->availableGeometry().topLeft(), toolTipText);
+    QTRY_VERIFY(QToolTip::isVisible());
+    QWidget *toolTip = findToolTip();
+    QVERIFY(toolTip);
+    QTRY_VERIFY(toolTip->isVisible());
+    int toolTipHeight = toolTip->size().height();
+    qApp->setStyleSheet(QString());
+    QToolTip::hideText();
+
+    qApp->setStyleSheet("QToolTip {font-size: 8px; margin: 10px;}");
+    QToolTip::showText(QGuiApplication::primaryScreen()->availableGeometry().topLeft(), toolTipText);
+    QTRY_VERIFY(QToolTip::isVisible());
+    toolTip = findToolTip();
+    QVERIFY(toolTip);
+    QTRY_VERIFY(toolTip->isVisible());
+    QCOMPARE_LE(toolTip->size().height(), toolTipHeight + 10);
+    qApp->setStyleSheet(QString());
+    QToolTip::hideText();
+}
+
 QTEST_MAIN(tst_QToolTip)
 #include "tst_qtooltip.moc"