whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix QComboBox icon testing 

The icons used were always null -- the files used to create them were
not present. So

1) add back the files used for the test (qtlogo.png,
copied from src/widgets/dialogs/images/qtlogo-64.png, and qtlogoinverted.png,
its copy rotated by 180°);

2) use QFINDTESTDATA to get the paths to the files.

Change-Id: I26f094079e037116e49e2a95345c2dea7496eecb
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
bb10
Giuseppe D'Angelo 2012-10-13 19:15:17 +01:00 committed by The Qt Project
parent f7241e8cb9
commit 8f79ab3549
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
tests/auto/widgets/widgets/qcombobox/qtlogo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
tests/auto/widgets/widgets/qcombobox/qtlogoinverted.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB

6
tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
View File

@ -1282,6 +1282,8 @@ void tst_QComboBox::textpixmapdata_data()
QStringList text;
IconList icon;
VariantList variant;
QString qtlogoPath = QFINDTESTDATA("qtlogo.png");
QString qtlogoinvertedPath = QFINDTESTDATA("qtlogoinverted.png");
{
text.clear(); icon.clear(); variant.clear();
@ -1293,7 +1295,7 @@ void tst_QComboBox::textpixmapdata_data()
{
text.clear(); icon.clear(); variant.clear();
text << QString() << QString();
icon << QIcon(QPixmap("qtlogo.png")) << QIcon(QPixmap("qtlogoinverted.png"));
icon << QIcon(QPixmap(qtlogoPath)) << QIcon(QPixmap(qtlogoinvertedPath));
variant << QVariant() << QVariant();
QTest::newRow("just icons") << text << icon << variant;
}
@ -1307,7 +1309,7 @@ void tst_QComboBox::textpixmapdata_data()
{
text.clear(); icon.clear(); variant.clear();
text << "foo" << "bar";
icon << QIcon(QPixmap("qtlogo.png")) << QIcon(QPixmap("qtlogoinverted.png"));
icon << QIcon(QPixmap(qtlogoPath)) << QIcon(QPixmap(qtlogoinvertedPath));
variant << 12 << "bingo";
QTest::newRow("text, icons and user data") << text << icon << variant;
}