From b5143c6b9cba20622819cd04889de547e2a1e577 Mon Sep 17 00:00:00 2001 From: Gus Grubba Date: Wed, 15 May 2019 13:58:11 -0400 Subject: [PATCH] Splitting qgcresources.qrc as the Windows build is barfing on it. --- qgcimages.qrc | 180 +++++++++++++++++++++++++++++++++++++ qgcresources.qrc | 220 +++++---------------------------------------- qgroundcontrol.pro | 9 +- 3 files changed, 209 insertions(+), 200 deletions(-) create mode 100644 qgcimages.qrc diff --git a/qgcimages.qrc b/qgcimages.qrc new file mode 100644 index 000000000..6f06746fd --- /dev/null +++ b/qgcimages.qrc @@ -0,0 +1,180 @@ + + + resources/camera.svg + src/FlightMap/Images/adsbVehicle.svg + src/AutoPilotPlugins/Common/Images/AirframeSimulation.svg + src/AutoPilotPlugins/Common/Images/AirframeUnknown.svg + src/AutoPilotPlugins/Common/Images/Boat.svg + src/AutoPilotPlugins/Common/Images/FlyingWing.svg + src/AutoPilotPlugins/Common/Images/Helicopter.svg + src/AutoPilotPlugins/Common/Images/HelicopterCoaxial.svg + src/AutoPilotPlugins/Common/Images/HexaRotorPlus.svg + src/AutoPilotPlugins/Common/Images/HexaRotorX.svg + src/AutoPilotPlugins/Common/Images/OctoRotorPlus.svg + src/AutoPilotPlugins/Common/Images/OctoRotorPlusCoaxial.svg + src/AutoPilotPlugins/Common/Images/OctoRotorX.svg + src/AutoPilotPlugins/Common/Images/OctoRotorXCoaxial.svg + src/AutoPilotPlugins/Common/Images/Plane.svg + src/AutoPilotPlugins/Common/Images/PlaneATail.svg + src/AutoPilotPlugins/Common/Images/PlaneVTail.svg + src/AutoPilotPlugins/Common/Images/QuadRotorATail.svg + src/AutoPilotPlugins/Common/Images/QuadRotorH.svg + src/AutoPilotPlugins/Common/Images/QuadRotorPlus.svg + src/AutoPilotPlugins/Common/Images/QuadRotorVTail.svg + src/AutoPilotPlugins/Common/Images/QuadRotorWide.svg + src/AutoPilotPlugins/Common/Images/QuadRotorX.svg + src/AutoPilotPlugins/Common/Images/Rover.svg + src/AutoPilotPlugins/Common/Images/VTOLDuoRotorTailSitter.svg + src/AutoPilotPlugins/Common/Images/VTOLPlane.svg + src/AutoPilotPlugins/Common/Images/VTOLQuadRotorTailSitter.svg + src/AutoPilotPlugins/Common/Images/VTOLTiltRotor.svg + src/AutoPilotPlugins/Common/Images/Y6A.svg + src/AutoPilotPlugins/Common/Images/Y6B.svg + src/AutoPilotPlugins/Common/Images/YMinus.svg + src/AutoPilotPlugins/Common/Images/YPlus.svg + src/AutoPilotPlugins/Common/Images/AirframeComponentIcon.png + src/AutoPilotPlugins/Common/Images/FlyingWing.svg + src/AutoPilotPlugins/Common/Images/HexaRotorPlus.svg + src/AutoPilotPlugins/Common/Images/HexaRotorX.svg + src/AutoPilotPlugins/Common/Images/OctoRotorPlus.svg + src/AutoPilotPlugins/Common/Images/OctoRotorX.svg + src/AutoPilotPlugins/Common/Images/QuadRotorH.svg + src/AutoPilotPlugins/Common/Images/QuadRotorPlus.svg + src/AutoPilotPlugins/Common/Images/QuadRotorX.svg + src/AutoPilotPlugins/Common/Images/AirframeSimulation.svg + src/AutoPilotPlugins/Common/Images/Plane.svg + src/FlightMap/Images/AlertAircraft.svg + src/ui/toolbar/Images/Analyze.svg + src/FirmwarePlugin/APM/APMBrandImage.png + src/FirmwarePlugin/APM/APMBrandImageSub.png + src/AutoPilotPlugins/Common/Images/APMode.svg + src/ui/toolbar/Images/Armed.svg + src/QmlControls/arrow-down.png + src/AutoPilotPlugins/Common/Images/ArrowCCW.svg + src/AutoPilotPlugins/Common/Images/ArrowCW.svg + src/AutoPilotPlugins/Common/Images/ArrowDirection.svg + src/FlightMap/Images/attitudeDial.svg + src/FlightMap/Images/attitudeInstrument.svg + src/FlightMap/Images/attitudePointer.svg + src/FlightMap/Images/AwarenessAircraft.svg + src/ui/toolbar/Images/Battery.svg + src/Camera/images/camera_photo.svg + src/Camera/images/camera_video.svg + src/AutoPilotPlugins/PX4/Images/CameraComponentIcon.png + src/ui/toolbar/Images/CameraIcon.svg + src/AutoPilotPlugins/PX4/Images/CameraTrigger.svg + resources/check.svg + src/QmlControls/checkbox-check.svg + src/MissionManager/CogWheel.svg + src/FlightMap/Images/compassInstrumentArrow.svg + src/FlightMap/Images/compassInstrumentDial.svg + src/ui/toolbar/Images/Connect.svg + src/FlightMap/Images/crossHair.svg + src/AutoPilotPlugins/PX4/Images/DatalinkLoss.svg + src/AutoPilotPlugins/PX4/Images/DatalinkLossLight.svg + src/ui/toolbar/Images/Disarmed.svg + src/ui/toolbar/Images/Disconnect.svg + src/VehicleSetup/FirmwareUpgradeIcon.png + src/AutoPilotPlugins/PX4/Images/FlightModesComponentIcon.png + src/AutoPilotPlugins/APM/Images/bluerov-frame.png + src/AutoPilotPlugins/APM/Images/simple3-frame.png + src/AutoPilotPlugins/APM/Images/simple4-frame.png + src/AutoPilotPlugins/APM/Images/simple5-frame.png + src/AutoPilotPlugins/APM/Images/vectored-frame.png + src/AutoPilotPlugins/APM/Images/vectored6dof-frame.png + src/ui/toolbar/Images/Gears.svg + src/AutoPilotPlugins/PX4/Images/GeoFence.svg + src/AutoPilotPlugins/PX4/Images/GeoFenceLight.svg + src/AnalyzeView/GeoTagIcon.svg + src/ui/toolbar/Images/Gps.svg + src/ui/toolbar/Images/Hamburger.svg + src/FlightMap/Images/Help.svg + src/FlightMap/Images/HelpBlack.svg + src/FlightMap/Images/Home.svg + src/ui/toolbar/Images/Joystick.png + src/AutoPilotPlugins/PX4/Images/LandMode.svg + src/AutoPilotPlugins/PX4/Images/LandModeCopter.svg + src/AutoPilotPlugins/APM/Images/LightsComponentIcon.png + src/AnalyzeView/LogDownloadIcon.svg + src/AutoPilotPlugins/PX4/Images/LowBattery.svg + src/AutoPilotPlugins/PX4/Images/LowBatteryLight.svg + src/FlightMap/Images/MapAddMission.svg + src/FlightMap/Images/MapAddMissionBlack.svg + src/FlightMap/Images/MapCenter.svg + src/FlightMap/Images/MapCenterBlack.svg + src/FlightMap/Images/MapDrawShape.svg + src/FlightMap/Images/MapHome.svg + src/FlightMap/Images/MapHomeBlack.svg + src/FlightMap/Images/MapSync.svg + src/FlightMap/Images/MapSyncBlack.svg + src/FlightMap/Images/MapSyncChanged.svg + src/FlightMap/Images/MapType.svg + src/FlightMap/Images/MapTypeBlack.svg + src/AnalyzeView/MavlinkConsoleIcon.svg + src/AnalyzeView/MAVLinkInspector.svg + src/ui/toolbar/Images/Megaphone.svg + src/AutoPilotPlugins/Common/Images/MotorComponentIcon.svg + src/AutoPilotPlugins/PX4/Images/no-logging-light.svg + src/AutoPilotPlugins/PX4/Images/no-logging.svg + src/ui/toolbar/Images/PaperPlane.svg + src/FlightMap/Images/PiP.svg + src/FlightMap/Images/pipHide.svg + src/FlightMap/Images/pipResize.svg + src/ui/toolbar/Images/Plan.svg + src/AutoPilotPlugins/PX4/Images/PowerComponentBattery_01cell.svg + src/AutoPilotPlugins/PX4/Images/PowerComponentBattery_02cell.svg + src/AutoPilotPlugins/PX4/Images/PowerComponentBattery_03cell.svg + src/AutoPilotPlugins/PX4/Images/PowerComponentBattery_04cell.svg + src/AutoPilotPlugins/PX4/Images/PowerComponentBattery_05cell.svg + src/AutoPilotPlugins/PX4/Images/PowerComponentBattery_06cell.svg + src/AutoPilotPlugins/PX4/Images/PowerComponentIcon.png + src/FirmwarePlugin/PX4/PX4BrandImage.png + src/ui/toolbar/Images/Quad.svg + src/AutoPilotPlugins/PX4/Images/RadioComponentIcon.png + src/ui/toolbar/Images/RC.svg + src/AutoPilotPlugins/PX4/Images/RCLoss.svg + src/AutoPilotPlugins/PX4/Images/RCLossLight.svg + src/AutoPilotPlugins/PX4/Images/ReturnToHomeAltitude.svg + src/AutoPilotPlugins/PX4/Images/ReturnToHomeAltitudeCopter.svg + src/FlightMap/Images/rollDialWhite.svg + src/FlightMap/Images/rollPointerWhite.svg + src/ui/toolbar/Images/RTK.svg + src/AutoPilotPlugins/PX4/Images/SafetyComponentIcon.png + src/FlightMap/Images/scale.png + src/FlightMap/Images/scale_end.png + src/FlightMap/Images/scale_endLight.png + src/FlightMap/Images/scaleLight.png + src/AutoPilotPlugins/PX4/Images/SensorsComponentIcon.png + src/ui/toolbar/Images/Signal0.svg + src/ui/toolbar/Images/Signal100.svg + src/ui/toolbar/Images/Signal20.svg + src/ui/toolbar/Images/Signal40.svg + src/ui/toolbar/Images/Signal60.svg + src/ui/toolbar/Images/Signal80.svg + src/AutoPilotPlugins/Common/Images/StationMode.svg + src/AutoPilotPlugins/APM/Images/SubFrameComponentIcon.png + resources/CogWheels.png + src/FlightMap/Images/sub.png + src/ui/toolbar/Images/TelemRSSI.svg + src/AutoPilotPlugins/PX4/Images/TuningComponentIcon.png + src/FlightMap/Images/vehicleArrowOpaque.svg + src/FlightMap/Images/vehicleArrowOutline.svg + src/AutoPilotPlugins/PX4/Images/VehicleDown.png + src/AutoPilotPlugins/PX4/Images/VehicleDownRotate.png + src/AutoPilotPlugins/PX4/Images/VehicleLeft.png + src/AutoPilotPlugins/PX4/Images/VehicleLeftRotate.png + src/AutoPilotPlugins/PX4/Images/VehicleNoseDown.png + src/AutoPilotPlugins/PX4/Images/VehicleNoseDownRotate.png + src/AutoPilotPlugins/PX4/Images/VehicleRight.png + src/AutoPilotPlugins/PX4/Images/VehicleRightRotate.png + src/VehicleSetup/VehicleSummaryIcon.png + src/AutoPilotPlugins/PX4/Images/VehicleTailDown.png + src/AutoPilotPlugins/PX4/Images/VehicleTailDownRotate.png + src/AutoPilotPlugins/PX4/Images/VehicleUpsideDown.png + src/AutoPilotPlugins/PX4/Images/VehicleUpsideDownRotate.png + src/AutoPilotPlugins/Common/Images/wifi.svg + src/ui/toolbar/Images/Yield.svg + src/FlightMap/Images/ZoomMinus.svg + src/FlightMap/Images/ZoomPlus.svg + + diff --git a/qgcresources.qrc b/qgcresources.qrc index d6ae6236e..d108e8749 100644 --- a/qgcresources.qrc +++ b/qgcresources.qrc @@ -15,184 +15,6 @@ resources/fonts/NanumGothic-Regular.ttf resources/fonts/NanumGothic-Bold.ttf - - src/AutoPilotPlugins/Common/Images/AirframeComponentIcon.png - src/AutoPilotPlugins/Common/Images/FlyingWing.svg - src/AutoPilotPlugins/Common/Images/HexaRotorPlus.svg - src/AutoPilotPlugins/Common/Images/HexaRotorX.svg - src/AutoPilotPlugins/Common/Images/OctoRotorPlus.svg - src/AutoPilotPlugins/Common/Images/OctoRotorX.svg - src/AutoPilotPlugins/Common/Images/QuadRotorH.svg - src/AutoPilotPlugins/Common/Images/QuadRotorPlus.svg - src/AutoPilotPlugins/Common/Images/QuadRotorX.svg - src/AutoPilotPlugins/Common/Images/AirframeSimulation.svg - src/AutoPilotPlugins/Common/Images/Plane.svg - src/AutoPilotPlugins/Common/Images/AirframeSimulation.svg - src/AutoPilotPlugins/Common/Images/AirframeUnknown.svg - src/AutoPilotPlugins/Common/Images/Boat.svg - src/AutoPilotPlugins/Common/Images/FlyingWing.svg - src/AutoPilotPlugins/Common/Images/Helicopter.svg - src/AutoPilotPlugins/Common/Images/HexaRotorPlus.svg - src/AutoPilotPlugins/Common/Images/HexaRotorX.svg - src/AutoPilotPlugins/Common/Images/OctoRotorPlus.svg - src/AutoPilotPlugins/Common/Images/OctoRotorPlusCoaxial.svg - src/AutoPilotPlugins/Common/Images/OctoRotorX.svg - src/AutoPilotPlugins/Common/Images/OctoRotorXCoaxial.svg - src/AutoPilotPlugins/Common/Images/Plane.svg - src/AutoPilotPlugins/Common/Images/PlaneATail.svg - src/AutoPilotPlugins/Common/Images/PlaneVTail.svg - src/AutoPilotPlugins/Common/Images/QuadRotorATail.svg - src/AutoPilotPlugins/Common/Images/QuadRotorH.svg - src/AutoPilotPlugins/Common/Images/QuadRotorPlus.svg - src/AutoPilotPlugins/Common/Images/QuadRotorVTail.svg - src/AutoPilotPlugins/Common/Images/QuadRotorWide.svg - src/AutoPilotPlugins/Common/Images/QuadRotorX.svg - src/AutoPilotPlugins/Common/Images/Rover.svg - src/AutoPilotPlugins/Common/Images/VTOLDuoRotorTailSitter.svg - src/AutoPilotPlugins/Common/Images/VTOLPlane.svg - src/AutoPilotPlugins/Common/Images/VTOLQuadRotorTailSitter.svg - src/AutoPilotPlugins/Common/Images/VTOLTiltRotor.svg - src/AutoPilotPlugins/Common/Images/Y6A.svg - src/AutoPilotPlugins/Common/Images/Y6B.svg - src/AutoPilotPlugins/Common/Images/YMinus.svg - src/AutoPilotPlugins/Common/Images/YPlus.svg - src/AutoPilotPlugins/Common/Images/HelicopterCoaxial.svg - src/AutoPilotPlugins/Common/Images/wifi.svg - src/QmlControls/arrow-down.png - resources/camera.svg - src/Camera/images/camera_photo.svg - src/Camera/images/camera_video.svg - src/QmlControls/checkbox-check.svg - src/VehicleSetup/FirmwareUpgradeIcon.png - src/AutoPilotPlugins/PX4/Images/FlightModesComponentIcon.png - src/AutoPilotPlugins/PX4/Images/CameraTrigger.svg - src/AutoPilotPlugins/PX4/Images/CameraComponentIcon.png - src/AutoPilotPlugins/PX4/Images/DatalinkLoss.svg - src/AutoPilotPlugins/PX4/Images/DatalinkLossLight.svg - src/AutoPilotPlugins/PX4/Images/GeoFence.svg - src/AutoPilotPlugins/PX4/Images/GeoFenceLight.svg - src/AnalyzeView/GeoTagIcon.svg - src/AnalyzeView/MavlinkConsoleIcon.svg - src/AutoPilotPlugins/PX4/Images/LandMode.svg - src/AutoPilotPlugins/PX4/Images/LandModeCopter.svg - src/AutoPilotPlugins/APM/Images/LightsComponentIcon.png - src/AutoPilotPlugins/APM/Images/SubFrameComponentIcon.png - src/AutoPilotPlugins/APM/Images/bluerov-frame.png - src/AutoPilotPlugins/APM/Images/vectored-frame.png - src/AutoPilotPlugins/APM/Images/vectored6dof-frame.png - src/AutoPilotPlugins/APM/Images/simple3-frame.png - src/AutoPilotPlugins/APM/Images/simple4-frame.png - src/AutoPilotPlugins/APM/Images/simple5-frame.png - src/AnalyzeView/LogDownloadIcon.svg - src/AutoPilotPlugins/PX4/Images/LowBattery.svg - src/AutoPilotPlugins/PX4/Images/LowBatteryLight.svg - src/AnalyzeView/MAVLinkInspector.svg - src/AutoPilotPlugins/Common/Images/MotorComponentIcon.svg - src/AutoPilotPlugins/PX4/Images/PowerComponentBattery_01cell.svg - src/AutoPilotPlugins/PX4/Images/PowerComponentBattery_02cell.svg - src/AutoPilotPlugins/PX4/Images/PowerComponentBattery_03cell.svg - src/AutoPilotPlugins/PX4/Images/PowerComponentBattery_04cell.svg - src/AutoPilotPlugins/PX4/Images/PowerComponentBattery_05cell.svg - src/AutoPilotPlugins/PX4/Images/PowerComponentBattery_06cell.svg - src/AutoPilotPlugins/PX4/Images/PowerComponentIcon.png - src/AutoPilotPlugins/PX4/Images/RadioComponentIcon.png - src/AutoPilotPlugins/PX4/Images/RCLoss.svg - src/AutoPilotPlugins/PX4/Images/RCLossLight.svg - src/AutoPilotPlugins/PX4/Images/ReturnToHomeAltitude.svg - src/AutoPilotPlugins/PX4/Images/ReturnToHomeAltitudeCopter.svg - src/AutoPilotPlugins/PX4/Images/SafetyComponentIcon.png - src/AutoPilotPlugins/PX4/Images/SensorsComponentIcon.png - src/AutoPilotPlugins/PX4/Images/TuningComponentIcon.png - resources/CogWheels.png - src/AutoPilotPlugins/PX4/Images/VehicleDown.png - src/AutoPilotPlugins/PX4/Images/VehicleDownRotate.png - src/AutoPilotPlugins/PX4/Images/VehicleLeft.png - src/AutoPilotPlugins/PX4/Images/VehicleLeftRotate.png - src/AutoPilotPlugins/PX4/Images/VehicleNoseDown.png - src/AutoPilotPlugins/PX4/Images/VehicleNoseDownRotate.png - src/AutoPilotPlugins/PX4/Images/VehicleRight.png - src/AutoPilotPlugins/PX4/Images/VehicleRightRotate.png - src/VehicleSetup/VehicleSummaryIcon.png - src/AutoPilotPlugins/PX4/Images/VehicleTailDown.png - src/AutoPilotPlugins/PX4/Images/VehicleTailDownRotate.png - src/AutoPilotPlugins/PX4/Images/VehicleUpsideDown.png - src/AutoPilotPlugins/PX4/Images/VehicleUpsideDownRotate.png - src/FlightMap/Images/attitudeDial.svg - src/FlightMap/Images/attitudeInstrument.svg - src/FlightMap/Images/attitudePointer.svg - src/FlightMap/Images/compassInstrumentArrow.svg - src/FlightMap/Images/compassInstrumentDial.svg - src/FlightMap/Images/crossHair.svg - src/FlightMap/Images/PiP.svg - src/FlightMap/Images/pipHide.svg - src/FlightMap/Images/pipResize.svg - src/FlightMap/Images/rollDialWhite.svg - src/FlightMap/Images/rollPointerWhite.svg - src/FlightMap/Images/scale.png - src/FlightMap/Images/scale_end.png - src/FlightMap/Images/scaleLight.png - src/FlightMap/Images/scale_endLight.png - src/FlightMap/Images/adsbVehicle.svg - src/FlightMap/Images/vehicleArrowOutline.svg - src/FlightMap/Images/vehicleArrowOpaque.svg - src/FlightMap/Images/ZoomPlus.svg - src/FlightMap/Images/ZoomMinus.svg - src/FlightMap/Images/Help.svg - src/FlightMap/Images/Home.svg - src/FlightMap/Images/HelpBlack.svg - src/FlightMap/Images/MapAddMission.svg - src/FlightMap/Images/MapAddMissionBlack.svg - src/FlightMap/Images/MapCenter.svg - src/FlightMap/Images/MapCenterBlack.svg - src/FlightMap/Images/MapDrawShape.svg - src/FlightMap/Images/MapHome.svg - src/FlightMap/Images/MapHomeBlack.svg - src/FlightMap/Images/MapSync.svg - src/FlightMap/Images/MapSyncBlack.svg - src/FlightMap/Images/MapSyncChanged.svg - src/FlightMap/Images/MapType.svg - src/FlightMap/Images/MapTypeBlack.svg - src/ui/toolbar/Images/Armed.svg - src/ui/toolbar/Images/Battery.svg - src/ui/toolbar/Images/Connect.svg - src/ui/toolbar/Images/Disarmed.svg - src/ui/toolbar/Images/Disconnect.svg - src/ui/toolbar/Images/Gears.svg - src/ui/toolbar/Images/Analyze.svg - src/ui/toolbar/Images/Gps.svg - src/ui/toolbar/Images/RTK.svg - src/ui/toolbar/Images/Hamburger.svg - src/ui/toolbar/Images/Megaphone.svg - src/ui/toolbar/Images/PaperPlane.svg - src/ui/toolbar/Images/Plan.svg - src/ui/toolbar/Images/Quad.svg - src/ui/toolbar/Images/RC.svg - src/ui/toolbar/Images/Signal0.svg - src/ui/toolbar/Images/Signal20.svg - src/ui/toolbar/Images/Signal40.svg - src/ui/toolbar/Images/Signal60.svg - src/ui/toolbar/Images/Signal80.svg - src/ui/toolbar/Images/Signal100.svg - src/ui/toolbar/Images/TelemRSSI.svg - src/ui/toolbar/Images/Yield.svg - src/ui/toolbar/Images/CameraIcon.svg - src/ui/toolbar/Images/Joystick.png - src/MissionManager/CogWheel.svg - src/AutoPilotPlugins/Common/Images/StationMode.svg - src/AutoPilotPlugins/Common/Images/APMode.svg - src/AutoPilotPlugins/Common/Images/ArrowDirection.svg - src/AutoPilotPlugins/Common/Images/ArrowCW.svg - src/AutoPilotPlugins/Common/Images/ArrowCCW.svg - src/FirmwarePlugin/APM/APMBrandImage.png - src/FirmwarePlugin/APM/APMBrandImageSub.png - src/FirmwarePlugin/PX4/PX4BrandImage.png - src/FlightMap/Images/sub.png - src/FlightMap/Images/AlertAircraft.svg - src/FlightMap/Images/AwarenessAircraft.svg - resources/check.svg - src/AutoPilotPlugins/PX4/Images/no-logging.svg - src/AutoPilotPlugins/PX4/Images/no-logging-light.svg - resources/action.svg resources/Antenna_RC.svg @@ -239,64 +61,64 @@ resources/icons/qgroundcontrol.ico - resources/firmware/px4.png - resources/firmware/apm.png resources/firmware/3drradio.png + resources/firmware/apm.png + resources/firmware/px4.png - resources/mavs/helicopter.svg - resources/mavs/unknown.svg - resources/mavs/fixed-wing.svg - resources/mavs/groundstation.svg - resources/mavs/generic.svg - resources/mavs/quadrotor.svg - resources/mavs/coaxial.svg resources/mavs/airship.svg resources/mavs/antenna-tracker.svg + resources/mavs/coaxial.svg + resources/mavs/fixed-wing.svg resources/mavs/flapping-wing.svg resources/mavs/free-balloon.svg + resources/mavs/generic.svg resources/mavs/ground-rover.svg + resources/mavs/groundstation.svg + resources/mavs/helicopter.svg resources/mavs/hexarotor.svg resources/mavs/kite.svg resources/mavs/octorotor.svg + resources/mavs/quadrotor.svg resources/mavs/rocket.svg resources/mavs/submarine.svg resources/mavs/surface-boat.svg resources/mavs/tricopter.svg + resources/mavs/unknown.svg resources/calibration/accel_back.png + resources/calibration/accel_down.png resources/calibration/accel_front.png + resources/calibration/accel_left.png resources/calibration/accel_right.png - resources/calibration/accel_down.png resources/calibration/accel_up.png - resources/calibration/accel_left.png resources/calibration/mode1/radioCenter.png resources/calibration/mode1/radioHome.png + resources/calibration/mode1/radioPitchDown.png + resources/calibration/mode1/radioPitchUp.png resources/calibration/mode1/radioRollLeft.png resources/calibration/mode1/radioRollRight.png - resources/calibration/mode1/radioPitchUp.png - resources/calibration/mode1/radioPitchDown.png + resources/calibration/mode1/radioSwitchMinMax.png + resources/calibration/mode1/radioThrottleDown.png + resources/calibration/mode1/radioThrottleUp.png resources/calibration/mode1/radioYawLeft.png resources/calibration/mode1/radioYawRight.png - resources/calibration/mode1/radioThrottleUp.png - resources/calibration/mode1/radioThrottleDown.png - resources/calibration/mode1/radioSwitchMinMax.png resources/calibration/mode2/radioCenter.png resources/calibration/mode2/radioHome.png + resources/calibration/mode2/radioPitchDown.png + resources/calibration/mode2/radioPitchUp.png resources/calibration/mode2/radioRollLeft.png resources/calibration/mode2/radioRollRight.png - resources/calibration/mode2/radioPitchUp.png - resources/calibration/mode2/radioPitchDown.png + resources/calibration/mode2/radioSwitchMinMax.png + resources/calibration/mode2/radioThrottleDown.png + resources/calibration/mode2/radioThrottleUp.png resources/calibration/mode2/radioYawLeft.png resources/calibration/mode2/radioYawRight.png - resources/calibration/mode2/radioThrottleUp.png - resources/calibration/mode2/radioThrottleDown.png - resources/calibration/mode2/radioSwitchMinMax.png resources/SDL_GameControllerDB/gamecontrollerdb.txt diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro index 150e309f3..024323077 100644 --- a/qgroundcontrol.pro +++ b/qgroundcontrol.pro @@ -306,13 +306,20 @@ CustomBuild { } else { RESOURCES += $$PWD/qgcresources.qrc } + exists($$PWD/custom/qgcimages.qrc) { + message("Using custom qgcimages.qrc") + RESOURCES += $$PWD/custom/qgcimages.qrc + } else { + RESOURCES += $$PWD/qgcimages.qrc + } } else { DEFINES += QGC_APPLICATION_NAME=\"\\\"QGroundControl\\\"\" DEFINES += QGC_ORG_NAME=\"\\\"QGroundControl.org\\\"\" DEFINES += QGC_ORG_DOMAIN=\"\\\"org.qgroundcontrol\\\"\" RESOURCES += \ $$PWD/qgroundcontrol.qrc \ - $$PWD/qgcresources.qrc + $$PWD/qgcresources.qrc \ + $$PWD/qgcimages.qrc } # On Qt 5.9 android versions there is the following bug: https://bugreports.qt.io/browse/QTBUG-61424 -- 2.22.0