Make qtbase compile with QT_NO_TRANSLATION

Change-Id: Iaa52ba41218b3ec8f36f0052230e0c2cc31c3ba5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

5 files changed, 2 insertions, 87 deletions

diff --git a/src/tools/qdoc/location.h b/src/tools/qdoc/location.h
index 33472810d3..0c113bcbeb 100644
--- a/src/tools/qdoc/location.h
+++ b/src/tools/qdoc/location.h
@@ -47,8 +47,7 @@
 #define LOCATION_H
 
 #include <qstack.h>
-
-#include "tr.h"
+#include <qcoreapplication.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/tools/qdoc/openedlist.h b/src/tools/qdoc/openedlist.h
index cf7624b8e3..2aad1f6dcb 100644
--- a/src/tools/qdoc/openedlist.h
+++ b/src/tools/qdoc/openedlist.h
@@ -49,7 +49,6 @@
 #include <qstring.h>
 
 #include "location.h"
-#include "tr.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/tools/qdoc/qdoc.pro b/src/tools/qdoc/qdoc.pro
index 3bd11bcd5b..55e32dd4a3 100644
--- a/src/tools/qdoc/qdoc.pro
+++ b/src/tools/qdoc/qdoc.pro
@@ -38,7 +38,6 @@ HEADERS += atom.h \
            separator.h \
            text.h \
            tokenizer.h \
-           tr.h \
            tree.h
 SOURCES += atom.cpp \
            codechunk.cpp \
diff --git a/src/tools/qdoc/separator.cpp b/src/tools/qdoc/separator.cpp
index 2403fb15c8..af10ba364c 100644
--- a/src/tools/qdoc/separator.cpp
+++ b/src/tools/qdoc/separator.cpp
@@ -44,7 +44,7 @@
 */
 
 #include "separator.h"
-#include "tr.h"
+#include <qcoreapplication.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/tools/qdoc/tr.h b/src/tools/qdoc/tr.h
deleted file mode 100644
index 36b0c47fef..0000000000
--- a/src/tools/qdoc/tr.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the tools applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*
-  tr.h
-*/
-
-#ifndef TR_H
-#define TR_H
-
-#include <qglobal.h>
-
-#if !defined(QT_BOOTSTRAPPED) && !defined(QT_NO_TRANSLATION)
-#  define TRANSLATE_QDOC
-#endif
-
-#include <qstring.h>
-#ifdef TRANSLATE_QDOC
-#  include <qcoreapplication.h>
-#endif
-
-QT_BEGIN_NAMESPACE
-
-#ifndef TRANSLATE_QDOC
-
-#define Q_DECLARE_TR_FUNCTIONS(context)
-
-inline QString tr(const char *sourceText, const char *comment = 0)
-{
-    Q_UNUSED(comment);
-    return QString( QLatin1String(sourceText) );
-}
-
-struct QCoreApplication
-{
-    static inline QString translate(const char * /* context */ , const char *sourceText, const char * /* disambiguation */ = 0)
-        { return QLatin1String(sourceText); }
-};
-
-#endif // !TRANSLATE_QDOC
-
-QT_END_NAMESPACE
-
-#endif