diff options
| author | Mårten Nordheim <marten.nordheim@qt.io> | 2020-03-24 10:02:13 +0100 |
|---|---|---|
| committer | Mårten Nordheim <marten.nordheim@qt.io> | 2020-04-21 07:23:56 +0000 |
| commit | 00b6314f79cf4d8b1ea2ba81dbafe7088c52ae84 (patch) | |
| tree | 59e43c6a83577e0082f2ef59f3e8e9e1f3399158 /src/client/qwaylandintegration.cpp | |
| parent | ee5d89d5589dd1ace6e9f60d4ef611e23e2dec2d (diff) | |
| download | qtwayland-00b6314f79cf4d8b1ea2ba81dbafe7088c52ae84.tar.gz | |
Update connects to QSocketNotifier::activated
The int-overload will in some cases truncate the descriptor.
So it's being replaced. On Linux it won't truncate, so the slot can stay
as int, but we still update which signal to connect to.
Task-number: QTBUG-70441
Change-Id: I516a453c381e8d29464febabfd69c788e58db5fe
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
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 85c1990b..e3b86ee9 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(); |