diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-07-01 10:21:37 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-07-01 10:21:37 +0200 |
| commit | d25c3227299a6a281db37e68e45f0b02db3f5297 (patch) | |
| tree | 08f436f8aebe2c8aaaee570f88e71bd2d0c8f6e7 /tests/manual/diaglib/eventfilter.cpp | |
| parent | 222b81f5dac2a5d32027b15d3a784819291431f6 (diff) | |
| parent | a39b19b0c7419021b3c22dc4d4bced0995f3a29f (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
src/network/ssl/qsslsocket_openssl.cpp
src/platformsupport/vkconvenience/qvkconvenience.cpp
Change-Id: I97ce6ed185f7fdad8102cc58d3cfec0119fd7bb4
Diffstat (limited to 'tests/manual/diaglib/eventfilter.cpp')
| -rw-r--r-- | tests/manual/diaglib/eventfilter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/manual/diaglib/eventfilter.cpp b/tests/manual/diaglib/eventfilter.cpp index 39898f0781..b99d4099e3 100644 --- a/tests/manual/diaglib/eventfilter.cpp +++ b/tests/manual/diaglib/eventfilter.cpp @@ -197,7 +197,7 @@ static void formatApplicationState(QDebug debug) static void formatMouseState(QObject *o, QDebug debug) { if (o->isWidgetType()) { - const QWidget *w = static_cast<const QWidget *>(o); + auto w = static_cast<const QWidget *>(o); if (QWidget::mouseGrabber() == w) debug << " [grabbed]"; if (w->hasMouseTracking()) |