Merge pull request #409 from gefink/master

override is not aviable in gcc 4.6 (only in 4.7).  Removed for compatability

src/ui/designer/QGCComboBox.h

@@ -22,7 +22,7 @@ public:
     explicit QGCComboBox(QWidget *parent = 0);
     ~QGCComboBox();
 
-    virtual void setEditMode(bool editMode) override;
+    virtual void setEditMode(bool editMode);
 
 public slots:
     /** @brief Queue parameter for sending to the MAV (add to pending list)*/

src/ui/designer/QGCCommandButton.h

@@ -18,7 +18,7 @@ public:
     explicit QGCCommandButton(QWidget *parent = 0);
     ~QGCCommandButton();
 
-    virtual void setEditMode(bool editMode) override;
+    virtual void setEditMode(bool editMode);
 
 public slots:
     void sendCommand();

src/ui/designer/QGCParamSlider.h

@@ -20,7 +20,7 @@ public:
     explicit QGCParamSlider(QWidget *parent = 0);
     ~QGCParamSlider();
 
-    virtual void setEditMode(bool editMode) override;
+    virtual void setEditMode(bool editMode);
 
 public slots:
     /** @brief Queue parameter for sending to the MAV (add to pending list)*/

src/ui/designer/QGCTextLabel.h

@@ -19,7 +19,7 @@ public:
     ~QGCTextLabel();
     void setActiveUAS(UASInterface *uas);
     void enableText(int num);
-    virtual void setEditMode(bool editMode) override;
+    virtual void setEditMode(bool editMode);
 public slots:
     void writeSettings(QSettings& settings);
     void readSettings(const QSettings& settings);