merge QT_NO_TRANSLATION and QT_NO_TRANSLATION_BUILDER options

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2020-11-28 14:18:16 +00:00
parent 065a540e92
commit 09c680950f
2 changed files with 1 additions and 2 deletions

View file

@ -311,7 +311,6 @@
#cmakedefine QT_NO_TOOLBUTTON
#cmakedefine QT_NO_TOOLTIP
#cmakedefine QT_NO_TRANSLATION
#cmakedefine QT_NO_TRANSLATION_BUILDER
#cmakedefine QT_NO_TREEVIEW
#cmakedefine QT_NO_TREEWIDGET
#cmakedefine QT_NO_UDPSOCKET

View file

@ -1339,7 +1339,7 @@ void QCoreApplication::installTranslator(QTranslator *translationFile)
QCoreApplicationPrivate *d = self->d_func();
d->translators.prepend(translationFile);
#ifndef QT_NO_TRANSLATION_BUILDER
#ifndef QT_NO_TRANSLATION
if (translationFile->isEmpty())
return;
#endif