Skip to content

Commit

Permalink
[companion] Distributing qm files is useless since we compile them in…
Browse files Browse the repository at this point in the history
… as qrc
  • Loading branch information
kilrah committed Jan 5, 2017
1 parent af34a15 commit 0e65aad
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 10 deletions.
6 changes: 0 additions & 6 deletions companion/src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 0 additions & 4 deletions companion/targets/windows/companion-vs.nsi.in
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 0e65aad

Please sign in to comment.