diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-10-04 15:27:15 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-10-04 15:27:15 +0200 |
| commit | 96a20440093aff70e78d01d6f014630bda5b0713 (patch) | |
| tree | b9e6b6da88b8a0b909d3fa51ac0d191c61efc2ce /src/gui/kernel/qguiapplication.cpp | |
| parent | 3598ffcc26dbae14d88c32fabfc8be465eed8f61 (diff) | |
| parent | a3790681a58ff0ff5f3a7dd53c473013a792e949 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/network/access/qnetworkaccessmanager.cpp
src/network/access/qnetworkreplyhttpimpl.cpp
Change-Id: I059be651604623616fd31e8616be8ae61b4f8883
Diffstat (limited to 'src/gui/kernel/qguiapplication.cpp')
| -rw-r--r-- | src/gui/kernel/qguiapplication.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index 4b3d94b97f..a9c194afce 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -2251,8 +2251,11 @@ void QGuiApplicationPrivate::processWheelEvent(QWindowSystemInterfacePrivate::Wh } #if QT_DEPRECATED_SINCE(5, 14) +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED QWheelEvent ev(localPoint, globalPoint, e->pixelDelta, e->angleDelta, e->qt4Delta, e->qt4Orientation, mouse_buttons, e->modifiers, e->phase, e->source, e->inverted); +QT_WARNING_POP #else QWheelEvent ev(localPoint, globalPoint, e->pixelDelta, e->angleDelta, mouse_buttons, e->modifiers, e->phase, e->inverted, e->source); |