diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2012-02-25 12:40:20 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-26 02:23:01 +0100 |
| commit | ddf4b378f1e7eac62bd504a1e453cb7b894e21f2 (patch) | |
| tree | b9060a30ec5e656eeaabb996416afb18f27ae315 /src/gui/kernel/qpalette.h | |
| parent | c951908bc201afa59402967d50fa926212845fae (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 'src/gui/kernel/qpalette.h')
| -rw-r--r-- | src/gui/kernel/qpalette.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/kernel/qpalette.h b/src/gui/kernel/qpalette.h index cc710fa67a..ca619a89b4 100644 --- a/src/gui/kernel/qpalette.h +++ b/src/gui/kernel/qpalette.h @@ -139,7 +139,9 @@ public: inline bool operator!=(const QPalette &p) const { return !(operator==(p)); } bool isCopyOf(const QPalette &p) const; - int serialNumber() const; +#if QT_DEPRECATED_SINCE(5, 0) + QT_DEPRECATED inline int serialNumber() const { return cacheKey() >> 32; } +#endif qint64 cacheKey() const; QPalette resolve(const QPalette &) const; |