diff options
| author | David Faure <faure@kde.org> | 2012-01-12 18:00:42 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-12 18:44:56 +0100 |
| commit | 22225b1b06eca6b325e609da94715f9dbc79ff4d (patch) | |
| tree | 38429f347a17c817c64446f6e2514631f625a934 /src/corelib/kernel | |
| parent | f865dc1ae44c88f6965acd09bafb01829c35447b (diff) | |
Fix compilation of public headers with -Werror=shadow
Change-Id: Id47623002abca1e03fdfb9e9bd9cbc1b5542a2db
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qtimer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/kernel/qtimer.h b/src/corelib/kernel/qtimer.h index b1bbfa4241..6fb32f9bde 100644 --- a/src/corelib/kernel/qtimer.h +++ b/src/corelib/kernel/qtimer.h @@ -70,7 +70,7 @@ public: void setInterval(int msec); int interval() const { return inter; } - void setTimerType(Qt::TimerType type) { this->type = type; } + void setTimerType(Qt::TimerType atype) { this->type = atype; } Qt::TimerType timerType() const { return Qt::TimerType(type); } inline void setSingleShot(bool singleShot); |