Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: (217 commits)
  Fixed compile error in qwindowsurface_qws.cpp.
  Fixed regression introduced by 5842d19cf3dff37a85c.
  Remove DerivedSources.pro from WebKit.
  Support debuggable in the makefile build system
  QLabel documentation: add warning about sanitizing input
  runonphone: fix failure to terminate
  Fix license headers in new files from coda patch
  runonphone: command line args improperly passed to TRK after CODA patch
  Mark all Symbian debug binaries debuggable by default
  Preventing QSoftkeyManager giving false positive memory leaks
  Detect linked fonts by name (insead of via CLinkedTypeface* Api)
  Fixed memory leak in QMessageBox::setInformativeText in Symbian
  Revert "fix QFileInfo::isSymLink() for NTFS mount points"
  Fix typo for ifdef QT_NO_ACCESSIBILITY
  Call QAccessible::updateAccessibility when a widget is deleted
  Fix gamma corrected source color in GL
  Make macdeployqt more robust against usage of symbolic links.
  Memory leak fix in Symbian open file dialog
  Revert binary search in QTextEngine::findItem
  Runonphone with CODA support
  ...

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