diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-07 10:47:20 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-07 10:47:20 +0200 |
| commit | ee0951d69b38f766e67262487be95b88501aa4a5 (patch) | |
| tree | 116c334060500be340d4d61c99026316b0df3ce9 /src/widgets/widgets/qtoolbutton.h | |
| parent | 0bb645b1ccc5a9d57b21cf0b2c4306b8e48c611c (diff) | |
| parent | d37239aa419ee4adff4b0a8d5c1403cadff72319 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/network/access/qftp.cpp
src/widgets/itemviews/qheaderview.cpp
src/widgets/itemviews/qlistview.cpp
tests/auto/network/access/qftp/tst_qftp.cpp
Change-Id: I9f928f25d45d8944dd60bb583f649fc1615bc5d9
Diffstat (limited to 'src/widgets/widgets/qtoolbutton.h')
| -rw-r--r-- | src/widgets/widgets/qtoolbutton.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/widgets/widgets/qtoolbutton.h b/src/widgets/widgets/qtoolbutton.h index d9bfed4c47..7b6114b5c1 100644 --- a/src/widgets/widgets/qtoolbutton.h +++ b/src/widgets/widgets/qtoolbutton.h @@ -125,6 +125,7 @@ private: Q_DECLARE_PRIVATE(QToolButton) #ifndef QT_NO_MENU Q_PRIVATE_SLOT(d_func(), void _q_buttonPressed()) + Q_PRIVATE_SLOT(d_func(), void _q_buttonReleased()) Q_PRIVATE_SLOT(d_func(), void _q_updateButtonDown()) Q_PRIVATE_SLOT(d_func(), void _q_menuTriggered(QAction*)) #endif |