From 9cd72124d6c0a2d13b9f59267dc0b5c9b4938d90 Mon Sep 17 00:00:00 2001
From: Geoff Fink <gefink@gmail.com>
Date: Thu, 31 Oct 2013 15:43:39 -0600
Subject: [PATCH] override is not available in gcc 4.6 (only 4.7). Removed for
 compatability

---
 src/ui/designer/QGCComboBox.h      | 2 +-
 src/ui/designer/QGCCommandButton.h | 2 +-
 src/ui/designer/QGCParamSlider.h   | 2 +-
 src/ui/designer/QGCTextLabel.h     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/ui/designer/QGCComboBox.h b/src/ui/designer/QGCComboBox.h
index c81a636fe..2e606a559 100644
--- a/src/ui/designer/QGCComboBox.h
+++ b/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)*/
diff --git a/src/ui/designer/QGCCommandButton.h b/src/ui/designer/QGCCommandButton.h
index a1c858a67..da47e6082 100644
--- a/src/ui/designer/QGCCommandButton.h
+++ b/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();
diff --git a/src/ui/designer/QGCParamSlider.h b/src/ui/designer/QGCParamSlider.h
index b5b5862d1..9ca92423b 100644
--- a/src/ui/designer/QGCParamSlider.h
+++ b/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)*/
diff --git a/src/ui/designer/QGCTextLabel.h b/src/ui/designer/QGCTextLabel.h
index bc0a799cc..8e8cd509e 100644
--- a/src/ui/designer/QGCTextLabel.h
+++ b/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);
-- 
2.22.0