Merge branch 'pbt-fixes'

controllersetup.cpp

@@ -116,11 +116,11 @@ void controllerSetup::newDevice(unsigned char devType, QVector<BUTTON>* but, QVe
 
     switch (devType) {
         case shuttleXpress:
-            image.load(":/resources/controllerxpress.png");
+            image.load(":/resources/shuttlexpress.png");
             deviceName = "shuttleXpress";
             break;
         case shuttlePro2:
-            image.load(":/resources/controllerpro.png");
+            image.load(":/resources/shuttlepro.png");
             deviceName = "shuttlePro2";
             break;
         case RC28:

cwsender.h

@@ -6,10 +6,12 @@
 #include <QFont>
 #include <QInputDialog>
 #include <QMessageBox>
+#include <math.h>
 #include "wfviewtypes.h"
 #include "logcategories.h"
 
 
+
 namespace Ui {
 class cwSender;
 }

resources/resources.qrc

@@ -1,9 +1,9 @@
 <RCC>
-  <qresource prefix="resources">
-    <file>wfview.png</file>
-    <file>shuttlexpress.png</file>
-    <file>shuttlepro.png</file>
-    <file>rc28.png</file>
-    <file>xbox.png</file>
-  </qresource>
+    <qresource prefix="/resources">
+        <file>wfview.png</file>
+        <file>shuttlexpress.png</file>
+        <file>shuttlepro.png</file>
+        <file>rc28.png</file>
+        <file>xbox.png</file>
+    </qresource>
 </RCC>