Skip to content
GitLab
Commit 0bd9e9a5 authored by lm's avatar lm
Browse files

Merge

parents f4e7ad37 a21fb438
Show whitespace changes
Inline Side-by-side
qgroundcontrol.pro
View file @ 0bd9e9a5
...@@ -19,7 +19,7 @@ BASEDIR = . ...@@ -19,7 +19,7 @@ BASEDIR = .
BUILDDIR = build BUILDDIR = build
LANGUAGE = C++ LANGUAGE = C++
CONFIG += debug_and_release CONFIG += debug_and_release
#console console
OBJECTS_DIR = $$BUILDDIR/obj OBJECTS_DIR = $$BUILDDIR/obj
MOC_DIR = $$BUILDDIR/moc MOC_DIR = $$BUILDDIR/moc
UI_HEADERS_DIR = src/ui/generated UI_HEADERS_DIR = src/ui/generated
...@@ -42,8 +42,8 @@ DEPENDPATH += . \ ...@@ -42,8 +42,8 @@ DEPENDPATH += . \
plugins plugins
INCLUDEPATH += . \ INCLUDEPATH += . \
lib/QMapControl \ lib/QMapControl \
$$BASEDIR/../mavlink/include \ $$BASEDIR/../mavlink/contrib/slugs/include \
$$BASEDIR/../mavlink/contrib/slugs/include $$BASEDIR/../mavlink/include
# ../mavlink/include \ # ../mavlink/include \
# MAVLink/include \ # MAVLink/include \
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment