diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-23 09:32:42 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-23 09:32:43 +0200 |
| commit | b69e62f7b5d11990c2b75045ec67d7179e823e17 (patch) | |
| tree | be62e07f090ef86b6ce922625aea5137752aa400 /src/client/qwaylandintegration.cpp | |
| parent | e72f7db39f58063267036a4e5d066e70a80184b2 (diff) | |
| parent | 28e7d940c42c47cf039522709883ae3de9f4fb88 (diff) | |
Merge remote-tracking branch 'origin/5.15' into 5.15.0
Change-Id: I09245b4d620fdf75cbee512d6c95aab1b1d54f99
Diffstat (limited to 'src/client/qwaylandintegration.cpp')
| -rw-r--r-- | src/client/qwaylandintegration.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp index 2e0d508f9..7ad8e05e0 100644 --- a/src/client/qwaylandintegration.cpp +++ b/src/client/qwaylandintegration.cpp @@ -198,7 +198,7 @@ void QWaylandIntegration::initialize() int fd = wl_display_get_fd(mDisplay->wl_display()); QSocketNotifier *sn = new QSocketNotifier(fd, QSocketNotifier::Read, mDisplay.data()); - QObject::connect(sn, SIGNAL(activated(int)), mDisplay.data(), SLOT(flushRequests())); + QObject::connect(sn, SIGNAL(activated(QSocketDescriptor)), mDisplay.data(), SLOT(flushRequests())); // Qt does not support running with no screens mDisplay->ensureScreen(); |