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/imports/templates | |
| 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/imports/templates')
| -rw-r--r-- | src/imports/templates/plugins.qmltypes | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/imports/templates/plugins.qmltypes b/src/imports/templates/plugins.qmltypes index 792d4e95..1879dc6c 100644 --- a/src/imports/templates/plugins.qmltypes +++ b/src/imports/templates/plugins.qmltypes @@ -26,6 +26,7 @@ Module { Signal { name: "released" } Signal { name: "canceled" } Signal { name: "clicked" } + Signal { name: "pressAndHold" } Signal { name: "doubleClicked" } Method { name: "toggle" } } |