Merge branch 'dev' of git://github.com/pixhawk/qgroundcontrol into mergeRemote

src/uas/UAS.cc

@@ -556,6 +556,22 @@ void UAS::receiveMessage(LinkInterface* link, mavlink_message_t message)
                 emit textMessageReceived(uasId, message.compid, severity, text);
             }
             break;
+#ifdef MAVLINK_ENABLED_PIXHAWK
+            case MAVLINK_MSG_ID_POINT_OF_INTEREST:
+            {
+                mavlink_point_of_interest_t poi;
+                mavlink_msg_point_of_interest_decode(&message, &poi);
+                emit poiFound(this, poi.type, poi.color, QString((QChar*)poi.name, MAVLINK_MSG_POINT_OF_INTEREST_FIELD_NAME_LEN), poi.x, poi.y, poi.z);
+            }
+            break;
+            case MAVLINK_MSG_ID_POINT_OF_INTEREST_CONNECTION:
+            {
+                mavlink_point_of_interest_connection_t poi;
+                mavlink_msg_point_of_interest_connection_decode(&message, &poi);
+                emit poiConnectionFound(this, poi.type, poi.color, QString((QChar*)poi.name, MAVLINK_MSG_POINT_OF_INTEREST_CONNECTION_FIELD_NAME_LEN), poi.x1, poi.y1, poi.z1, poi.x2, poi.y2, poi.z2);
+            }
+            break;
+#endif
 #ifdef MAVLINK_ENABLED_UALBERTA
         case MAVLINK_MSG_ID_NAV_FILTER_BIAS:
             {

src/uas/UASInterface.h

@@ -258,6 +258,10 @@ signals:
      * @param text the status text
      * @param severity The severity of the message, 0 for plain debug messages, 10 for very critical messages
      */
+
+    void poiFound(UASInterface* uas, int type, int colorIndex, QString message, float x, float y, float z);
+    void poiConnectionFound(UASInterface* uas, int type, int colorIndex, QString message, float x1, float y1, float z1, float x2, float y2, float z2);
+
     void textMessageReceived(int uasid, int componentid, int severity, QString text);
     /**
      * @brief Update the error count of a device

src/ui/QGCRemoteControlView.cc

@@ -184,12 +184,15 @@ void QGCRemoteControlView::redraw()
 
 void QGCRemoteControlView::changeEvent(QEvent *e)
 {
-    QWidget::changeEvent(e);
-    switch (e->type()) {
-    case QEvent::LanguageChange:
-        //ui->retranslateUi(this);
-        break;
-    default:
-        break;
-    }
+    Q_UNUSED(e);
+    // FIXME If the lines below are commented in
+    // runtime errors can occur on x64 systems.
+//    QWidget::changeEvent(e);
+//    switch (e->type()) {
+//    case QEvent::LanguageChange:
+//        //ui->retranslateUi(this);
+//        break;
+//    default:
+//        break;
+//    }
 }