diff options
| author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2009-12-04 21:33:25 +0000 |
|---|---|---|
| committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2009-12-04 21:33:25 +0000 |
| commit | 03246172b8855d661309a166db6909e065ea54cb (patch) | |
| tree | 27db7eadc558cf9f233010f42f5d29d2e7a9bc2d | |
| parent | ce63faa8d4d7fc7dfb710a4d5847b4bd5ac61242 (diff) | |
| download | rockbox-03246172b8855d661309a166db6909e065ea54cb.zip rockbox-03246172b8855d661309a166db6909e065ea54cb.tar.gz rockbox-03246172b8855d661309a166db6909e065ea54cb.tar.bz2 rockbox-03246172b8855d661309a166db6909e065ea54cb.tar.xz | |
Fix "Warning: Signals cannot be declared virtual" for progresslogger when building with Qt 4.6.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23848 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | rbutil/rbutilqt/base/progressloggerinterface.h | 2 | ||||
| -rw-r--r-- | rbutil/rbutilqt/progressloggergui.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/rbutil/rbutilqt/base/progressloggerinterface.h b/rbutil/rbutilqt/base/progressloggerinterface.h index 4a8fd83..9fff7dc 100644 --- a/rbutil/rbutilqt/base/progressloggerinterface.h +++ b/rbutil/rbutilqt/base/progressloggerinterface.h @@ -42,7 +42,7 @@ public: virtual int getProgressMax()=0; signals: - virtual void aborted()=0; + void aborted(); public slots: diff --git a/rbutil/rbutilqt/progressloggergui.h b/rbutil/rbutilqt/progressloggergui.h index a0c24d6..1e62fac 100644 --- a/rbutil/rbutilqt/progressloggergui.h +++ b/rbutil/rbutilqt/progressloggergui.h @@ -38,8 +38,8 @@ public: virtual void setProgressVisible(bool); signals: - virtual void aborted(); - virtual void closed(); + void aborted(); + void closed(); public slots: virtual void addItem(const QString &text); //! add a string to the progress list |