summaryrefslogtreecommitdiffstats
path: root/src/gui/image
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/image')
-rw-r--r--src/gui/image/qimage.h13
-rw-r--r--src/gui/image/qpixmap.h2
2 files changed, 8 insertions, 7 deletions
diff --git a/src/gui/image/qimage.h b/src/gui/image/qimage.h
index 55f1e0d379..b805a3297f 100644
--- a/src/gui/image/qimage.h
+++ b/src/gui/image/qimage.h
@@ -70,7 +70,7 @@ struct QImageData;
class QImageDataMisc; // internal
#ifndef QT_NO_IMAGE_TEXT
#if QT_DEPRECATED_SINCE(5, 0)
-class Q_GUI_EXPORT QImageTextKeyLang {
+class QT_DEPRECATED QImageTextKeyLang {
public:
QImageTextKeyLang(const char* k, const char* l) : key(k), lang(l) { }
QImageTextKeyLang() { }
@@ -270,11 +270,11 @@ public:
void setText(const QString &key, const QString &value);
#if QT_DEPRECATED_SINCE(5, 0)
- inline QString text(const char* key, const char* lang=0) const;
- inline QList<QImageTextKeyLang> textList() const;
- inline QStringList textLanguages() const;
- inline QString text(const QImageTextKeyLang&) const;
- inline void setText(const char* key, const char* lang, const QString&);
+ QT_DEPRECATED inline QString text(const char* key, const char* lang=0) const;
+ QT_DEPRECATED inline QList<QImageTextKeyLang> textList() const;
+ QT_DEPRECATED inline QStringList textLanguages() const;
+ QT_DEPRECATED inline QString text(const QImageTextKeyLang&) const;
+ QT_DEPRECATED inline void setText(const char* key, const char* lang, const QString&);
#endif
#endif
@@ -382,6 +382,7 @@ inline void QImage::setText(const char* key, const char* lang, const QString &s)
setText(k, s);
}
#endif
+
inline int QImage::numColors() const
{
return colorCount();
diff --git a/src/gui/image/qpixmap.h b/src/gui/image/qpixmap.h
index a3844ca3ff..de76321f0a 100644
--- a/src/gui/image/qpixmap.h
+++ b/src/gui/image/qpixmap.h
@@ -145,7 +145,7 @@ public:
inline void scroll(int dx, int dy, int x, int y, int width, int height, QRegion *exposed = 0);
void scroll(int dx, int dy, const QRect &rect, QRegion *exposed = 0);
-#ifdef QT_DEPRECATED
+#if QT_DEPRECATED_SINCE(5, 0)
QT_DEPRECATED int serialNumber() const;
#endif
qint64 cacheKey() const;