Renamed configuration.h to QGCConfig.h to avoid issues with opmapcontrol's configuration.h

qgroundcontrol.pro

@@ -406,7 +406,7 @@ HEADERS += \
     src/ui/linechart/LinechartPlot.h \
     src/ui/linechart/Scrollbar.h \
     src/ui/linechart/ScrollZoomer.h \
-    src/configuration.h \
+    src/QGCConfig.h \
     src/ui/uas/UASView.h \
     src/ui/CameraView.h \
     src/comm/MAVLinkSimulationLink.h \

src/QGC.h

@@ -28,7 +28,7 @@
 #include <QColor>
 #include <QThread>
 
-#include "configuration.h"
+#include "QGCConfig.h"
 
 
 /* Windows fixes */

src/comm/OpalLink.h

@@ -44,7 +44,7 @@ This file is part of the QGROUNDCONTROL project
 #include "LinkManager.h"
 #include "MG.h"
 #include "QGCMAVLink.h"
-#include "configuration.h"
+#include "QGCConfig.h"
 #include "OpalRT.h"
 #include "ParameterList.h"
 #include "Parameter.h"

src/comm/QGCFlightGearLink.h

@@ -39,7 +39,7 @@ This file is part of the QGROUNDCONTROL project
 #include <QTimer>
 #include <QProcess>
 #include <LinkInterface.h>
-#include <configuration.h>
+#include "QGCConfig.h"
 #include "UASInterface.h"
 #include "QGCHilLink.h"
 #include <QGCHilFlightGearConfiguration.h>

src/comm/QGCJSBSimLink.h

@@ -39,7 +39,7 @@ This file is part of the QGROUNDCONTROL project
 #include <QTimer>
 #include <QProcess>
 #include <LinkInterface.h>
-#include <configuration.h>
+#include "QGCConfig.h"
 #include "UASInterface.h"
 #include "QGCHilLink.h"
 

src/comm/QGCXPlaneLink.h

@@ -39,7 +39,7 @@ This file is part of the QGROUNDCONTROL project
 #include <QTimer>
 #include <QProcess>
 #include <LinkInterface.h>
-#include <configuration.h>
+#include "QGCConfig.h"
 #include "UASInterface.h"
 #include "QGCHilLink.h"
 

src/comm/SerialLink.h

@@ -36,7 +36,7 @@ This file is part of the QGROUNDCONTROL project
 #include <QThread>
 #include <QMutex>
 #include <QString>
-#include <configuration.h>
+#include "QGCConfig.h"
 #include "SerialLinkInterface.h"
 
 // We use QSerialPort::SerialPortError in a signal so we must declare it as a meta type
@@ -67,7 +67,7 @@ public:
                int stopBits=1);
     ~SerialLink();
 
-    static const int poll_interval = SERIAL_POLL_INTERVAL; ///< Polling interval, defined in configuration.h
+    static const int poll_interval = SERIAL_POLL_INTERVAL; ///< Polling interval, defined in QGCConfig.h
 
     /** @brief Get a list of the currently available ports */
     QList<QString> getCurrentPorts();

src/comm/TCPLink.h

@@ -35,7 +35,7 @@
 #include <QMutex>
 #include <QHostAddress>
 #include <LinkInterface.h>
-#include <configuration.h>
+#include "QGCConfig.h"
 
 // Even though QAbstractSocket::SocketError is used in a signal by Qt, Qt doesn't declare it as a meta type.
 // This in turn causes debug output to be kicked out about not being able to queue the signal. We declare it

src/comm/UDPLink.h

@@ -37,7 +37,7 @@ This file is part of the QGROUNDCONTROL project
 #include <QMutex>
 #include <QUdpSocket>
 #include <LinkInterface.h>
-#include <configuration.h>
+#include "QGCConfig.h"
 
 class UDPLink : public LinkInterface
 {

src/ui/configuration/terminalconsole.cpp

@@ -37,7 +37,7 @@ This file is part of the APM_PLANNER project
 #include "terminalconsole.h"
 #include "ui_terminalconsole.h"
 #include "console.h"
-#include "configuration.h"
+#include "QGCConfig.h"
 
 #include <QDebug>
 #include <QSettings>