diff options
author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-04-15 23:54:24 (GMT) |
---|---|---|
committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-04-15 23:54:24 (GMT) |
commit | 16ae00c689faac5d7af312ae31d7f715dc6e0745 (patch) | |
tree | 2b59472f7c00895edc4cae954dab8914dd185c17 /src | |
parent | 6ef372759b94a36cdcd3b31bef5cb94a43372dab (diff) | |
download | Qt-16ae00c689faac5d7af312ae31d7f715dc6e0745.zip Qt-16ae00c689faac5d7af312ae31d7f715dc6e0745.tar.gz Qt-16ae00c689faac5d7af312ae31d7f715dc6e0745.tar.bz2 |
Correctly support translation in QDeclarativeCompiler
Reviewed-by: Friedemann Kleint
Diffstat (limited to 'src')
-rw-r--r-- | src/declarative/qml/qdeclarativecompiler.cpp | 6 | ||||
-rw-r--r-- | src/declarative/qml/qdeclarativecompiler_p.h | 4 |
2 files changed, 2 insertions, 8 deletions
diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp index 5c5ad37..065009a 100644 --- a/src/declarative/qml/qdeclarativecompiler.cpp +++ b/src/declarative/qml/qdeclarativecompiler.cpp @@ -67,7 +67,6 @@ #include "private/qdeclarativecompiledbindings_p.h" #include "private/qdeclarativeglobalscriptclass_p.h" -#include <QCoreApplication> #include <QColor> #include <QDebug> #include <QPointF> @@ -2947,9 +2946,4 @@ QStringList QDeclarativeCompiler::deferredProperties(QDeclarativeParser::Object return rv; } -QString QDeclarativeCompiler::tr(const char *str) -{ - return QCoreApplication::translate("QDeclarativeCompiler", str); -} - QT_END_NAMESPACE diff --git a/src/declarative/qml/qdeclarativecompiler_p.h b/src/declarative/qml/qdeclarativecompiler_p.h index 002c6c9..867db2c 100644 --- a/src/declarative/qml/qdeclarativecompiler_p.h +++ b/src/declarative/qml/qdeclarativecompiler_p.h @@ -66,6 +66,7 @@ #include <QtCore/qbytearray.h> #include <QtCore/qset.h> +#include <QtCore/QCoreApplication> QT_BEGIN_NAMESPACE @@ -148,6 +149,7 @@ private: class QMetaObjectBuilder; class Q_DECLARATIVE_EXPORT QDeclarativeCompiler { + Q_DECLARE_TR_FUNCTIONS(QDeclarativeCompiler) public: QDeclarativeCompiler(); @@ -279,8 +281,6 @@ private: void addId(const QString &, QDeclarativeParser::Object *); - QString tr(const char *); - void dumpStats(); struct BindingReference { |