Simplify Custom Build Integration

Author: HTRamsey

custom-example/CMakeLists.txt

@@ -32,23 +32,8 @@ if(ANDROID)
     endif()
 endif()
 
-find_package(Python3 REQUIRED)
-execute_process(
-    COMMAND ${Python3_EXECUTABLE}
-    RESULT_VARIABLE PYTHON_RESULT
-    OUTPUT_VARIABLE PYTHON_OUTPUT
-    ERROR_VARIABLE PYTHON_ERROR
-    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-    INPUT_FILE updateqrc.py
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-)
-cmake_print_variables(PYTHON_RESULT PYTHON_OUTPUT PYTHON_ERROR)
-
 # Our own, custom resources
 list(APPEND CUSTOM_RESOURCES
-    ${CMAKE_CURRENT_SOURCE_DIR}/qgcimages.qrc
-    ${CMAKE_CURRENT_SOURCE_DIR}/qgcresources.qrc
-    ${CMAKE_CURRENT_SOURCE_DIR}/qgroundcontrol.qrc
     ${CMAKE_CURRENT_SOURCE_DIR}/custom.qrc
 )
 set(QGC_RESOURCES ${QGC_RESOURCES} ${CUSTOM_RESOURCES} CACHE STRING "Paths to .qrc Resources" FORCE)
@@ -78,23 +63,3 @@ set(CUSTOM_DIRECTORIES
     ${CMAKE_CURRENT_SOURCE_DIR}/src/FirmwarePlugin
     CACHE INTERNAL "" FORCE
 )
-
-# file(GLOB_RECURSE QML_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/res/*.qml)
-# file(GLOB QML_RESOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/res/Images/*.*)
-# qt_add_qml_module(CustomPlugin
-#     URI QGroundControl.CustomPlugin
-#     VERSION 1.0
-#     RESOURCE_PREFIX "/"
-#     QML_FILES ${QML_SOURCES}
-#     RESOURCES ${QML_RESOURCES}
-#     OUTPUT_TARGETS CustomPlugin_targets
-#     IMPORT_PATH ${QT_QML_OUTPUT_DIRECTORY}
-#     IMPORTS
-#         QtQuick
-#         QtQuick.Controls
-#         QtQuick.Layouts
-#         QGroundControl
-#         QGroundControl.Controls
-#         QGroundControl.Palette
-#         QGroundControl.ScreenTools
-# )

custom-example/README.md

@@ -7,7 +7,6 @@ To build this sample custom version:
 * Clean you build directory of any previous build
 * Rename the directory from `custom-example` to `custom`
 * Change to the `custom` directory
-* Run `python updateqrc.py`
 * Build QGC
 
 ![Custom Build Screenshot](README.jpg)
@@ -23,5 +22,3 @@ The main features of this example:
 * Customizes portions of the interface such as you can see in the above screenshot which shows a custom instrument widget replacing the standard QGC ui.
 * It also overrides various QGC Application settings to hide some settings the users shouldn't modify as well as adjusting defaults for others.
 * The source code is fully commented to explain what and why it is doing things.
-
-> Important Note: This custom build is not automatically built each time regular QGC code changes. This can mean that it may fall out of date with the latest changes in QGC code. This can show up as the `python updateqrc.py` steps failing due to upstream resource changes. Or possibly fail to compile because the plugin mechanism for custom builds has changed. If this happens please notify the QGC devs and they will bring it up to date. Or even better, submit a pull for the fix yourself!

custom-example/custom.qrc

@@ -15,7 +15,7 @@
         <file alias="dronecode-black.svg">res/Images/dronecode-black.svg</file>
         <file alias="dronecode-white.svg">res/Images/dronecode-white.svg</file>
     </qresource>
-    <qresource prefix="/qmlimages">
+    <qresource prefix="Custom/qmlimages">
         <file alias="PaperPlane.svg">res/Images/CustomVehicleIcon.svg</file>
     </qresource>
     <qresource prefix="/Custom/Widgets">
@@ -29,12 +29,12 @@
         <file alias="Custom/Widgets/CustomVehicleButton.qml">res/Custom/Widgets/CustomVehicleButton.qml</file>
         <file alias="Custom/Widgets/qmldir">res/Custom/Widgets/qmldir</file>
     </qresource>
-    <qresource prefix="/qml">
+    <qresource prefix="/Custom/qml">
         <file alias="QGroundControl/FlightDisplay/CustomGuidedActionsController.qml">src/CustomGuidedActionsController.qml</file>
         <file alias="QGroundControl/FlightDisplay/FlyViewCustomLayer.qml">src/FlyViewCustomLayer.qml</file>
         <file alias="QGroundControl/FlightDisplay/FlyViewToolStripActionList.qml">src/FlyViewToolStripActionList.qml</file>
     </qresource>
-    <qresource prefix="/res">
+    <qresource prefix="Custom/res">
         <file alias="QGCLogoFull.svg">res/QGCLogoFull.svg</file>
         <file alias="qgroundcontrol.ico">res/icons/custom_qgroundcontrol.ico</file>
     </qresource>