Merge pull request #6306 from DonLakeFlyer/NoMobileCharts

PID Tuning: Make QtCharts usage desktop only

Merge pull request #6306 from DonLakeFlyer/NoMobileCharts
PID Tuning: Make QtCharts usage desktop only
9b7cfd25 · Don Gagne · GitHub · 89ebf715 · 7f595c1e · 9b7cfd25
Unverified Commit 9b7cfd25 authored Apr 05, 2018 by Don Gagne Committed by GitHub Apr 05, 2018
Showing with 385 additions and 371 deletions

QGCSetup.pri QGCSetup.pri +1 -0

qgroundcontrol.pro qgroundcontrol.pro +1 -0

PX4TuningComponentCopter.qml src/AutoPilotPlugins/PX4/PX4TuningComponentCopter.qml +383 -371

No files found.
--- a/QGCSetup.pri
+++ b/QGCSetup.pri
@@ -102,6 +102,7 @@ LinuxBuild {

    # QT_INSTALL_LIBS
    QT_LIB_LIST = \
+        libQt5Charts.so.5 \
        libQt5Core.so.5 \
        libQt5DBus.so.5 \
        libQt5Gui.so.5 \

--- a/qgroundcontrol.pro
+++ b/qgroundcontrol.pro
@@ -240,6 +240,7 @@ AndroidBuild || iOSBuild {
    QT += \
        printsupport \
        serialport \
+        charts \
 }

 contains(DEFINES, QGC_ENABLE_BLUETOOTH) {

--- a/src/AutoPilotPlugins/PX4/PX4TuningComponentCopter.qml
+++ b/src/AutoPilotPlugins/PX4/PX4TuningComponentCopter.qml