Skip to content

Convert AutoPilotPlugins to qt_add_qml_module #12929

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DonLakeFlyer merged 1 commit into from
May 28, 2025
Merged

Convert AutoPilotPlugins to qt_add_qml_module #12929

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions qgcresources.qrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
<file alias="accel_right.png">resources/calibration/accel_right.png</file>
<file alias="accel_up.png">resources/calibration/accel_up.png</file>
</qresource>
<qresource prefix="/qml/calibration/mode1">
<qresource prefix="/qml/QGroundControl/AutoPilotPlugins/Common/calibration/mode1">
<file alias="radioCenter.png">resources/calibration/mode1/radioCenter.png</file>
<file alias="radioHome.png">resources/calibration/mode1/radioHome.png</file>
<file alias="radioPitchDown.png">resources/calibration/mode1/radioPitchDown.png</file>
Expand All @@ -88,7 +88,7 @@
<file alias="radioYawLeft.png">resources/calibration/mode1/radioYawLeft.png</file>
<file alias="radioYawRight.png">resources/calibration/mode1/radioYawRight.png</file>
</qresource>
<qresource prefix="/qml/calibration/mode2">
<qresource prefix="/qml/QGroundControl/AutoPilotPlugins/Common/calibration/mode2">
<file alias="radioCenter.png">resources/calibration/mode2/radioCenter.png</file>
<file alias="radioHome.png">resources/calibration/mode2/radioHome.png</file>
<file alias="radioPitchDown.png">resources/calibration/mode2/radioPitchDown.png</file>
Expand Down
13 changes: 2 additions & 11 deletions qgroundcontrol.qrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@
<file alias="BluetoothSettings.qml">src/UI/preferences/BluetoothSettings.qml</file>
<file alias="CorridorScanEditor.qml">src/PlanView/CorridorScanEditor.qml</file>
<file alias="RemoteIDSettings.qml">src/UI/preferences/RemoteIDSettings.qml</file>
<file alias="ESP8266Component.qml">src/AutoPilotPlugins/Common/ESP8266Component.qml</file>
<file alias="ESP8266ComponentSummary.qml">src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml</file>
<file alias="FirmwareUpgrade.qml">src/Vehicle/VehicleSetup/FirmwareUpgrade.qml</file>
<file alias="QGroundControl/FlightDisplay/QGCVideoBackground.qml">src/FlightDisplay/QGCVideoBackground.qml</file>
<file alias="FlightDisplayViewDummy.qml">src/FlightDisplay/FlightDisplayViewDummy.qml</file>
Expand All @@ -61,9 +59,6 @@
<file alias="MAVLinkInspectorPage.qml">src/AnalyzeView/MAVLinkInspectorPage.qml</file>
<file alias="PX4LogTransferSettings.qml">src/UI/preferences/PX4LogTransferSettings.qml</file>
<file alias="MissionSettingsEditor.qml">src/PlanView/MissionSettingsEditor.qml</file>
<file alias="ActuatorComponent.qml">src/AutoPilotPlugins/PX4/ActuatorComponent.qml</file>
<file alias="ActuatorFact.qml">src/AutoPilotPlugins/PX4/ActuatorFact.qml</file>
<file alias="ActuatorSlider.qml">src/AutoPilotPlugins/PX4/ActuatorSlider.qml</file>
<file alias="PlanToolBarIndicators.qml">src/PlanView/PlanToolBarIndicators.qml</file>
<file alias="PlanView.qml">src/PlanView/PlanView.qml</file>
<file alias="PlanViewSettings.qml">src/UI/preferences/PlanViewSettings.qml</file>
Expand Down Expand Up @@ -102,7 +97,6 @@
<file alias="QGroundControl/Controls/LabelledButton.qml">src/QmlControls/LabelledButton.qml</file>
<file alias="QGroundControl/Controls/LabelledComboBox.qml">src/QmlControls/LabelledComboBox.qml</file>
<file alias="QGroundControl/Controls/LabelledLabel.qml">src/QmlControls/LabelledLabel.qml</file>
<file alias="QGroundControl/Controls/MotorComponent.qml">src/AutoPilotPlugins/Common/MotorComponent.qml</file>
<file alias="QGroundControl/Controls/RemoteIDIndicatorPage.qml">src/UI/toolbar/RemoteIDIndicatorPage.qml</file>
<file alias="QGroundControl/Controls/SettingsGroupLayout.qml">src/QmlControls/SettingsGroupLayout.qml</file>
<file alias="QGroundControl/Controls/InstrumentValueLabel.qml">src/QmlControls/InstrumentValueLabel.qml</file>
Expand Down Expand Up @@ -178,7 +172,7 @@
<file alias="QGroundControl/Controls/SectionHeader.qml">src/QmlControls/SectionHeader.qml</file>
<file alias="QGroundControl/Controls/SelectableControl.qml">src/QmlControls/SelectableControl.qml</file>
<file alias="QGroundControl/Controls/SettingsButton.qml">src/QmlControls/SettingsButton.qml</file>
<file alias="QGroundControl/Controls/SetupPage.qml">src/AutoPilotPlugins/Common/SetupPage.qml</file>
<file alias="QGroundControl/Controls/SetupPage.qml">src/QmlControls/SetupPage.qml</file>
<file alias="QGroundControl/Controls/SignalStrength.qml">src/UI/toolbar/SignalStrength.qml</file>
<file alias="QGroundControl/Controls/SimpleItemMapVisual.qml">src/PlanView/SimpleItemMapVisual.qml</file>
<file alias="QGroundControl/Controls/SliderSwitch.qml">src/QmlControls/SliderSwitch.qml</file>
Expand Down Expand Up @@ -250,17 +244,14 @@
<file alias="QGroundControl/FlightDisplay/qmldir">src/QmlControls/QGroundControl/FlightDisplay/qmldir</file>
<file alias="QGroundControl/ScreenTools/qmldir">src/QmlControls/QGroundControl/ScreenTools/qmldir</file>
<file alias="QGroundControl/ScreenTools/ScreenTools.qml">src/QmlControls/ScreenTools.qml</file>
<file alias="RadioComponent.qml">src/AutoPilotPlugins/Common/RadioComponent.qml</file>
<file alias="SerialSettings.qml">src/UI/preferences/SerialSettings.qml</file>
<file alias="SetupParameterEditor.qml">src/Vehicle/VehicleSetup/SetupParameterEditor.qml</file>
<file alias="SetupView.qml">src/Vehicle/VehicleSetup/SetupView.qml</file>
<file alias="SettingsPage.qml">src/UI/preferences/SettingsPage.qml</file>
<file alias="SettingsPagesModel.qml">src/UI/SettingsPagesModel.qml</file>
<file alias="SimpleItemEditor.qml">src/PlanView/SimpleItemEditor.qml</file>
<file alias="StructureScanEditor.qml">src/PlanView/StructureScanEditor.qml</file>
<file alias="SurveyItemEditor.qml">src/PlanView/SurveyItemEditor.qml</file>
<file alias="SyslinkComponent.qml">src/AutoPilotPlugins/Common/SyslinkComponent.qml</file>
<file alias="TcpSettings.qml">src/UI/preferences/TcpSettings.qml</file>
<file alias="SurveyItemEditor.qml">src/PlanView/SurveyItemEditor.qml</file> <file alias="TcpSettings.qml">src/UI/preferences/TcpSettings.qml</file>
<file alias="TelemetrySettings.qml">src/UI/preferences/TelemetrySettings.qml</file>
<file alias="UdpSettings.qml">src/UI/preferences/UdpSettings.qml</file>
<file alias="VehicleSummary.qml">src/Vehicle/VehicleSetup/VehicleSummary.qml</file>
Expand Down
4 changes: 2 additions & 2 deletions src/AutoPilotPlugins/APM/APMAirframeComponent.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ class APMAirframeComponent : public VehicleComponent
QString iconResource() const final { return QStringLiteral("/qmlimages/AirframeComponentIcon.png"); }
bool requiresSetup() const final { return _requiresFrameSetup; }
bool setupComplete() const final;
QUrl setupSource() const final { return (_requiresFrameSetup ? QUrl::fromUserInput(QStringLiteral("qrc:/qml/APMAirframeComponent.qml")) : QUrl()); }
QUrl summaryQmlSource() const final { return (_requiresFrameSetup ? QUrl::fromUserInput(QStringLiteral("qrc:/qml/APMAirframeComponentSummary.qml")) : QUrl()); }
QUrl setupSource() const final { return (_requiresFrameSetup ? QUrl::fromUserInput(QStringLiteral("qrc:/qml/QGroundControl/AutoPilotPlugins/APM/APMAirframeComponent.qml")) : QUrl()); }
QUrl summaryQmlSource() const final { return (_requiresFrameSetup ? QUrl::fromUserInput(QStringLiteral("qrc:/qml/QGroundControl/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml")) : QUrl()); }

private:
bool _requiresFrameSetup = false; ///< true: FRAME parameter must be set
Expand Down
4 changes: 2 additions & 2 deletions src/AutoPilotPlugins/APM/APMCameraComponent.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ APMCameraComponent::APMCameraComponent(Vehicle *vehicle, AutoPilotPlugin *autopi
QUrl APMCameraComponent::setupSource() const
{
if (_vehicle->sub()) {
return QUrl::fromUserInput(QStringLiteral("qrc:/qml/APMCameraSubComponent.qml"));
return QUrl::fromUserInput(QStringLiteral("qrc:/qml/QGroundControl/AutoPilotPlugins/APM/APMCameraSubComponent.qml"));
}

return QUrl::fromUserInput(QStringLiteral("qrc:/qml/APMCameraComponent.qml"));
return QUrl::fromUserInput(QStringLiteral("qrc:/qml/QGroundControl/AutoPilotPlugins/APM/APMCameraComponent.qml"));
}
4 changes: 2 additions & 2 deletions src/AutoPilotPlugins/APM/APMFlightModesComponent.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ class APMFlightModesComponent : public VehicleComponent
QString iconResource() const final { return QStringLiteral("/qmlimages/FlightModesComponentIcon.png"); }
bool requiresSetup() const final { return true; }
bool setupComplete() const final { return true; }
QUrl setupSource() const final { return QUrl::fromUserInput(QStringLiteral("qrc:/qml/APMFlightModesComponent.qml")); }
QUrl summaryQmlSource() const final { return QUrl::fromUserInput(QStringLiteral("qrc:/qml/APMFlightModesComponentSummary.qml")); }
QUrl setupSource() const final { return QUrl::fromUserInput(QStringLiteral("qrc:/qml/QGroundControl/AutoPilotPlugins/APM/APMFlightModesComponent.qml")); }
QUrl summaryQmlSource() const final { return QUrl::fromUserInput(QStringLiteral("qrc:/qml/QGroundControl/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml")); }

private:
const QString _name = tr("Flight Modes");
Expand Down
4 changes: 2 additions & 2 deletions src/AutoPilotPlugins/APM/APMFollowComponent.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ class APMFollowComponent : public VehicleComponent
QString iconResource() const final { return QStringLiteral("/qmlimages/FollowComponentIcon.png"); }
bool requiresSetup() const final { return false; }
bool setupComplete() const final { return true; }
QUrl setupSource() const final { return QUrl::fromUserInput(QStringLiteral("qrc:/qml/APMFollowComponent.qml")); }
QUrl summaryQmlSource() const final { return QUrl::fromUserInput(QStringLiteral("qrc:/qml/APMFollowComponentSummary.qml")); }
QUrl setupSource() const final { return QUrl::fromUserInput(QStringLiteral("qrc:/qml/QGroundControl/AutoPilotPlugins/APM/APMFollowComponent.qml")); }
QUrl summaryQmlSource() const final { return QUrl::fromUserInput(QStringLiteral("qrc:/qml/QGroundControl/AutoPilotPlugins/APM/APMFollowComponentSummary.qml")); }
bool allowSetupWhileArmed() const final { return true; }
bool allowSetupWhileFlying() const final { return true; }

Expand Down
2 changes: 1 addition & 1 deletion src/AutoPilotPlugins/APM/APMHeliComponent.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class APMHeliComponent : public VehicleComponent
QString iconResource() const final { return QStringLiteral("/res/helicoptericon.svg"); }
bool requiresSetup() const final { return false; }
bool setupComplete() const final { return true; }
QUrl setupSource() const final { return QUrl::fromUserInput(QStringLiteral("qrc:/qml/APMHeliComponent.qml")); }
QUrl setupSource() const final { return QUrl::fromUserInput(QStringLiteral("qrc:/qml/QGroundControl/AutoPilotPlugins/APM/APMHeliComponent.qml")); }
QUrl summaryQmlSource() const final { return QUrl(); }
bool allowSetupWhileArmed() const final { return true; }

Expand Down
4 changes: 2 additions & 2 deletions src/AutoPilotPlugins/APM/APMLightsComponent.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ class APMLightsComponent : public VehicleComponent
QString iconResource() const final { return QStringLiteral("/qmlimages/LightsComponentIcon.png"); }
bool requiresSetup() const final { return false; }
bool setupComplete() const final { return true; }
QUrl setupSource() const final { return QUrl::fromUserInput(QStringLiteral("qrc:/qml/APMLightsComponent.qml")); }
QUrl summaryQmlSource() const final { return QUrl::fromUserInput(QStringLiteral("qrc:/qml/APMLightsComponentSummary.qml")); }
QUrl setupSource() const final { return QUrl::fromUserInput(QStringLiteral("qrc:/qml/QGroundControl/AutoPilotPlugins/APM/APMLightsComponent.qml")); }
QUrl summaryQmlSource() const final { return QUrl::fromUserInput(QStringLiteral("qrc:/qml/QGroundControl/AutoPilotPlugins/APM/APMLightsComponentSummary.qml")); }

private:
const QString _name = tr("Lights");
Expand Down
4 changes: 2 additions & 2 deletions src/AutoPilotPlugins/APM/APMMotorComponent.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ QUrl APMMotorComponent::setupSource() const
{
switch (_vehicle->vehicleType()) {
case MAV_TYPE_SUBMARINE:
return QUrl::fromUserInput(QStringLiteral("qrc:/qml/APMSubMotorComponent.qml"));
return QUrl::fromUserInput(QStringLiteral("qrc:/qml/QGroundControl/AutoPilotPlugins/APM/APMSubMotorComponent.qml"));
default:
return QUrl::fromUserInput(QStringLiteral("qrc:/qml/APMMotorComponent.qml"));
return QUrl::fromUserInput(QStringLiteral("qrc:/qml/QGroundControl/AutoPilotPlugins/APM/APMMotorComponent.qml"));
}
}
1 change: 1 addition & 0 deletions src/AutoPilotPlugins/APM/APMMotorComponent.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
****************************************************************************/

import QGroundControl.Controls
import QGroundControl.AutoPilotPlugins.Common

MotorComponent {
userLetterMotorIndices: true
Expand Down
4 changes: 2 additions & 2 deletions src/AutoPilotPlugins/APM/APMPowerComponent.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ class APMPowerComponent : public VehicleComponent
QString iconResource() const final { return QStringLiteral("/qmlimages/PowerComponentIcon.png"); }
bool requiresSetup() const final { return false; }
bool setupComplete() const final { return true; }
QUrl setupSource() const final { return QUrl::fromUserInput(QStringLiteral("qrc:/qml/APMPowerComponent.qml")); }
QUrl summaryQmlSource() const final { return QUrl::fromUserInput(QStringLiteral("qrc:/qml/APMPowerComponentSummary.qml")); }
QUrl setupSource() const final { return QUrl::fromUserInput(QStringLiteral("qrc:/qml/QGroundControl/AutoPilotPlugins/APM/APMPowerComponent.qml")); }
QUrl summaryQmlSource() const final { return QUrl::fromUserInput(QStringLiteral("qrc:/qml/QGroundControl/AutoPilotPlugins/APM/APMPowerComponentSummary.qml")); }
bool allowSetupWhileArmed() const final { return true; }

private:
Expand Down
4 changes: 2 additions & 2 deletions src/AutoPilotPlugins/APM/APMRadioComponent.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ class APMRadioComponent : public VehicleComponent
QString iconResource() const final { return QStringLiteral("/qmlimages/RadioComponentIcon.png"); }
bool requiresSetup() const final { return true; }
bool setupComplete() const final;
QUrl setupSource() const final { return QUrl::fromUserInput(QStringLiteral("qrc:/qml/RadioComponent.qml")); }
QUrl summaryQmlSource() const final { return QUrl::fromUserInput(QStringLiteral("qrc:/qml/APMRadioComponentSummary.qml")); }
QUrl setupSource() const final { return QUrl::fromUserInput(QStringLiteral("qrc:/qml/QGroundControl/AutoPilotPlugins/Common/RadioComponent.qml")); }
QUrl summaryQmlSource() const final { return QUrl::fromUserInput(QStringLiteral("qrc:/qml/QGroundControl/AutoPilotPlugins/APM/APMRadioComponentSummary.qml")); }

private slots:
void _triggerChanged();
Expand Down
2 changes: 1 addition & 1 deletion src/AutoPilotPlugins/APM/APMRemoteSupportComponent.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class APMRemoteSupportComponent : public VehicleComponent
QString iconResource() const final { return QStringLiteral("/qmlimages/ForwardingSupportIcon.svg"); }
bool requiresSetup() const final { return false; }
bool setupComplete() const final { return true; }
QUrl setupSource() const final { return QUrl::fromUserInput(QStringLiteral("qrc:/qml/APMRemoteSupportComponent.qml")); }
QUrl setupSource() const final { return QUrl::fromUserInput(QStringLiteral("qrc:/qml/QGroundControl/AutoPilotPlugins/APM/APMRemoteSupportComponent.qml")); }
QUrl summaryQmlSource() const final { return QUrl(); }

private:
Expand Down
12 changes: 6 additions & 6 deletions src/AutoPilotPlugins/APM/APMSafetyComponent.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@ QUrl APMSafetyComponent::setupSource() const
case MAV_TYPE_OCTOROTOR:
case MAV_TYPE_TRICOPTER:
case MAV_TYPE_GROUND_ROVER:
return QUrl::fromUserInput(QStringLiteral("qrc:/qml/APMSafetyComponent.qml"));
return QUrl::fromUserInput(QStringLiteral("qrc:/qml/QGroundControl/AutoPilotPlugins/APM/APMSafetyComponent.qml"));
case MAV_TYPE_SUBMARINE:
return QUrl::fromUserInput(QStringLiteral("qrc:/qml/APMSafetyComponentSub.qml"));
return QUrl::fromUserInput(QStringLiteral("qrc:/qml/QGroundControl/AutoPilotPlugins/APM/APMSafetyComponentSub.qml"));
default:
return QUrl::fromUserInput(QStringLiteral("qrc:/qml/APMNotSupported.qml"));
return QUrl::fromUserInput(QStringLiteral("qrc:/qml/QGroundControl/AutoPilotPlugins/APM/APMNotSupported.qml"));
}
}

Expand All @@ -65,10 +65,10 @@ QUrl APMSafetyComponent::summaryQmlSource() const
case MAV_TYPE_OCTOROTOR:
case MAV_TYPE_TRICOPTER:
case MAV_TYPE_GROUND_ROVER:
return QUrl::fromUserInput(QStringLiteral("qrc:/qml/APMSafetyComponentSummary.qml"));
return QUrl::fromUserInput(QStringLiteral("qrc:/qml/QGroundControl/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml"));
case MAV_TYPE_SUBMARINE:
return QUrl::fromUserInput(QStringLiteral("qrc:/qml/APMSafetyComponentSummarySub.qml"));
return QUrl::fromUserInput(QStringLiteral("qrc:/qml/QGroundControl/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml"));
default:
return QUrl::fromUserInput(QStringLiteral("qrc:/qml/APMNotSupported.qml"));
return QUrl::fromUserInput(QStringLiteral("qrc:/qml/QGroundControl/AutoPilotPlugins/APM/APMNotSupported.qml"));
}
}
4 changes: 2 additions & 2 deletions src/AutoPilotPlugins/APM/APMSensorsComponent.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ class APMSensorsComponent : public VehicleComponent
QString iconResource() const final { return QStringLiteral("/qmlimages/SensorsComponentIcon.png"); }
bool requiresSetup() const final { return true; }
bool setupComplete() const final { return (!compassSetupNeeded() && !accelSetupNeeded()); }
QUrl setupSource() const final { return QUrl::fromUserInput("qrc:/qml/APMSensorsComponent.qml"); }
QUrl summaryQmlSource() const final { return QUrl::fromUserInput("qrc:/qml/APMSensorsComponentSummary.qml"); }
QUrl setupSource() const final { return QUrl::fromUserInput("qrc:/qml/QGroundControl/AutoPilotPlugins/APM/APMSensorsComponent.qml"); }
QUrl summaryQmlSource() const final { return QUrl::fromUserInput("qrc:/qml/QGroundControl/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml"); }

private:
const QString _name = tr("Sensors");
Expand Down
1 change: 0 additions & 1 deletion src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import QGroundControl.Controls
import QGroundControl.Palette
import QGroundControl.Controllers
import QGroundControl.ArduPilot

/*
IMPORTANT NOTE: Any changes made here must also be made to SensorsComponentSummary.qml
*/
Expand Down
4 changes: 2 additions & 2 deletions src/AutoPilotPlugins/APM/APMSubFrameComponent.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ class APMSubFrameComponent : public VehicleComponent
QString iconResource() const final { return QStringLiteral("/qmlimages/SubFrameComponentIcon.png"); }
bool requiresSetup() const final { return false; }
bool setupComplete() const final { return true; }
QUrl setupSource() const final { return QUrl::fromUserInput(QStringLiteral("qrc:/qml/APMSubFrameComponent.qml")); }
QUrl summaryQmlSource() const final { return QUrl::fromUserInput(QStringLiteral("qrc:/qml/APMSubFrameComponentSummary.qml")); }
QUrl setupSource() const final { return QUrl::fromUserInput(QStringLiteral("qrc:/qml/QGroundControl/AutoPilotPlugins/APM/APMSubFrameComponent.qml")); }
QUrl summaryQmlSource() const final { return QUrl::fromUserInput(QStringLiteral("qrc:/qml/QGroundControl/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml")); }

private:
const QString _name = tr("Frame");
Expand Down
4 changes: 2 additions & 2 deletions src/AutoPilotPlugins/APM/APMTuningComponent.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ QUrl APMTuningComponent::setupSource() const
case MAV_TYPE_HEXAROTOR:
case MAV_TYPE_OCTOROTOR:
case MAV_TYPE_TRICOPTER:
return QUrl::fromUserInput("qrc:/qml/APMTuningComponentCopter.qml");
return QUrl::fromUserInput("qrc:/qml/QGroundControl/AutoPilotPlugins/APM/APMTuningComponentCopter.qml");
case MAV_TYPE_SUBMARINE:
return QUrl::fromUserInput("qrc:/qml/APMTuningComponentSub.qml");
return QUrl::fromUserInput("qrc:/qml/QGroundControl/AutoPilotPlugins/APM/APMTuningComponentSub.qml");
default:
return QUrl::fromUserInput(QString());
}
Expand Down
Loading
Loading