rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-20 10:54:14 +01:00
Code Issues Releases Activity

OP-1187 Wrong file copy in lasted commit.

Browse Source 
qt_fr.qm located in tools/Qt_install_dir, allow copy of this file for all systems
This commit is contained in:
Laurent Lalanne 2014-01-29 13:42:39 +01:00 committed by f5soh
parent c39fb50acf
commit 8e837fb985
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ground/openpilotgcs/share/openpilotgcs/translations/translations.pro
View File

@ -71,7 +71,7 @@ qmfiles.CONFIG += no_check_exist
INSTALLS += qmfiles
#========= begin block copying qt_*.qm files ==========
win32 {
#win32 {
defineReplace(QtQmExists) {
for(lang,$$1) {
qm_file = $$[QT_INSTALL_TRANSLATIONS]/qt_$${lang}.qm
@ -88,5 +88,5 @@ win32 {
copyQT_QMs.name = Copy ${QMAKE_FILE_IN}
copyQT_QMs.CONFIG += no_link
QMAKE_EXTRA_COMPILERS += copyQT_QMs
}
#}
#========= end block copying qt_*.qm files ============

3
package/linux/deb_common/rules
View File

@ -35,8 +35,7 @@ install:
# Add here commands to install the package into debian/<packagename>
cp -arp build/openpilotgcs_release/bin debian/openpilot/usr/local/OpenPilot
cp -arp build/openpilotgcs_release/lib debian/openpilot/usr/local/OpenPilot
cp -arp build/openpilotgcs_release/share debian/openpilot/usr/local/OpenPilot
cp -arp build/openpilotgcs_release/share/openpilotgcs/translations/openpilotgcs_fr.qm debian/openpilot/usr/local/OpenPilot/share/openpilotgcs/translations/qt_fr.qm
cp -arp build/openpilotgcs_release/share debian/openpilot/usr/local/OpenPilot
cp -arp build/openpilotgcs_release/.obj debian/openpilot/usr/local/OpenPilot
cp -arp package/linux/qt.conf debian/openpilot/usr/local/OpenPilot/bin
cp -arp package/linux/openpilot.desktop debian/openpilot/usr/share/applications