1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UDP: Protect call to UDP API based on feature

Browse Source 
Fails to compile in some qtlite setup

Pick-to: 6.6 6.5
Change-Id: If04c1ca3f1b4eb59517902b8caab167f4627391b
Reviewed-by: Jari Helaakoski <jari.helaakoski@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 505e7ec37d98da2010981ed17c39dd934edf47d1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Mårten Nordheim 2024-03-20 10:39:18 +01:00 committed by Qt Cherry-pick Bot
parent e86f223eba
commit 39e8c72c67
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/network/socket/qabstractsocket.cpp
View File

@ -642,7 +642,11 @@ bool QAbstractSocketPrivate::canReadNotification()
socketEngine->setReadNotificationEnabled(false);
return true;
}
if (!isUdpSocket || socketEngine->hasPendingDatagrams()) {
if (!isUdpSocket
#if QT_CONFIG(udpsocket)
|| socketEngine->hasPendingDatagrams()
#endif
) {
hasPendingData = true;
hasPendingDatagram = isUdpSocket;
}