diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-08-08 13:26:30 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-08-08 13:26:30 (GMT) |
| commit | e28e1f919cdc2b82c45b2a5ceee7a9261e70433d (patch) | |
| tree | 31e2cf533867b86545b509dd7ee472182a4527f3 /src/gui/image/qimage.h | |
| parent | 74b7d4c2c4036e9f2c0da7f0eaad06cef954b923 (diff) | |
| parent | 82a18deee74bef3e545bf6426164dbe12548e5d9 (diff) | |
| download | Qt-e28e1f919cdc2b82c45b2a5ceee7a9261e70433d.zip Qt-e28e1f919cdc2b82c45b2a5ceee7a9261e70433d.tar.gz Qt-e28e1f919cdc2b82c45b2a5ceee7a9261e70433d.tar.bz2 | |
Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/gui/image/qimage.h')
| -rw-r--r-- | src/gui/image/qimage.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/gui/image/qimage.h b/src/gui/image/qimage.h index c783b76..2aeb3de 100644 --- a/src/gui/image/qimage.h +++ b/src/gui/image/qimage.h @@ -275,12 +275,13 @@ public: QString text(const QString &key = QString()) const; void setText(const QString &key, const QString &value); - // The following functions are obsolete as of 4.1 - QString text(const char* key, const char* lang=0) const; - QList<QImageTextKeyLang> textList() const; - QStringList textLanguages() const; - QString text(const QImageTextKeyLang&) const; - void setText(const char* key, const char* lang, const QString&); +#ifdef QT_DEPRECATED + QT_DEPRECATED QString text(const char* key, const char* lang=0) const; + QT_DEPRECATED QList<QImageTextKeyLang> textList() const; + QT_DEPRECATED QStringList textLanguages() const; + QT_DEPRECATED QString text(const QImageTextKeyLang&) const; + QT_DEPRECATED void setText(const char* key, const char* lang, const QString&); +#endif #endif #ifdef QT3_SUPPORT |