From 4830bcc9626ba285257aa170922360b6207b4261 Mon Sep 17 00:00:00 2001 From: Tasuku Suzuki Date: Sun, 20 May 2012 21:38:16 +0900 Subject: [PATCH] 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 --- src/corelib/kernel/qcoreapplication.h | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/corelib/kernel/qcoreapplication.h b/src/corelib/kernel/qcoreapplication.h index f15af6c..555686f 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) \ -- 2.7.4