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
62bc5a63
Commit
62bc5a63
authored
Oct 25, 2016
by
Gus Grubba
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt 5.5.x doesn't know how to handle redirects.
parent
a85cdd59
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
7 deletions
+15
-7
MavlinkLogManager.cc
src/Vehicle/MavlinkLogManager.cc
+2
-0
MavlinkSettings.qml
src/ui/preferences/MavlinkSettings.qml
+13
-7
No files found.
src/Vehicle/MavlinkLogManager.cc
View file @
62bc5a63
...
...
@@ -460,7 +460,9 @@ MavlinkLogManager::_sendLog(const QString& logFile)
multiPart
->
append
(
logPart
);
file
->
setParent
(
multiPart
);
QNetworkRequest
request
(
_uploadURL
);
#if QT_VERSION > 0x050600
request
.
setAttribute
(
QNetworkRequest
::
FollowRedirectsAttribute
,
true
);
#endif
QNetworkReply
*
reply
=
_nam
->
post
(
request
,
multiPart
);
connect
(
reply
,
&
QNetworkReply
::
finished
,
this
,
&
MavlinkLogManager
::
_uploadFinished
);
connect
(
this
,
&
MavlinkLogManager
::
abortUpload
,
reply
,
&
QNetworkReply
::
abort
);
...
...
src/ui/preferences/MavlinkSettings.qml
View file @
62bc5a63
...
...
@@ -29,18 +29,24 @@ Rectangle {
property
real
_valueWidth
:
ScreenTools
.
defaultFontPixelWidth
*
24
property
int
_selectedCount
:
0
property
real
_columnSpacing
:
ScreenTools
.
defaultFontPixelHeight
*
0.25
property
bool
_uploadedSelected
:
false
QGCPalette
{
id
:
qgcPal
}
Connections
{
target
:
QGroundControl
.
mavlinkLogManager
onSelectedCountChanged
:
{
_uploadedSelected
=
false
var
selected
=
0
for
(
var
i
=
0
;
i
<
QGroundControl
.
mavlinkLogManager
.
logFiles
.
count
;
i
++
)
{
var
logFile
=
QGroundControl
.
mavlinkLogManager
.
logFiles
.
get
(
i
)
if
(
logFile
.
selected
)
if
(
logFile
.
selected
)
{
selected
++
//-- If an uploaded file is selected, disable "Upload" button
if
(
logFile
.
uploaded
)
{
_uploadedSelected
=
true
}
}
}
_selectedCount
=
selected
}
...
...
@@ -425,7 +431,7 @@ Rectangle {
}
QGCButton
{
text
:
"
Upload Selected
"
enabled
:
_selectedCount
>
0
&&
!
QGroundControl
.
mavlinkLogManager
.
uploading
&&
!
QGroundControl
.
mavlinkLogManager
.
logRunning
enabled
:
_selectedCount
>
0
&&
!
QGroundControl
.
mavlinkLogManager
.
uploading
&&
!
QGroundControl
.
mavlinkLogManager
.
logRunning
&&
!
_uploadedSelected
visible
:
!
QGroundControl
.
mavlinkLogManager
.
uploading
onClicked
:
{
QGroundControl
.
mavlinkLogManager
.
emailAddress
=
emailField
.
text
...
...
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