diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-04-21 11:08:23 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-04-21 11:08:24 +0200 |
| commit | 0aaca005c0bb6267ddd14a84634c33c813e2d2c4 (patch) | |
| tree | 2c09a2498618830b32e92f13450fab2210aae446 /src/quick/items/qquickitem.cpp | |
| parent | 186cbe30939947e3a2d33b250fc861cbee361dfe (diff) | |
| parent | 749a7212e903d8e8c6f256edb1836b9449cc7fe1 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: Ibed6ee74d36b4ce37391c82db00a0abd30d09e7a
Diffstat (limited to 'src/quick/items/qquickitem.cpp')
| -rw-r--r-- | src/quick/items/qquickitem.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index 15042082fe..0bbf21607d 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -7179,6 +7179,8 @@ void QQuickItemPrivate::setHasCursorInChild(bool hasCursor) QQuickItemPrivate *parentPrivate = QQuickItemPrivate::get(parent); parentPrivate->setHasCursorInChild(hasCursor); } +#else + Q_UNUSED(hasCursor); #endif } |