diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-02-07 10:39:22 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-07 12:36:00 +0100 |
| commit | 41dfd254c3a972fd77389713d0e370b98247a12d (patch) | |
| tree | 06f4e97c5aded6a1a12b7f8d8b94e83fba7ef8ce /src/tools/qdoc/qmlparser/qqmljsparser.cpp | |
| parent | 5221ae5f424f24000d877d2a4394e2d75a052cca (diff) | |
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>
Diffstat (limited to 'src/tools/qdoc/qmlparser/qqmljsparser.cpp')
| -rw-r--r-- | src/tools/qdoc/qmlparser/qqmljsparser.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
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> |