mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-01-19 04:52:12 +01:00
Merge remote-tracking branch 'origin/rel-15.01' into thread/OP-1628_AutoUpgrade_OPLM_Issues
This commit is contained in:
commit
9a5dc36826
@ -33,6 +33,10 @@ win32 {
|
||||
QMAKE_RPATHDIR = \'\$$ORIGIN\'/$$relative_path($$GCS_LIBRARY_PATH, $$GCS_APP_PATH)
|
||||
QMAKE_RPATHDIR += \'\$$ORIGIN\'/$$relative_path($$GCS_QT_LIBRARY_PATH, $$GCS_APP_PATH)
|
||||
include(../rpath.pri)
|
||||
|
||||
equals(copyqt, 1) {
|
||||
RESOURCES += qtconf.qrc
|
||||
}
|
||||
}
|
||||
|
||||
OTHER_FILES += openpilotgcs.rc
|
||||
|
2
ground/openpilotgcs/src/app/qt.conf
Normal file
2
ground/openpilotgcs/src/app/qt.conf
Normal file
@ -0,0 +1,2 @@
|
||||
[Paths]
|
||||
Prefix = ../lib/openpilotgcs/qt5/
|
5
ground/openpilotgcs/src/app/qtconf.qrc
Normal file
5
ground/openpilotgcs/src/app/qtconf.qrc
Normal file
@ -0,0 +1,5 @@
|
||||
<!DOCTYPE RCC><RCC version="1.0">
|
||||
<qresource>
|
||||
<file alias="qt/etc/qt.conf">qt.conf</file>
|
||||
</qresource>
|
||||
</RCC>
|
@ -6,7 +6,7 @@ ifndef OPENPILOT_IS_COOL
|
||||
$(error Top level Makefile must be used to build this target)
|
||||
endif
|
||||
|
||||
DEB_VER := $(PACKAGE_LBL)-1
|
||||
DEB_VER := $(subst RELEASE-,,$(PACKAGE_LBL))-1
|
||||
DEB_DIR := $(ROOT_DIR)/package/linux/debian
|
||||
DEB_BUILD_DIR := $(ROOT_DIR)/debian
|
||||
|
||||
|
@ -1,6 +0,0 @@
|
||||
[Paths]
|
||||
Prefix = ..
|
||||
Plugins = lib/qt5/plugins
|
||||
Imports = lib/qt5/qml
|
||||
Qml2Imports = lib/qt5/qml
|
||||
Libraries = lib/qt5
|
Loading…
x
Reference in New Issue
Block a user