diff options
| author | Juha Vuolle <juha.vuolle@insta.fi> | 2021-11-28 17:53:04 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-12-06 18:05:12 +0000 |
| commit | 2fe4b9b72ee15dd1e3ffc05a0bf4749979716913 (patch) | |
| tree | 5742f232bce33406f840c544c1b0508b3fa2f6e1 | |
| parent | 806a40cdd39217bb4c303373e369d54e773ca4c4 (diff) | |
| download | qtconnectivity-2fe4b9b72ee15dd1e3ffc05a0bf4749979716913.tar.gz | |
Remove qtconnectivity compiler warnings on macOS
- blockByteToAddress is commented out since 2011 => remove
- put dumpServiceInfoAttributes behind similar "#if 0" as its usage
Change-Id: I3d7fb2da45d52c5430c947bca279f2f806b28140
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
(cherry picked from commit 6e354171798de4207f8747c632b56fa9e2f1366e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | tests/auto/nfccommons/targetemulator.cpp | 8 | ||||
| -rw-r--r-- | tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp | 2 |
2 files changed, 2 insertions, 8 deletions
diff --git a/tests/auto/nfccommons/targetemulator.cpp b/tests/auto/nfccommons/targetemulator.cpp index 697fec4b..681cf4d2 100644 --- a/tests/auto/nfccommons/targetemulator.cpp +++ b/tests/auto/nfccommons/targetemulator.cpp @@ -55,11 +55,6 @@ TagBase::~TagBase() { } -static inline quint8 blockByteToAddress(quint8 block, quint8 byte) -{ - return ((block & 0x0f) << 3) | (byte & 0x07); -} - NfcTagType1::NfcTagType1() : hr0(0x11), hr1(0x00), memory(120, '\0') { @@ -119,9 +114,6 @@ void NfcTagType1::load(QSettings *settings) ; } - //quint16 lock = (quint8(memory[blockByteToAddress(0x0e, 1)]) << 8) | - // quint8(memory[blockByteToAddress(0x0e, 0)]); - settings->endGroup(); } diff --git a/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp b/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp index 7fa2274a..3568f940 100644 --- a/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp +++ b/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp @@ -179,6 +179,7 @@ void tst_QBluetoothServiceDiscoveryAgent::serviceDiscoveryDebug(const QBluetooth qDebug() << "\tRFCOMM server channel:" << info.serverChannel(); } +#if 0 static void dumpAttributeVariant(const QVariant &var, const QString indent) { if (!var.isValid()) { @@ -245,6 +246,7 @@ static inline void dumpServiceInfoAttributes(const QBluetoothServiceInfo &info) dumpAttributeVariant(info.attribute(id), QString("\t")); } } +#endif void tst_QBluetoothServiceDiscoveryAgent::tst_serviceDiscovery_data() |