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
fc464312
Commit
fc464312
authored
Apr 20, 2017
by
Gus Grubba
Committed by
GitHub
Apr 20, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #5028 from dogmaphobic/uiTweaks
Ui tweaks
parents
da022f97
747c2917
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
16 additions
and
10 deletions
+16
-10
crash_generation_client.cc
.../client/linux/crash_generation/crash_generation_client.cc
+2
-1
exception_handler.cc
libs/breakpad/src/client/linux/handler/exception_handler.cc
+1
-1
log.cc
libs/breakpad/src/client/linux/log/log.cc
+3
-2
microdump_writer.cc
...pad/src/client/linux/microdump_writer/microdump_writer.cc
+2
-1
linux_dumper.cc
...breakpad/src/client/linux/minidump_writer/linux_dumper.cc
+2
-1
FlightDisplayView.qml
src/FlightDisplay/FlightDisplayView.qml
+1
-1
QGCApplication.cc
src/QGCApplication.cc
+3
-3
ToolStrip.qml
src/QmlControls/ToolStrip.qml
+2
-0
No files found.
libs/breakpad/src/client/linux/crash_generation/crash_generation_client.cc
View file @
fc464312
...
...
@@ -58,7 +58,8 @@ class CrashGenerationClientImpl : public CrashGenerationClient {
iov
.
iov_base
=
const_cast
<
void
*>
(
blob
);
iov
.
iov_len
=
blob_size
;
struct
kernel_msghdr
msg
=
{
0
};
struct
kernel_msghdr
msg
;
memset
(
&
msg
,
0
,
sizeof
(
kernel_msghdr
));
msg
.
msg_iov
=
&
iov
;
msg
.
msg_iovlen
=
1
;
char
cmsg
[
kControlMsgSize
]
=
""
;
...
...
libs/breakpad/src/client/linux/handler/exception_handler.cc
View file @
fc464312
...
...
@@ -471,7 +471,7 @@ bool ExceptionHandler::HandleSignal(int /*sig*/, siginfo_t* info, void* uc) {
// This is a public interface to HandleSignal that allows the client to
// generate a crash dump. This function may run in a compromised context.
bool
ExceptionHandler
::
SimulateSignalDelivery
(
int
sig
)
{
siginfo_t
siginfo
=
{}
;
siginfo_t
siginfo
;
// Mimic a trusted signal to allow tracing the process (see
// ExceptionHandler::HandleSignal().
siginfo
.
si_code
=
SI_USER
;
...
...
libs/breakpad/src/client/linux/log/log.cc
View file @
fc464312
...
...
@@ -75,9 +75,10 @@ int writeToCrashLog(const char* buf) {
int
write
(
const
char
*
buf
,
size_t
nbytes
)
{
#if defined(__ANDROID__)
return
__android_log_write
(
ANDROID_LOG_WARN
,
kAndroidLogTag
,
buf
);
(
void
)
nbytes
;
return
__android_log_write
(
ANDROID_LOG_WARN
,
kAndroidLogTag
,
buf
);
#else
return
sys_write
(
2
,
buf
,
nbytes
);
return
sys_write
(
2
,
buf
,
nbytes
);
#endif
}
...
...
libs/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
View file @
fc464312
...
...
@@ -449,7 +449,8 @@ class MicrodumpWriter {
}
// Copy as many bytes of |identifier| as will fit into a MDGUID
MDGUID
module_identifier
=
{
0
};
MDGUID
module_identifier
;
memset
(
&
module_identifier
,
0
,
sizeof
(
MDGUID
));
memcpy
(
&
module_identifier
,
&
identifier_bytes
[
0
],
std
::
min
(
sizeof
(
MDGUID
),
identifier_bytes
.
size
()));
...
...
libs/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
View file @
fc464312
...
...
@@ -874,7 +874,8 @@ bool LinuxDumper::HandleDeletedFileInMapping(char* path) const {
char
exe_link
[
NAME_MAX
];
if
(
!
BuildProcPath
(
exe_link
,
pid_
,
"exe"
))
return
false
;
MappingInfo
new_mapping
=
{
0
};
MappingInfo
new_mapping
;
memset
(
&
new_mapping
,
0
,
sizeof
(
MappingInfo
));
if
(
!
SafeReadLink
(
exe_link
,
new_mapping
.
name
))
return
false
;
char
new_path
[
PATH_MAX
];
...
...
src/FlightDisplay/FlightDisplayView.qml
View file @
fc464312
...
...
@@ -407,7 +407,7 @@ QGCView {
id
:
toolStrip
anchors.leftMargin
:
ScreenTools
.
defaultFontPixelWidth
anchors.left
:
_panel
.
left
anchors.topMargin
:
ScreenTools
.
toolbarHeight
+
_margins
anchors.topMargin
:
ScreenTools
.
toolbarHeight
+
(
_margins
*
2
)
anchors.top
:
_panel
.
top
z
:
_panel
.
z
+
4
title
:
qsTr
(
"
Fly
"
)
...
...
src/QGCApplication.cc
View file @
fc464312
...
...
@@ -144,10 +144,10 @@ static QObject* qgroundcontrolQmlGlobalSingletonFactory(QQmlEngine*, QJSEngine*)
// breakpad support
#include "client/linux/handler/exception_handler.h"
static
bool
dumpCallback
(
const
google_breakpad
::
MinidumpDescriptor
&
descriptor
,
void
*
context
,
bool
succeeded
)
static
bool
dumpCallback
(
const
google_breakpad
::
MinidumpDescriptor
&
descriptor
,
void
*
/*context*/
,
bool
succeeded
)
{
qDebug
()
<<
"dumpCallback"
<<
succeeded
<<
descriptor
.
path
();
return
succeeded
;
qDebug
()
<<
"dumpCallback"
<<
succeeded
<<
descriptor
.
path
();
return
succeeded
;
}
#endif
...
...
src/QmlControls/ToolStrip.qml
View file @
fc464312
...
...
@@ -19,6 +19,8 @@ Rectangle {
width
:
ScreenTools
.
isMobile
?
ScreenTools
.
minTouchPixels
:
ScreenTools
.
defaultFontPixelWidth
*
6
height
:
buttonStripColumn
.
height
+
(
buttonStripColumn
.
anchors
.
margins
*
2
)
radius
:
_radius
border.width
:
1
border.color
:
qgcPal
.
globalTheme
===
QGCPalette
.
Light
?
Qt
.
rgba
(
0
,
0
,
0
,
0.35
)
:
Qt
.
rgba
(
1
,
1
,
1
,
0.35
)
property
string
title
:
"
Title
"
property
alias
model
:
repeater
.
model
...
...
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