diff options
| -rw-r--r-- | dist/changes-5.0.0 | 3 | ||||
| -rw-r--r-- | src/corelib/kernel/qcoreapplication.cpp | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/dist/changes-5.0.0 b/dist/changes-5.0.0 index 4b05a86d71..ca63359b54 100644 --- a/dist/changes-5.0.0 +++ b/dist/changes-5.0.0 @@ -28,6 +28,9 @@ information about a particular change. preprocessor #define has also been removed. The build-key is obsolete and is no longer necessary. +- QCoreApplication::translate() will no longer return the source text when + the translation is empty. Use lrelease -removeidentical for optimization. + **************************************************************************** * General * **************************************************************************** diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp index d7fb9d3270..9acf1f22c3 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp @@ -1823,12 +1823,12 @@ QString QCoreApplication::translate(const char *context, const char *sourceText, for (it = self->d_func()->translators.constBegin(); it != self->d_func()->translators.constEnd(); ++it) { translationFile = *it; result = translationFile->translate(context, sourceText, disambiguation, n); - if (!result.isEmpty()) + if (!result.isNull()) break; } } - if (result.isEmpty()) { + if (result.isNull()) { #ifdef QT_NO_TEXTCODEC Q_UNUSED(encoding) #else |