diff options
| author | Tasuku Suzuki <tasuku.suzuki@nokia.com> | 2012-05-17 04:52:33 +0900 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-18 15:22:22 +0200 |
| commit | bdc28e35806d93b259830f8b3fecdf60761c62d0 (patch) | |
| tree | ad302d0c1fbabb74c782cc6e65e702367052cc34 | |
| parent | dbcbd4708b8fdabdbf80ad8405bcb871ebf23ccc (diff) | |
Merge two simple version of translate() functions for QT_NO_TRANSLATION
the commit 53a420a4d1a2d845603dd85ce9ce345c6819088e merged translate()
functions. The simple versions need to be merged too.
Change-Id: Ie873483beb8ed0b911ae0568e97b427f4c6b74e3
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| -rw-r--r-- | src/corelib/kernel/qcoreapplication.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/src/corelib/kernel/qcoreapplication.h b/src/corelib/kernel/qcoreapplication.h index 2c942f9037..47be74c0a6 100644 --- a/src/corelib/kernel/qcoreapplication.h +++ b/src/corelib/kernel/qcoreapplication.h @@ -215,19 +215,6 @@ inline bool QCoreApplication::sendSpontaneousEvent(QObject *receiver, QEvent *ev #ifdef QT_NO_TRANSLATION // Simple versions inline QString QCoreApplication::translate(const char *, const char *sourceText, - const char *, Encoding encoding) -{ -#ifndef QT_NO_TEXTCODEC - if (encoding == UnicodeUTF8) - return QString::fromUtf8(sourceText); -#else - Q_UNUSED(encoding) -#endif - return QString::fromLatin1(sourceText); -} - -// Simple versions -inline QString QCoreApplication::translate(const char *, const char *sourceText, const char *, Encoding encoding, int) { #ifndef QT_NO_TEXTCODEC |