diff options
| author | Tasuku Suzuki <tasuku.suzuki@nokia.com> | 2012-05-20 21:38:16 +0900 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-25 17:23:20 +0200 |
| commit | 4830bcc9626ba285257aa170922360b6207b4261 (patch) | |
| tree | ed4c309d92ba028531b6543e4ee48e22de2e23ea /src | |
| parent | b8420c9fc246428cf26ace2970f252ca7580aef5 (diff) | |
Fix QtCore compilation for -qconfig large
Q_UNUSED(encoding) line removed because the variable is not declared.
translate() removed because the function is previously implemented.
Change-Id: I24da0105d72635ea19b26439776416655f3213df
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/kernel/qcoreapplication.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/corelib/kernel/qcoreapplication.h b/src/corelib/kernel/qcoreapplication.h index f15af6cd5f..555686f9ab 100644 --- a/src/corelib/kernel/qcoreapplication.h +++ b/src/corelib/kernel/qcoreapplication.h @@ -216,16 +216,8 @@ inline bool QCoreApplication::sendSpontaneousEvent(QObject *receiver, QEvent *ev #ifdef QT_NO_TRANSLATION inline QString QCoreApplication::translate(const char *, const char *sourceText, const char *, int) { - Q_UNUSED(encoding) return QString::fromUtf8(sourceText); } -#if QT_DEPRECATED_SINCE(5, 0) -QT_DEPRECATED inline QString QCoreApplication::translate(const char *, const char *sourceText, const char *, Encoding encoding, int) -{ - Q_UNUSED(encoding) - return QString::fromUtf8(sourceText); -} -#endif #endif #define Q_DECLARE_TR_FUNCTIONS(context) \ |