diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-17 14:15:53 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-17 14:43:26 +0100 |
| commit | e5ac4afbf954a3e1616ce8543d46ddc668d0374f (patch) | |
| tree | be6d97001edebd5cb74c64aaf0010f3cc76a7293 /src/widgets/kernel/qapplication.cpp | |
| parent | e3ed95dd44b95b6e9361b562807e711d7ce5a58b (diff) | |
| parent | 03c1a6ac717e3c5693653a5e294214056bda970e (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
mkspecs/features/mac/default_post.prf
mkspecs/features/uikit/default_post.prf
Change-Id: I2a6f783451f2ac9eb4c1a050f605435d2dacf218
Diffstat (limited to 'src/widgets/kernel/qapplication.cpp')
| -rw-r--r-- | src/widgets/kernel/qapplication.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp index 89eff898fe..358838b4e9 100644 --- a/src/widgets/kernel/qapplication.cpp +++ b/src/widgets/kernel/qapplication.cpp @@ -2790,6 +2790,8 @@ void QApplicationPrivate::sendSyntheticEnterLeave(QWidget *widget) // Send enter/leave events followed by a mouse move on the entered widget. QMouseEvent e(QEvent::MouseMove, pos, windowPos, globalPos, Qt::NoButton, Qt::NoButton, Qt::NoModifier); sendMouseEvent(widgetUnderCursor, &e, widgetUnderCursor, tlw, &qt_button_down, qt_last_mouse_receiver); +#else // !QT_NO_CURSOR + Q_UNUSED(widget); #endif // QT_NO_CURSOR } |