rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-03-16 08:29:15 +01:00
Code Issues Releases Activity

removed openpilotgcs hardcoding from qt.conf

Browse Source
This commit is contained in:
LibrePilot Packager 2015-07-11 22:45:20 +01:00 committed by James Duley
parent 402a70f548
commit 1e662d6175
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ground/openpilotgcs/src/app/app.pro
View File

@ -43,7 +43,12 @@ win32 {
include(../rpath.pri)
equals(copyqt, 1) {
RESOURCES += qtconf.qrc
RESOURCES += $$OUT_PWD/qtconf.qrc
# Copy qtconf.qrc to OUT_PWD because paths are relative
# This needs to be done at qmake time because the Makefile depends on it
system(cp $$PWD/qtconf.qrc.in $$OUT_PWD/qtconf.qrc)
system(printf $$shell_quote([Paths]\nPrefix = $$relative_path($$GCS_QT_BASEPATH, $$GCS_APP_PATH)\n) > $$OUT_PWD/qt.conf)
}
}

2
ground/openpilotgcs/src/app/qt.conf
View File

@ -1,2 +0,0 @@
[Paths]
Prefix = ../lib/openpilotgcs/qt5/

10
ground/openpilotgcs/src/app/qtconf.qrc → ground/openpilotgcs/src/app/qtconf.qrc.in
View File

@ -1,5 +1,5 @@
<!DOCTYPE RCC><RCC version="1.0">
<qresource>
<file alias="qt/etc/qt.conf">qt.conf</file>
</qresource>
</RCC>
<!DOCTYPE RCC><RCC version="1.0">
<qresource>
<file alias="qt/etc/qt.conf">qt.conf</file>
</qresource>
</RCC>