Commit efd085d1 authored by Nate Weibley's avatar Nate Weibley

Fix case sensitive names, QPointer header, and mobile builds

parent c51a1a6e
......@@ -297,8 +297,7 @@ HEADERS += \
src/AutoPilotPlugins/APM/APMAirframeLoader.h \
src/QmlControls/QGCImageProvider.h \
src/AutoPilotPlugins/APM/APMRemoteParamsDownloader.h \
src/QtLocationPlugin/QMLControl/QGCMapEngineManager.h \
src/ViewWidgets/AppMessagesDialog.h
src/QtLocationPlugin/QMLControl/QGCMapEngineManager.h
DebugBuild {
HEADERS += \
......@@ -371,6 +370,7 @@ HEADERS += \
src/ViewWidgets/LogDownload.h \
src/ViewWidgets/LogDownloadController.h \
src/ViewWidgets/ViewWidgetController.h \
src/ViewWidgets/AppMessagesDialog.h
}
iOSBuild {
......@@ -437,8 +437,7 @@ SOURCES += \
src/AutoPilotPlugins/APM/APMAirframeLoader.cc \
src/QmlControls/QGCImageProvider.cc \
src/AutoPilotPlugins/APM/APMRemoteParamsDownloader.cc \
src/QtLocationPlugin/QMLControl/QGCMapEngineManager.cc \
src/ViewWidgets/AppMessagesDialog.cc
src/QtLocationPlugin/QMLControl/QGCMapEngineManager.cc
DebugBuild {
SOURCES += \
......@@ -504,6 +503,7 @@ SOURCES += \
src/ViewWidgets/LogDownload.cc \
src/ViewWidgets/LogDownloadController.cc \
src/ViewWidgets/ViewWidgetController.cc \
src/ViewWidgets/AppMessagesDialog.cc
}
#
......
......@@ -26,6 +26,7 @@
#include <QDockWidget>
#include <QAction>
#include <QPointer>
class QGCDockWidget : public QWidget {
Q_OBJECT
......@@ -38,10 +39,10 @@ public:
void saveSettings(void);
void closeEvent(QCloseEvent* event);
protected:
QString _title;
QPointer<QAction> _action;
QPointer<QAction> _action;
static const char* _settingsGroup;
};
......
......@@ -36,13 +36,13 @@ This file is part of the QGROUNDCONTROL project
#include <QUdpSocket>
#include <QtPlugin>
#include <QStringListModel>
#include "AppMessagesDialog.h"
#include "QGCApplication.h"
#define SINGLE_INSTANCE_PORT 14499
#ifndef __mobile__
#include "QGCSerialPortInfo.h"
#include "AppMessagesDialog.h"
#endif
#ifdef QT_DEBUG
......@@ -116,6 +116,9 @@ int main(int argc, char *argv[])
{
#ifndef __mobile__
// install the message handler
AppMessagesDialog::installHandler();
//-- Test for another instance already running. If that's the case, we simply exit.
QHostAddress host("127.0.0.1");
QUdpSocket socket;
......@@ -133,8 +136,6 @@ int main(int argc, char *argv[])
#endif
#endif
// install the message handler
AppMessagesDialog::installHandler();
#ifdef Q_OS_WIN
// Set our own OpenGL buglist
qputenv("QT_OPENGL_BUGLIST", ":/opengl/resources/opengl/buglist.json");
......
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