fly/flightgear
1
0
Fork 0
Code Activity

Disabling translations is tricky.

Browse source
This commit is contained in:
James Turner 2018-08-28 17:12:31 +01:00
parent 61f33e0195
commit 2329654e3b
3 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CMakeModules/Translations.cmake
View file

@ -40,4 +40,7 @@ if (${do_translate})
endforeach() endforeach()
file(APPEND ${translation_res} "</qresource>\n</RCC>") file(APPEND ${translation_res} "</qresource>\n</RCC>")
# set this so config.h can detect it
set(HAVE_QRC_TRANSLATIONS TRUE)
endif() # of do translate endif() # of do translate

2
src/GUI/QtLauncher.cxx
View file

@ -207,7 +207,9 @@ private:
static void initQtResources() static void initQtResources()
{ {
Q_INIT_RESOURCE(resources); Q_INIT_RESOURCE(resources);
#if defined(HAVE_QRC_TRANSLATIONS)
Q_INIT_RESOURCE(translations); Q_INIT_RESOURCE(translations);
#endif
} }
static void simgearMessageOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg) static void simgearMessageOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg)

3
src/Include/config_cmake.h.in
View file

@ -65,3 +65,6 @@
#define FG_BUILD_TYPE "@FG_BUILD_TYPE@" #define FG_BUILD_TYPE "@FG_BUILD_TYPE@"
#define HAVE_PUI #define HAVE_PUI
#cmakedefine HAVE_QRC_TRANSLATIONS