1
0
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:
m_thread 2015-02-05 09:51:02 +01:00
commit 9a5dc36826
5 changed files with 12 additions and 7 deletions

View File

@ -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

View File

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

View File

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

View File

@ -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

View File

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