From 0e65aad1a8b19d30462d0582a7721294b44c10f6 Mon Sep 17 00:00:00 2001
From: Andre Bernet <kilrah@andrebernet.ch>
Date: Thu, 5 Jan 2017 23:16:23 +0100
Subject: [PATCH] [companion] Distributing qm files is useless since we compile
 them in as qrc

---
 companion/src/CMakeLists.txt                  | 6 ------
 companion/targets/windows/companion-vs.nsi.in | 4 ----
 2 files changed, 10 deletions(-)

diff --git a/companion/src/CMakeLists.txt b/companion/src/CMakeLists.txt
index 4412d0615..02dccf582 100644
--- a/companion/src/CMakeLists.txt
+++ b/companion/src/CMakeLists.txt
@@ -327,9 +327,6 @@ elseif(WIN32)
     install(TARGETS ${SIMULATOR_NAME} DESTINATION ${INSTALL_DESTINATION})
     file(GLOB simulator_plugins "${CMAKE_BINARY_DIR}/*opentx-*-simulator${CMAKE_SHARED_LIBRARY_SUFFIX}")
     install(FILES ${simulator_plugins} DESTINATION "${INSTALL_DESTINATION}")
-    # language files
-    file(GLOB language_files "${CMAKE_BINARY_DIR}/companion/src/companion_*.qm")
-    install(FILES ${language_files} DESTINATION "${INSTALL_DESTINATION}/lang")
     # supporting utilities
     set(INSTALL_TEMP_FILES avrdude.exe avrdude.conf dfu-util.exe libusb0.dll libusb-1.0.dll)
     foreach(tmpfile ${INSTALL_TEMP_FILES})
@@ -465,9 +462,6 @@ IF(APPLE)
   # menu file
   install(DIRECTORY ${PROJECT_SOURCE_DIR}/companion/targets/mac/qt_menu.nib DESTINATION "${companion_res_dir}" COMPONENT Runtime)
 
-  # translations file
-  install(FILES ${companion_QM} DESTINATION "${translations_dest_dir}" COMPONENT Runtime)
-
   # manually add the cocoa plugin
   get_target_property(QPA_PLUGIN Qt5::QCocoaIntegrationPlugin LOCATION)
   install(FILES ${QPA_PLUGIN} DESTINATION "${plugin_dest_dir}/platforms/" COMPONENT Runtime)
diff --git a/companion/targets/windows/companion-vs.nsi.in b/companion/targets/windows/companion-vs.nsi.in
index 3a5927d95..cfc222e71 100644
--- a/companion/targets/windows/companion-vs.nsi.in
+++ b/companion/targets/windows/companion-vs.nsi.in
@@ -133,10 +133,6 @@ Section "OpenTX Companion" SecDummy
   SetOutPath "$INSTDIR\printsupport"
   File "@QT_DLL_DIR@\..\plugins\printsupport\windowsprintersupport.dll"
 
-  CreateDirectory "$INSTDIR\lang"
-  SetOutPath "$INSTDIR\lang"
-  File "src\*.qm"
-
   SetOutPath "$INSTDIR"
   ;Store installation folder
   WriteRegStr HKCU "Software\OpenTX\Companion @VERSION_FAMILY@" "" $INSTDIR