summaryrefslogtreecommitdiffstats
path: root/tests/auto/widgets/widgets
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@woboq.com>2012-02-25 12:40:20 +0100
committerQt by Nokia <qt-info@nokia.com>2012-02-26 02:23:01 +0100
commitddf4b378f1e7eac62bd504a1e453cb7b894e21f2 (patch)
treeb9060a30ec5e656eeaabb996416afb18f27ae315 /tests/auto/widgets/widgets
parentc951908bc201afa59402967d50fa926212845fae (diff)
Inline and mark as deprecated images's serialNumber()
These function are marked as obsolete since Qt 4.3 The motivation here was too fix QPixmap::serialNumber which is marked as QT_DEPRECATED_SINCE but was not inlined. But then I took the oportunity to do the same with all the other functions. Change-Id: Ic50a7857461fc402b2f2b4528c83e53e8e28ea30 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'tests/auto/widgets/widgets')
-rw-r--r--tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
index 907a239912..7cc043e247 100644
--- a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
+++ b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
@@ -1333,7 +1333,7 @@ void tst_QComboBox::textpixmapdata()
for (int i = 0; i<text.count(); ++i) {
QIcon icon = testWidget->itemIcon(i);
- QVERIFY(icon.serialNumber() == icons.at(i).serialNumber());
+ QCOMPARE(icon.cacheKey(), icons.at(i).cacheKey());
QPixmap original = icons.at(i).pixmap(1024);
QPixmap pixmap = icon.pixmap(1024);
QVERIFY(pixmap.toImage() == original.toImage());