merge QT_NO_TRANSLATION and QT_NO_TRANSLATION_BUILDER options

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/src/core/global/qconfig.h.cmake b/src/core/global/qconfig.h.cmake
index c43c339..d90438f 100644 (file)
--- a/src/core/global/qconfig.h.cmake
+++ b/src/core/global/qconfig.h.cmake
@@ -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

diff --git a/src/core/kernel/qcoreapplication.cpp b/src/core/kernel/qcoreapplication.cpp
index ed3f1bf..d04f576 100644 (file)
--- a/src/core/kernel/qcoreapplication.cpp
+++ b/src/core/kernel/qcoreapplication.cpp
@@ -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