From 80bc39a4560577f1c9d5e6dc0068a7d241c29aec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= <samuel.rodal@nokia.com>
Date: Fri, 15 Jul 2011 12:45:35 +0200
Subject: Fixed regression in compilerwarnings.

We can't mark QImageTextKeyLang as deprecated.
---
 src/gui/image/qimage.h | 4 +---
 1 file changed, 1 insertion(+), 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
 
 
-- 
cgit v0.12