From 6a5aebd47fca17663074c323795e37f3581154c2 Mon Sep 17 00:00:00 2001
From: David Boddie <david.boddie@nokia.com>
Date: Fri, 19 Nov 2010 19:04:23 +0100
Subject: Improved translation support, using the application object if
 possible.

---
 tools/qdoc3/tr.h | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/tools/qdoc3/tr.h b/tools/qdoc3/tr.h
index 4d601e9..4ba7aa4 100644
--- a/tools/qdoc3/tr.h
+++ b/tools/qdoc3/tr.h
@@ -46,14 +46,26 @@
 #ifndef TR_H
 #define TR_H
 
+#ifndef QT_BOOTSTRAPPED
+#  include "qcoreapplication.h"
+#endif
+
 #include <qstring.h>
 
 QT_BEGIN_NAMESPACE
 
-inline QString tr( const char *sourceText, const char * /* comment */ = 0 )
+#if defined(QT_BOOTSTRAPPED) || defined(QT_NO_TRANSLATION)
+inline QString tr(const char *sourceText, const char *comment = 0)
 {
+    Q_UNUSED(comment);
     return QString( QLatin1String(sourceText) );
 }
+#else
+inline QString tr(const char *sourceText, const char *comment = 0)
+{
+    return QCoreApplication::instance()->translate("", sourceText, comment);
+}
+#endif
 
 QT_END_NAMESPACE
 
-- 
cgit v0.12