From 8502ff638c7e16bcc81e308b208ccff1240e0e2e Mon Sep 17 00:00:00 2001 From: pixhawk Date: Tue, 13 Apr 2010 10:17:43 +0200 Subject: [PATCH] Last project file fixes for MSVC compatibility --- qgroundcontrol.pri | 4 ---- qgroundcontrol.pro | 25 ++++++++++++++++++------- src/Core.cc | 2 +- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/qgroundcontrol.pri b/qgroundcontrol.pri index e18f94cfa..4a2a17eed 100644 --- a/qgroundcontrol.pri +++ b/qgroundcontrol.pri @@ -40,10 +40,6 @@ OBJECTS_DIR = $$BUILDDIR/obj MOC_DIR = $$BUILDDIR/moc 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]) diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro index 6dd234c56..5f0e6811a 100644 --- a/qgroundcontrol.pro +++ b/qgroundcontrol.pro @@ -1,19 +1,30 @@ +# 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 +# necessary as last include to override any non-acceptable settings +# done by the plugins above include(qgroundcontrol.pri) + +# QWT plot and QExtSerial depend on paths set by qgroundcontrol.pri + # Include serial port library include(src/lib/qextserialport/qextserialport.pri) # Include QWT plotting library 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 += . \ lib/QMapControl \ lib/QMapControl/src diff --git a/src/Core.cc b/src/Core.cc index 6c8d81ac3..e563ee5e0 100644 --- a/src/Core.cc +++ b/src/Core.cc @@ -59,7 +59,7 @@ This file is part of the PIXHAWK project Core::Core(int &argc, char* argv[]) : QApplication(argc, argv) { this->setApplicationName("QGroundControl"); - this->setApplicationVersion("v. 0.0.5"); + this->setApplicationVersion("v. 0.7.0"); this->setOrganizationName(QLatin1String("OpenMAV Association")); this->setOrganizationDomain("http://qgroundcontrol.org"); -- 2.22.0