Commit 8502ff63 authored by pixhawk's avatar pixhawk

Last project file fixes for MSVC compatibility

parent 8f6561af
...@@ -40,10 +40,6 @@ OBJECTS_DIR = $$BUILDDIR/obj ...@@ -40,10 +40,6 @@ OBJECTS_DIR = $$BUILDDIR/obj
MOC_DIR = $$BUILDDIR/moc MOC_DIR = $$BUILDDIR/moc
UI_HEADERS_DIR = src/ui/generated UI_HEADERS_DIR = src/ui/generated
#$$BASEDIR/lib/qextserialport/include
# $$BASEDIR/lib/openjaus/libjaus/include \
# $$BASEDIR/lib/openjaus/libopenJaus/include
message(Qt version $$[QT_VERSION]) message(Qt version $$[QT_VERSION])
......
# Include QMapControl map library
# prefer version from external directory /
# from http://github.com/pixhawk/qmapcontrol/
# over bundled version in lib directory
# Version from GIT repository is preferred
#include ( "../qmapcontrol/QMapControl/QMapControl.pri" ) #{
# Include bundled version if necessary
include(lib/QMapControl/QMapControl.pri)
message("Including bundled QMapControl version as FALLBACK. This is fine on Linux and MacOS, but not the best choice in Windows")
#}
# Include general settings for MAVGround # Include general settings for MAVGround
# necessary as last include to override any non-acceptable settings
# done by the plugins above
include(qgroundcontrol.pri) include(qgroundcontrol.pri)
# QWT plot and QExtSerial depend on paths set by qgroundcontrol.pri
# Include serial port library # Include serial port library
include(src/lib/qextserialport/qextserialport.pri) include(src/lib/qextserialport/qextserialport.pri)
# Include QWT plotting library # Include QWT plotting library
include(src/lib/qwt/qwt.pri) include(src/lib/qwt/qwt.pri)
# Include FLITE audio synthesizer library
#include(src/lib/flite/flite.pri)
# Include QMapControl map library
include(src/lib/qmapcontrol/qmapcontrol.pri)
#include(lib/QMapControl/QMapControl.pri)
DEPENDPATH += . \ DEPENDPATH += . \
lib/QMapControl \ lib/QMapControl \
lib/QMapControl/src lib/QMapControl/src
......
...@@ -59,7 +59,7 @@ This file is part of the PIXHAWK project ...@@ -59,7 +59,7 @@ This file is part of the PIXHAWK project
Core::Core(int &argc, char* argv[]) : QApplication(argc, argv) Core::Core(int &argc, char* argv[]) : QApplication(argc, argv)
{ {
this->setApplicationName("QGroundControl"); this->setApplicationName("QGroundControl");
this->setApplicationVersion("v. 0.0.5"); this->setApplicationVersion("v. 0.7.0");
this->setOrganizationName(QLatin1String("OpenMAV Association")); this->setOrganizationName(QLatin1String("OpenMAV Association"));
this->setOrganizationDomain("http://qgroundcontrol.org"); this->setOrganizationDomain("http://qgroundcontrol.org");
......
Markdown is supported
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