Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
b6dbe951
Commit
b6dbe951
authored
May 15, 2019
by
Gus Grubba
Browse files
Fix runtime QML warnings
parent
0806f857
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/VehicleSetup/SetupView.qml
View file @
b6dbe951
...
@@ -102,7 +102,7 @@ Rectangle {
...
@@ -102,7 +102,7 @@ Rectangle {
onParameterReadyVehicleAvailableChanged
:
{
onParameterReadyVehicleAvailableChanged
:
{
if
(
!
QGroundControl
.
skipSetupPage
)
{
if
(
!
QGroundControl
.
skipSetupPage
)
{
if
(
parameterReadyVehicleAvailable
||
summaryButton
.
checked
||
setupButtonGroup
.
current
!=
firmwareButton
)
{
if
(
QGroundControl
.
multiVehicleManager
.
parameterReadyVehicleAvailable
||
summaryButton
.
checked
||
setupButtonGroup
.
current
!=
firmwareButton
)
{
// Show/Reload the Summary panel when:
// Show/Reload the Summary panel when:
// A new vehicle shows up
// A new vehicle shows up
// The summary panel is already showing and the active vehicle goes away
// The summary panel is already showing and the active vehicle goes away
...
...
src/ui/toolbar/MainToolBar.qml
View file @
b6dbe951
...
@@ -38,9 +38,9 @@ Item {
...
@@ -38,9 +38,9 @@ Item {
//-- Setup can be invoked from c++ side
//-- Setup can be invoked from c++ side
Connections
{
Connections
{
target
:
mainContent
Window
target
:
setup
Window
on
Sourc
eChanged
:
{
on
Visibl
eChanged
:
{
if
(
mainContentWindow
.
source
.
toString
().
endsWith
(
setupViewSource
)
)
{
if
(
setupWindow
.
visible
)
{
setupButton
.
checked
=
true
setupButton
.
checked
=
true
}
}
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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