Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release

ground/openpilotgcs/src/libs/utils/svgimageprovider.h

@@ -33,7 +33,9 @@
 #include <QSvgRenderer>
 #include <QMap>
 
-class Q_DECL_EXPORT SvgImageProvider : public QObject, public QDeclarativeImageProvider
+#include "utils_global.h"
+
+class QTCREATOR_UTILS_EXPORT SvgImageProvider : public QObject, public QDeclarativeImageProvider
 {
     Q_OBJECT
 public:

ground/openpilotgcs/src/plugins/coreplugin/OpenPilotGCS.xml

@@ -2701,10 +2701,10 @@
     <Icon1>:\core\images\ah.png</Icon1>
     <Icon10>:/core/images/openpilot_logo_64.png</Icon10>
     <Icon2>:/core/images/config.png</Icon2>
-    <Icon3>:/core/images/cpu.png</Icon3>
+    <Icon3>:/core/images/cog.png</Icon3>
     <Icon4>:/core/images/scopes.png</Icon4>
     <Icon5>:/core/images/joystick.png</Icon5>
-    <Icon6>:/core/images/cog.png</Icon6>
+    <Icon6>:/core/images/cpu.png</Icon6>
     <Icon7>:/core/images/openpilot_logo_64.png</Icon7>
     <Icon8>:/core/images/openpilot_logo_64.png</Icon8>
     <Icon9>:/core/images/openpilot_logo_64.png</Icon9>

ground/openpilotgcs/src/plugins/welcome/qml/main.qml

@@ -61,8 +61,8 @@ Rectangle {
                 }
 
                 WelcomePageButton {
-                    baseIconName: "planner"
-                    label: "Flight Planner"
+                    baseIconName: "system"
+                    label: "System"
                     onClicked: welcomePlugin.openPage("System")
                 }
 

ground/openpilotgcs/src/plugins/welcome/welcome.qrc

@@ -22,5 +22,7 @@
         <file>qml/images/planner-off.png</file>
         <file>qml/images/scopes-on.png</file>
         <file>qml/images/scopes-off.png</file>
+        <file>qml/images/system-on.png</file>
+        <file>qml/images/system-off.png</file>
     </qresource>
 </RCC>