diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-07-11 12:06:15 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-07-11 12:57:13 +0200 |
| commit | d2d0e08e584c780b4b70a37e7b39c6bbcc7bc63e (patch) | |
| tree | 22582b82dd5bb370205aa66302fb238bf5edaa6e /src/quicktemplates2/qquickdrawer_p_p.h | |
| parent | c3431db7a3eb6b0c6e325e2d1e16eb6def9a4b4d (diff) | |
| parent | 744164e6c92cb721d2a339cee8c465e1685723f9 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
tests/auto/controls/data/tst_scrollindicator.qml
Change-Id: I1f5581ae7814c0d4152e4c9b79a30a8af5a3a17b
Diffstat (limited to 'src/quicktemplates2/qquickdrawer_p_p.h')
| -rw-r--r-- | src/quicktemplates2/qquickdrawer_p_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquickdrawer_p_p.h b/src/quicktemplates2/qquickdrawer_p_p.h index 72a83343..010f1d49 100644 --- a/src/quicktemplates2/qquickdrawer_p_p.h +++ b/src/quicktemplates2/qquickdrawer_p_p.h @@ -88,7 +88,7 @@ public: bool prepareEnterTransition() override; bool prepareExitTransition() override; - void setEdge(Qt::Edge edge); + bool setEdge(Qt::Edge edge); Qt::Edge edge; qreal offset; |