From 41dfd254c3a972fd77389713d0e370b98247a12d Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@digia.com>
Date: Thu, 7 Feb 2013 10:39:22 +0100
Subject: qdoc: Fix translation contexts.

Put all translations into the namespace QDoc and fix warnings
about invalid tr()-usage by removing the free tr()-function
from tr.h. Provide QCoreApplication::translate() for bootstrap
builds.

Change-Id: I2b6931188346f290e80e14b84adff8892d8a860f
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
---
 src/tools/qdoc/qmlparser/qqmljsparser.cpp | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'src/tools/qdoc/qmlparser/qqmljsparser.cpp')

diff --git a/src/tools/qdoc/qmlparser/qqmljsparser.cpp b/src/tools/qdoc/qmlparser/qqmljsparser.cpp
index 104aa3d557b..b7f571aa629 100644
--- a/src/tools/qdoc/qmlparser/qqmljsparser.cpp
+++ b/src/tools/qdoc/qmlparser/qqmljsparser.cpp
@@ -40,12 +40,6 @@
 ****************************************************************************/
 
 #include <qdebug.h>
-#ifdef QT_BOOTSTRAPPED
-#define tr(x, y) QString(QLatin1String(y))
-#else
-#include <qcoreapplication.h>
-#define tr(x, y) QCoreApplication::translate(x, y)
-#endif
 
 #include <string.h>
 
-- 
cgit v1.2.3