summaryrefslogtreecommitdiffstats
path: root/src/gui/image/qimage.h
diff options
context:
space:
mode:
authorSamuel Rødal <samuel.rodal@nokia.com>2011-07-15 10:45:35 (GMT)
committerSamuel Rødal <samuel.rodal@nokia.com>2011-07-15 10:46:28 (GMT)
commit80bc39a4560577f1c9d5e6dc0068a7d241c29aec (patch)
tree710198840d8ccb0b7bc565f975034c024a53113a /src/gui/image/qimage.h
parent13d58a14da191cf7a5cdccc7a3d27dcf2309a928 (diff)
downloadQt-80bc39a4560577f1c9d5e6dc0068a7d241c29aec.zip
Qt-80bc39a4560577f1c9d5e6dc0068a7d241c29aec.tar.gz
Qt-80bc39a4560577f1c9d5e6dc0068a7d241c29aec.tar.bz2
Fixed regression in compilerwarnings.
We can't mark QImageTextKeyLang as deprecated.
Diffstat (limited to 'src/gui/image/qimage.h')
-rw-r--r--src/gui/image/qimage.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/gui/image/qimage.h b/src/gui/image/qimage.h
index 57d7169..2aeb3de 100644
--- a/src/gui/image/qimage.h
+++ b/src/gui/image/qimage.h
@@ -66,8 +66,7 @@ template <class T> class QVector;
struct QImageData;
class QImageDataMisc; // internal
#ifndef QT_NO_IMAGE_TEXT
-#ifdef QT_DEPRECATED
-class Q_GUI_EXPORT QT_DEPRECATED QImageTextKeyLang {
+class Q_GUI_EXPORT QImageTextKeyLang {
public:
QImageTextKeyLang(const char* k, const char* l) : key(k), lang(l) { }
QImageTextKeyLang() { }
@@ -82,7 +81,6 @@ public:
inline bool operator!= (const QImageTextKeyLang &other) const
{ return !operator==(other); }
};
-#endif
#endif //QT_NO_IMAGE_TEXT