From 8f79ab354956119810490a18a1471141025a6db2 Mon Sep 17 00:00:00 2001 From: Giuseppe D'Angelo Date: Sat, 13 Oct 2012 19:15:17 +0100 Subject: [PATCH] Fix QComboBox icon testing MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Rohan McGovern --- tests/auto/widgets/widgets/qcombobox/qtlogo.png | Bin 0 -> 2991 bytes tests/auto/widgets/widgets/qcombobox/qtlogoinverted.png | Bin 0 -> 2827 bytes tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp | 6 ++++-- 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 tests/auto/widgets/widgets/qcombobox/qtlogo.png create mode 100644 tests/auto/widgets/widgets/qcombobox/qtlogoinverted.png diff --git a/tests/auto/widgets/widgets/qcombobox/qtlogo.png b/tests/auto/widgets/widgets/qcombobox/qtlogo.png new file mode 100644 index 0000000000000000000000000000000000000000..4f68e162de4295f123c6979c0f6f422031bc5603 GIT binary patch literal 2991 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 literal 0 HcmV?d00001 diff --git a/tests/auto/widgets/widgets/qcombobox/qtlogoinverted.png b/tests/auto/widgets/widgets/qcombobox/qtlogoinverted.png new file mode 100644 index 0000000000000000000000000000000000000000..61efb2f001999cf95c7d2e28b06725df18b29ee4 GIT binary patch literal 2827 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 literal 0 HcmV?d00001 diff --git a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp index 6dfb362..6016a19 100644 --- a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp +++ b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp @@ -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; } -- 2.7.4