Viewer3D: Fix Resource Paths

Author: HTRamsey

src/FlightDisplay/FlyViewToolStripActionList.qml

@@ -25,7 +25,7 @@ ToolStripActionList {
             id: view3DIcon
             visible: _viewer3DEnabled
             text:           qsTr("3D View")
-            iconSource:     "/qml/Viewer3D/City3DMapIcon.svg"
+            iconSource:     "/qml/QGroundControl/Viewer3D/City3DMapIcon.svg"
             onTriggered:{
                 if(_is3DViewOpen === false){
                     viewer3DWindow.open()
@@ -39,7 +39,7 @@ ToolStripActionList {
                     view3DIcon.iconSource =     "/qmlimages/PaperPlane.svg"
                     text=           qsTr("Fly")
                 }else{
-                    iconSource =     "/qml/Viewer3D/City3DMapIcon.svg"
+                    iconSource =     "/qml/QGroundControl/Viewer3D/City3DMapIcon.svg"
                     text =           qsTr("3D View")
                 }
             }

src/Viewer3D/CMakeLists.txt

@@ -36,7 +36,7 @@ target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE QGC_VIEWER3D)
 
 qt_add_library(Viewer3DModule STATIC)
 
-set_source_files_properties(Images/city_3d_map_icon.svg PROPERTIES QT_RESOURCE_ALIAS Viewer3D/City3DMapIcon.svg)
+set_source_files_properties(Images/city_3d_map_icon.svg PROPERTIES QT_RESOURCE_ALIAS City3DMapIcon.svg)
 set_source_files_properties(Shaders/earthMaterial.frag PROPERTIES QT_RESOURCE_ALIAS ShaderFragment/earthMaterial.frag)
 set_source_files_properties(Shaders/earthMaterial.vert PROPERTIES QT_RESOURCE_ALIAS ShaderVertex/earthMaterial.vert)
 

src/Viewer3D/Viewer3DQml/Models3D/Viewer3DModel.qml

@@ -159,8 +159,8 @@ View3D {
                 }
 
                 materials: CustomMaterial {
-                    vertexShader: "/qml/ShaderVertex/earthMaterial.vert"
-                    fragmentShader: "/qml/ShaderFragment/earthMaterial.frag"
+                    vertexShader: "/qml/QGroundControl/Viewer3D/ShaderVertex/earthMaterial.vert"
+                    fragmentShader: "/qml/QGroundControl/Viewer3D/ShaderFragment/earthMaterial.frag"
                     property TextureInput someTextureMap: TextureInput {
                         texture: Texture {
                             textureData: _terrainTextureManager