diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-12 08:18:28 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-12 09:12:57 +0100 |
| commit | 2c83f2bf3366466db4dc0e3bee89e877fefe0260 (patch) | |
| tree | 9c1f26ce26f80d2583803f471a9ff14dc8fb192c /src/templates/qquickabstractbutton_p.h | |
| parent | 7c7be5195df2b26db58c4e730e304787d7980228 (diff) | |
| parent | 00292bca971fbe7023a28c3ccd10947a34ea88f8 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/templates/qquickabstractbutton.cpp
Change-Id: Icfd472451a150524dded704b4be5d286da21a6da
Diffstat (limited to 'src/templates/qquickabstractbutton_p.h')
| -rw-r--r-- | src/templates/qquickabstractbutton_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/templates/qquickabstractbutton_p.h b/src/templates/qquickabstractbutton_p.h index 7ff98f66..9469e706 100644 --- a/src/templates/qquickabstractbutton_p.h +++ b/src/templates/qquickabstractbutton_p.h @@ -102,6 +102,7 @@ Q_SIGNALS: void released(); void canceled(); void clicked(); + void pressAndHold(); void doubleClicked(); void textChanged(); void pressedChanged(); |