diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-11-29 12:31:41 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-11-29 12:31:41 +0100 |
| commit | 947cace7993807d173656300f4440ae5166624fe (patch) | |
| tree | 39eb81b1bda6a92a3358b1c489e9cfce6d241f17 /src/widgets/widgets/qpushbutton.h | |
| parent | 5e921a18b2a098f68dbce368f9d20447939b3510 (diff) | |
| parent | 7eb4be9db89d40ea2cc090e7a562bdd588708607 (diff) | |
Merge 5.8 into 5.8.0
Change-Id: If74f0ade36baa9454ebcffb8d6bdd14ac963c1cb
Diffstat (limited to 'src/widgets/widgets/qpushbutton.h')
| -rw-r--r-- | src/widgets/widgets/qpushbutton.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/widgets/widgets/qpushbutton.h b/src/widgets/widgets/qpushbutton.h index 859ac247fb..b0d1ccacdb 100644 --- a/src/widgets/widgets/qpushbutton.h +++ b/src/widgets/widgets/qpushbutton.h @@ -87,9 +87,6 @@ public Q_SLOTS: protected: bool event(QEvent *e) Q_DECL_OVERRIDE; -#if 0 // Used to be included in Qt4 for Q_WS_MAC - bool hitButton(const QPoint &pos) const; -#endif void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; void keyPressEvent(QKeyEvent *) Q_DECL_OVERRIDE; void focusInEvent(QFocusEvent *) Q_DECL_OVERRIDE; |