Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
efd085d1
Commit
efd085d1
authored
Apr 04, 2016
by
Nate Weibley
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix case sensitive names, QPointer header, and mobile builds
parent
c51a1a6e
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
9 deletions
+11
-9
qgroundcontrol.pro
qgroundcontrol.pro
+4
-4
QGCDockWidget.h
src/QGCDockWidget.h
+3
-2
AppMessagesDialog.cc
src/ViewWidgets/AppMessagesDialog.cc
+0
-0
AppMessagesDialog.h
src/ViewWidgets/AppMessagesDialog.h
+0
-0
main.cc
src/main.cc
+4
-3
No files found.
qgroundcontrol.pro
View file @
efd085d1
...
@@ -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
}
}
#
#
...
...
src/QGCDockWidget.h
View file @
efd085d1
...
@@ -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
...
...
src/ViewWidgets/
appmessagesd
ialog.cc
→
src/ViewWidgets/
AppMessagesD
ialog.cc
View file @
efd085d1
File moved
src/ViewWidgets/
appmessagesd
ialog.h
→
src/ViewWidgets/
AppMessagesD
ialog.h
View file @
efd085d1
File moved
src/main.cc
View file @
efd085d1
...
@@ -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"
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment