AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tst_qgraphicswidget: Avoid redeclaration of Size from MacTypes.h

Browse Source 
If an included header brings in MacTypes.h it will cause issues,
so rename the enum to be on the safe side.

Pick-to: 6.4 6.3 6.2
Change-Id: I29ec795be74a65d4f2267d8121a514bf192cf969
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Tor Arne Vestbø 2022-08-19 14:50:17 +02:00
parent 3053df3366
commit 1ecfc4101c
1 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
View File

@ -1840,7 +1840,7 @@ enum WhichSize {
MinimumSizeHint,
PreferredSizeHint,
MaximumSizeHint,
Size,
WidgetSize,
None,
};
@ -1855,48 +1855,48 @@ void tst_QGraphicsWidget::setSizes_data()
QTest::addColumn<QList<Inst>>("compareInstructions");
QTest::newRow("minSize1") << (QList<Inst>()
<< Inst(Size, QSize(25, 25)) << Inst(MinimumSize, QSize(10, 10)))
<< (QList<Inst>() << Inst(Size, QSize(25, 25)));
QTest::newRow("minSize2") << (QList<Inst>() << Inst(Size, QSizeF(20, 20))
<< Inst(WidgetSize, QSize(25, 25)) << Inst(MinimumSize, QSize(10, 10)))
<< (QList<Inst>() << Inst(WidgetSize, QSize(25, 25)));
QTest::newRow("minSize2") << (QList<Inst>() << Inst(WidgetSize, QSizeF(20, 20))
<< Inst(MinimumSize, QSizeF(25, 25)))
<< (QList<Inst>() << Inst(Size, QSizeF(25, 25)));
<< (QList<Inst>() << Inst(WidgetSize, QSizeF(25, 25)));
QTest::newRow("minWidth1") << (QList<Inst>()
<< Inst(Size, QSizeF(20, 20)) << Inst(MinimumWidth, 5.0))
<< (QList<Inst>() << Inst(Size, QSizeF(20, 20)));
<< Inst(WidgetSize, QSizeF(20, 20)) << Inst(MinimumWidth, 5.0))
<< (QList<Inst>() << Inst(WidgetSize, QSizeF(20, 20)));
QTest::newRow("minWidth2") << (QList<Inst>()
<< Inst(Size, QSizeF(20, 20)) << Inst(MinimumWidth, 25.0))
<< (QList<Inst>() << Inst(Size, QSizeF(25, 20)));
<< Inst(WidgetSize, QSizeF(20, 20)) << Inst(MinimumWidth, 25.0))
<< (QList<Inst>() << Inst(WidgetSize, QSizeF(25, 20)));
QTest::newRow("minHeight1") << (QList<Inst>()
<< Inst(Size, QSizeF(20, 20)) << Inst(MinimumHeight, 5.0))
<< (QList<Inst>() << Inst(Size, QSizeF(20, 20)));
<< Inst(WidgetSize, QSizeF(20, 20)) << Inst(MinimumHeight, 5.0))
<< (QList<Inst>() << Inst(WidgetSize, QSizeF(20, 20)));
QTest::newRow("minHeight2") << (QList<Inst>()
<< Inst(Size, QSizeF(20, 20)) << Inst(MinimumHeight, 25.0))
<< (QList<Inst>() << Inst(Size, QSizeF(20, 25)));
QTest::newRow("maxSize1") << (QList<Inst>() << Inst(Size, QSizeF(40, 40))
<< Inst(WidgetSize, QSizeF(20, 20)) << Inst(MinimumHeight, 25.0))
<< (QList<Inst>() << Inst(WidgetSize, QSizeF(20, 25)));
QTest::newRow("maxSize1") << (QList<Inst>() << Inst(WidgetSize, QSizeF(40, 40))
<< Inst(MaximumSize, QSizeF(30, 30)))
<< (QList<Inst>() << Inst(Size, QSizeF(30, 30)));
QTest::newRow("maxSize2") << (QList<Inst>() << Inst(Size, QSizeF(40, 40))
<< (QList<Inst>() << Inst(WidgetSize, QSizeF(30, 30)));
QTest::newRow("maxSize2") << (QList<Inst>() << Inst(WidgetSize, QSizeF(40, 40))
<< Inst(MaximumSize, QSizeF(30, -1)))
<< (QList<Inst>() << Inst(Size, QSizeF(30, 40)));
QTest::newRow("maxSize3") << (QList<Inst>() << Inst(Size, QSizeF(40, 40))
<< (QList<Inst>() << Inst(WidgetSize, QSizeF(30, 40)));
QTest::newRow("maxSize3") << (QList<Inst>() << Inst(WidgetSize, QSizeF(40, 40))
<< Inst(MaximumSize, QSizeF(-1, 30)))
<< (QList<Inst>() << Inst(Size, QSizeF(40, 30)));
<< (QList<Inst>() << Inst(WidgetSize, QSizeF(40, 30)));
QTest::newRow("maxWidth1") << (QList<Inst>()
<< Inst(Size, QSizeF(40, 40)) << Inst(MaximumWidth, 30))
<< (QList<Inst>() << Inst(Size, QSizeF(30, 40)));
<< Inst(WidgetSize, QSizeF(40, 40)) << Inst(MaximumWidth, 30))
<< (QList<Inst>() << Inst(WidgetSize, QSizeF(30, 40)));
QTest::newRow("maxHeight") << (QList<Inst>()
<< Inst(Size, QSizeF(40, 40)) << Inst(MaximumHeight, 20))
<< (QList<Inst>() << Inst(Size, QSizeF(40, 20)));
QTest::newRow("unsetMinSize") << (QList<Inst>() << Inst(Size, QSizeF(40, 40))
<< Inst(WidgetSize, QSizeF(40, 40)) << Inst(MaximumHeight, 20))
<< (QList<Inst>() << Inst(WidgetSize, QSizeF(40, 20)));
QTest::newRow("unsetMinSize") << (QList<Inst>() << Inst(WidgetSize, QSizeF(40, 40))
<< Inst(MinimumSize, QSizeF(-1, -1)))
<< (QList<Inst>() << Inst(MinimumSize, QSizeF(5, 5)));
QTest::newRow("unsetMaxSize") << (QList<Inst>() << Inst(Size, QSizeF(40, 40))
QTest::newRow("unsetMaxSize") << (QList<Inst>() << Inst(WidgetSize, QSizeF(40, 40))
<< Inst(MaximumSize, QSizeF(-1, -1)))
<< (QList<Inst>() << Inst(MaximumSize, QSizeF(500, 500)));
QTest::newRow("unsetMinSize, expand size to minimumSizeHint")
<< (QList<Inst>() << Inst(MinimumSize, QSize(0, 0)) << Inst(Size, QSize(1, 1))
<< (QList<Inst>() << Inst(MinimumSize, QSize(0, 0)) << Inst(WidgetSize, QSize(1, 1))
<< Inst(MinimumSize, QSize(-1.0, -1.0)))
<< (QList<Inst>() << Inst(Size, QSize(5, 5)) << Inst(MinimumSize, QSize(5, 5)));
<< (QList<Inst>() << Inst(WidgetSize, QSize(5, 5)) << Inst(MinimumSize, QSize(5, 5)));
}
void tst_QGraphicsWidget::setSizes()
@ -1926,7 +1926,7 @@ void tst_QGraphicsWidget::setSizes()
case MaximumSize:
max = input.second.toSizeF();
break;
case Size:
case WidgetSize :
widget->resize(input.second.toSizeF());
break;
case MinimumWidth:
@ -1978,7 +1978,7 @@ void tst_QGraphicsWidget::setSizes()
case MaximumSize:
QTRY_COMPARE(widget->maximumSize(), input.second.toSizeF());
break;
case Size:
case WidgetSize:
QTRY_COMPARE(widget->size(), input.second.toSizeF());
break;
case MinimumWidth: