rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-29 07:24:13 +01:00
Code Issues Releases Activity

OP-1701 Fix Linux Qt config: added a resource with qt.conf which has correct prefix set

Browse Source
This commit is contained in:
James Duley 2015-02-03 15:51:59 +13:00
parent c2a8f8fe11
commit 3d797914a3
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,6 +33,10 @@ win32 {
QMAKE_RPATHDIR = \'\$$ORIGIN\'/$$relative_path($$GCS_LIBRARY_PATH, $$GCS_APP_PATH) QMAKE_RPATHDIR = \'\$$ORIGIN\'/$$relative_path($$GCS_LIBRARY_PATH, $$GCS_APP_PATH)
QMAKE_RPATHDIR += \'\$$ORIGIN\'/$$relative_path($$GCS_QT_LIBRARY_PATH, $$GCS_APP_PATH) QMAKE_RPATHDIR += \'\$$ORIGIN\'/$$relative_path($$GCS_QT_LIBRARY_PATH, $$GCS_APP_PATH)
include(../rpath.pri) include(../rpath.pri)
equals(copyqt, 1) {
RESOURCES += qtconf.qrc
}
} }
OTHER_FILES += openpilotgcs.rc OTHER_FILES += openpilotgcs.rc

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

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

5
ground/openpilotgcs/src/app/qtconf.qrc Normal file
View File

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

6
package/linux/qt.conf
View File

@ -1,6 +0,0 @@
[Paths]
Prefix = ..
Plugins = lib/qt5/plugins
Imports = lib/qt5/qml
Qml2Imports = lib/qt5/qml
Libraries = lib/qt5