diff options
| author | Tim Jenssen <tim.jenssen@qt.io> | 2020-04-01 11:11:14 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2020-04-02 20:26:42 +0200 |
| commit | 893e9dc0bb0d45d9e7bec154d8e5b007e88dd829 (patch) | |
| tree | 681b74a723d36aa5cd2e20866aee1338eda26232 | |
| parent | 540c37ecab272d429ed8c66a79c1bd356ea71099 (diff) | |
fix -no-feature-translation build
Change-Id: I817564e979d4c69f4d7ebd2c9e1d8cddf0727c13
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| -rw-r--r-- | src/qml/qml/qqmlapplicationengine.cpp | 2 | ||||
| -rw-r--r-- | src/qml/qml/qqmlapplicationengine_p.h | 2 |
2 files changed, 2 insertions, 2 deletions
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<QObject *> objects; QVariantMap initialProperties; QString translationsDirectory; +#if QT_CONFIG(translation) QScopedPointer<QTranslator> activeTranslator; +#endif }; QT_END_NAMESPACE |