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