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>

2 files changed, 2 insertions, 2 deletions

diff --git a/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp b/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp
index 50ae22c530..7ca4fc981b 100644
--- a/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp
+++ b/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp
@@ -2938,7 +2938,7 @@ void tst_QTextDocumentFragment::backgroundImage()
     doc.setHtml("<p style=\"background-image: url(testPixmap)\">Hello</p>");
     QBrush bg = doc.begin().blockFormat().background();
     QVERIFY(bg.style() == Qt::TexturePattern);
-    QVERIFY(bg.texture().serialNumber() == doc.testPixmap.serialNumber());
+    QCOMPARE(bg.texture().cacheKey(), doc.testPixmap.cacheKey());
 }
 
 void tst_QTextDocumentFragment::dontMergePreAndNonPre()
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());