From 893e9dc0bb0d45d9e7bec154d8e5b007e88dd829 Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Wed, 1 Apr 2020 11:11:14 +0200 Subject: fix -no-feature-translation build Change-Id: I817564e979d4c69f4d7ebd2c9e1d8cddf0727c13 Reviewed-by: Ulf Hermann --- src/qml/qml/qqmlapplicationengine.cpp | 2 -- src/qml/qml/qqmlapplicationengine_p.h | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/qml/qml') diff --git a/src/qml/qml/qqmlapplicationengine.cpp b/src/qml/qml/qqmlapplicationengine.cpp index 7d961cd0c7..6ee03b39e5 100644 --- a/src/qml/qml/qqmlapplicationengine.cpp +++ b/src/qml/qml/qqmlapplicationengine.cpp @@ -106,8 +106,6 @@ void QQmlApplicationEnginePrivate::_q_loadTranslations() activeTranslator.reset(); } q->retranslate(); -#else - Q_UNUSED(rootFile) #endif } diff --git a/src/qml/qml/qqmlapplicationengine_p.h b/src/qml/qml/qqmlapplicationengine_p.h index c514e3daf9..86f492510f 100644 --- a/src/qml/qml/qqmlapplicationengine_p.h +++ b/src/qml/qml/qqmlapplicationengine_p.h @@ -75,7 +75,9 @@ public: QList objects; QVariantMap initialProperties; QString translationsDirectory; +#if QT_CONFIG(translation) QScopedPointer activeTranslator; +#endif }; QT_END_NAMESPACE -- cgit v1.2.3