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

Merge remote-tracking branch 'origin/next' into thread/OP-1628_Reboot_Board_In_Wizard

Browse Source
This commit is contained in:
m_thread 2015-01-06 23:18:32 +01:00
commit bd5171d442
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ground/openpilotgcs/openpilotgcs.pro
View File

@ -11,8 +11,8 @@ QT_VERSION = $$split(QT_VERSION, ".")
QT_VER_MAJ = $$member(QT_VERSION, 0)
QT_VER_MIN = $$member(QT_VERSION, 1)
lessThan(QT_VER_MAJ, 5) | lessThan(QT_VER_MIN, 4) {
error(OpenPilot GCS requires Qt 5.4.0 or newer but Qt $$[QT_VERSION] was detected.)
lessThan(QT_VER_MAJ, 5) | lessThan(QT_VER_MIN, 2) {
error(OpenPilot GCS requires Qt 5.2.0 or newer but Qt $$[QT_VERSION] was detected.)
}
macx {

2
ground/openpilotgcs/src/openpilotgcslibrary.pri
View File

@ -12,7 +12,7 @@ contains(QT_CONFIG, reduce_exports):CONFIG += hGCS_symbols
macx {
QMAKE_LFLAGS_SONAME = -Wl,-install_name,@executable_path/../Plugins/
} else
} else {
win32 {
target.path = /bin
target.files = $$DESTDIR/$${TARGET}.dll

2
ground/openpilotgcs/src/python.pri
View File

@ -1,7 +1,7 @@
# We use python to extract git version info and generate some other files,
# but it may be installed locally. The expected python version should be
# kept in sync with make/tools.mk.
PYTHON_DIR = qt-5.3.1/Tools/mingw482_32/opt/bin
PYTHON_DIR = qt-5.4.0/Tools/mingw491_32/opt/bin
ROOT_DIR = $$GCS_SOURCE_TREE/../..