From 8e51981a51e84659550585d62f295c7d754e6975 Mon Sep 17 00:00:00 2001 From: Bryant Mairs Date: Sat, 26 Jul 2014 12:17:13 -0700 Subject: [PATCH 1/5] Don't bulk add all /usr folders for includes or libs. This causes problems for some systems with Qt5 and Qt4 installed (like Fedora 20). --- QGCExternalLibs.pri | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/QGCExternalLibs.pri b/QGCExternalLibs.pri index 80e6fc4..e4f43ac 100644 --- a/QGCExternalLibs.pri +++ b/QGCExternalLibs.pri @@ -1,22 +1,4 @@ # -# [REQUIRED] Tell the Linux build to look in a few additional places for libs -# -LinuxBuild { - INCLUDEPATH += \ - /usr/include \ - /usr/local/include - - LIBS += \ - -L/usr/lib - - linux-g++-64 { - LIBS += \ - -L/usr/local/lib64 \ - -L/usr/lib64 - } -} - -# # [REQUIRED] Add support for to Windows. # WindowsBuild { From 400618c3de21f15bd45c8e834f13e926d64fc93b Mon Sep 17 00:00:00 2001 From: Bryant Mairs Date: Sat, 26 Jul 2014 12:17:32 -0700 Subject: [PATCH 2/5] Removed unused variables from QGCExternalLibs.pri. --- QGCSetup.pri | 3 --- 1 file changed, 3 deletions(-) diff --git a/QGCSetup.pri b/QGCSetup.pri index 46bdebb..eea9571 100644 --- a/QGCSetup.pri +++ b/QGCSetup.pri @@ -159,11 +159,8 @@ WindowsBuild { DESTDIR_WIN = $$replace(DESTDIR, "/", "\\") D_DIR = $$[QT_INSTALL_LIBEXECS] DLL_DIR = $$replace(D_DIR, "/", "\\") - P_DIR = $$[QT_INSTALL_PLUGINS] - PLUGIN_DIR = $$replace(P_DIR, "/", "\\") # Copy dependencies - DebugBuild: DLL_QT_DEBUGCHAR = "d" ReleaseBuild: DLL_QT_DEBUGCHAR = "" COPY_FILE_LIST = \ From 91e81957789e3c9932002980933c24dbd06268e6 Mon Sep 17 00:00:00 2001 From: Bryant Mairs Date: Sat, 26 Jul 2014 12:28:25 -0700 Subject: [PATCH 3/5] Fix the advanced checkbox in the RC Config portion of the vehicle config. --- src/ui/QGCVehicleConfig.cc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/ui/QGCVehicleConfig.cc b/src/ui/QGCVehicleConfig.cc index 98ce315..06121d1 100644 --- a/src/ui/QGCVehicleConfig.cc +++ b/src/ui/QGCVehicleConfig.cc @@ -104,8 +104,13 @@ QGCVehicleConfig::QGCVehicleConfig(QWidget *parent) : connect(&updateTimer, SIGNAL(timeout()), this, SLOT(updateView())); updateTimer.start(); - ui->advancedGroupBox->hide(); - connect(ui->advancedCheckBox,SIGNAL(toggled(bool)),ui->advancedGroupBox,SLOT(setShown(bool))); + // Make sure the advanced features match what the checkbox indicates on startup and listen for + // future changes. + if (!ui->advancedCheckBox->isChecked()) + { + ui->advancedGroupBox->hide(); + } + connect(ui->advancedCheckBox, SIGNAL(toggled(bool)), ui->advancedGroupBox,SLOT(setVisible(bool))); } void QGCVehicleConfig::rcMenuButtonClicked() { From 2d216cd91bc9e32b067dc5949cb6af9130b86c0b Mon Sep 17 00:00:00 2001 From: Bryant Mairs Date: Sat, 26 Jul 2014 12:29:02 -0700 Subject: [PATCH 4/5] Remove non-existent signal connection from IncrementalPlot. I don't think it's needed anywhere in QGC since this has been a bug for a long time. --- src/ui/linechart/IncrementalPlot.cc | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/ui/linechart/IncrementalPlot.cc b/src/ui/linechart/IncrementalPlot.cc index a06077d..705a1a9 100644 --- a/src/ui/linechart/IncrementalPlot.cc +++ b/src/ui/linechart/IncrementalPlot.cc @@ -100,8 +100,6 @@ IncrementalPlot::IncrementalPlot(QWidget *parent): resetScaling(); legend = NULL; - - connect(this, SIGNAL(legendChecked(QwtPlotItem*,bool)), this, SLOT(handleLegendClick(QwtPlotItem*,bool))); } IncrementalPlot::~IncrementalPlot() From 2343a697b392ab2c3f8723503620323e8c5294dd Mon Sep 17 00:00:00 2001 From: Bryant Mairs Date: Sat, 26 Jul 2014 13:53:06 -0700 Subject: [PATCH 5/5] Limit libxbee support on Linux to 32-bit builds. Our included make file doesn't build for 64-bit. We actually need better selection on Windows and Linux platforms for building 32-bit or 64-bit versions. --- QGCExternalLibs.pri | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/QGCExternalLibs.pri b/QGCExternalLibs.pri index e4f43ac..9c9e1d8 100644 --- a/QGCExternalLibs.pri +++ b/QGCExternalLibs.pri @@ -293,13 +293,15 @@ contains(DEFINES, DISABLE_XBEE) { } else:exists(user_config.pri):infile(user_config.pri, DEFINES, DISABLE_XBEE) { message("Skipping support for native XBee API (manual override from user_config.pri)") } else:LinuxBuild { - exists(/usr/include/xbee.h) { + linux-g++-64 { + message("Skipping support for XBee API (64-bit Linux builds not supported)") + } else:exists(/usr/include/xbee.h) { message("Including support for XBee API") HEADERS += $$XBEE_DEPENDENT_HEADERS SOURCES += $$XBEE_DEPENDENT_SOURCES DEFINES += $$XBEE_DEFINES - LIBS += -lxbee + LIBS += -L/usr/lib -lxbee } else { warning("Skipping support for XBee API (missing libraries, see README)") }