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

Change-Id: I5d80d84d1fd9f52e7c8e4895cc34d4d29043f400

2 files changed, 47 insertions, 4 deletions

diff --git a/tests/auto/tools/uic/baseline/config.ui.py b/tests/auto/tools/uic/baseline/config.ui.py
index 531b3ce4f0..b3b6e09373 100644
--- a/tests/auto/tools/uic/baseline/config.ui.py
+++ b/tests/auto/tools/uic/baseline/config.ui.py
@@ -36,11 +36,11 @@
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################
 
-from PySide2.QtCore import (QCoreApplication, QMetaObject, QObject, QPoint,
-    QRect, QSize, QUrl, Qt)
+from PySide2.QtCore import (QCoreApplication, QDate, QDateTime, QMetaObject,
+    QObject, QPoint, QRect, QSize, QTime, QUrl, Qt)
 from PySide2.QtGui import (QBrush, QColor, QConicalGradient, QCursor, QFont,
-    QFontDatabase, QIcon, QLinearGradient, QPalette, QPainter, QPixmap,
-    QRadialGradient)
+    QFontDatabase, QIcon, QKeySequence, QLinearGradient, QPalette, QPainter,
+    QPixmap, QRadialGradient)
 from PySide2.QtWidgets import *
 
 from gammaview import GammaView
diff --git a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
index 3878e7ccb2..c934f8e27b 100644
--- a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
+++ b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
@@ -47,6 +47,7 @@
 #include <qtablewidget.h>
 #include <qscrollbar.h>
 #include <qboxlayout.h>
+#include <qstackedwidget.h>
 
 #include <qstandarditemmodel.h>
 #include <qstringlistmodel.h>
@@ -164,6 +165,7 @@ private slots:
     void task_QTBUG_56693_itemFontFromModel();
     void inputMethodUpdate();
     void task_QTBUG_52027_mapCompleterIndex();
+    void checkMenuItemPosWhenStyleSheetIsSet();
 
 private:
     PlatformInputContext m_platformInputContext;
@@ -3515,5 +3517,46 @@ void tst_QComboBox::task_QTBUG_52027_mapCompleterIndex()
     QCOMPARE(arguments.at(0).toInt(), 1);
 }
 
+void tst_QComboBox::checkMenuItemPosWhenStyleSheetIsSet()
+{
+    QString newCss = "QComboBox {font-size: 18pt;}";
+    QString oldCss = qApp->styleSheet();
+    qApp->setStyleSheet(newCss);
+
+    QWidget topLevel;
+    QVBoxLayout *layout = new QVBoxLayout(&topLevel);
+    QStackedWidget *stack = new QStackedWidget(&topLevel);
+    layout->addWidget(stack);
+    QWidget *container = new QWidget(&topLevel);
+    QHBoxLayout *cLayout = new QHBoxLayout(container);
+    QComboBox *cBox = new QComboBox;
+
+    QStandardItemModel *model = new QStandardItemModel(cBox);
+    QStandardItem *item = new QStandardItem(QStringLiteral("Item1"));
+    model->appendRow(item);
+    item = new QStandardItem(QStringLiteral("Item2"));
+    model->appendRow(item);
+    item = new QStandardItem(QStringLiteral("Item3"));
+    model->appendRow(item);
+    item = new QStandardItem(QStringLiteral("Item4"));
+    model->appendRow(item);
+    cBox->setModel(model);
+
+    cLayout->addWidget(cBox);
+    stack->addWidget(container);
+    topLevel.show();
+    cBox->showPopup();
+
+    QTRY_VERIFY(cBox->view());
+    QTRY_VERIFY(cBox->view()->isVisible());
+
+    int menuHeight = cBox->view()->geometry().height();
+    QRect menuItemRect = cBox->view()->visualRect(model->indexFromItem(item));
+
+    QCOMPARE(menuHeight, menuItemRect.y() + menuItemRect.height());
+
+    qApp->setStyleSheet(oldCss);
+}
+
 QTEST_MAIN(tst_QComboBox)
 #include "tst_qcombobox.moc"