ec6dda0bd4
Once upon a time, the PFN_BLUETOOTH_ENUM_ATTRIBUTES_CALLBACK was defined
in mingw-w64 incorrectly. It was fixed in this commit[1].
But, Qt5 worked around that issue. Now that workaround is not valid.
This change removes that workaround.
[1]: 427ab730f0
17 lines
594 B
Diff
17 lines
594 B
Diff
--- a/src/bluetooth/qbluetoothservicediscoveryagent_win.cpp
|
|
+++ b/src/bluetooth/qbluetoothservicediscoveryagent_win.cpp
|
|
@@ -206,12 +206,7 @@
|
|
return sequence;
|
|
}
|
|
|
|
-#if defined(Q_CC_MINGW)
|
|
-# define SDP_CALLBACK
|
|
-#else
|
|
-# define SDP_CALLBACK QT_WIN_CALLBACK
|
|
-#endif
|
|
-static BOOL SDP_CALLBACK bluetoothSdpCallback(ULONG attributeId, LPBYTE valueStream, ULONG streamSize, LPVOID param)
|
|
+static BOOL QT_WIN_CALLBACK bluetoothSdpCallback(ULONG attributeId, LPBYTE valueStream, ULONG streamSize, LPVOID param)
|
|
{
|
|
QBluetoothServiceInfo *result = static_cast<QBluetoothServiceInfo*>(param);
|
|
|