diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2017-05-18 21:21:47 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2017-05-19 06:19:30 +0000 |
| commit | 4593b79d84b9c8cc818d3c30e3882d699228339f (patch) | |
| tree | 98df1ca5a4cb3852f03496bb0bf4e13d838063a2 | |
| parent | 1287cb093a89c9f21d50ffa590967700e17891e7 (diff) | |
Fix GCC 7 warnings about implicit fallthroughs
Make them explicit.
Change-Id: I9bf1e35bffb044dcbf62fffd14bfe71bc374febf
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| -rw-r--r-- | src/bluetooth/qlowenergycontroller_bluez.cpp | 2 | ||||
| -rw-r--r-- | src/nfc/qnearfieldtagtype1.cpp | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/bluetooth/qlowenergycontroller_bluez.cpp b/src/bluetooth/qlowenergycontroller_bluez.cpp index e5a3d8de..3873664a 100644 --- a/src/bluetooth/qlowenergycontroller_bluez.cpp +++ b/src/bluetooth/qlowenergycontroller_bluez.cpp @@ -1768,8 +1768,10 @@ bool QLowEnergyControllerPrivate::setSecurityLevel(int level) switch (level) { // fall through intendeds case BT_SECURITY_HIGH: optval |= L2CAP_LM_SECURE; + Q_FALLTHROUGH(); case BT_SECURITY_MEDIUM: optval |= L2CAP_LM_ENCRYPT; + Q_FALLTHROUGH(); case BT_SECURITY_LOW: optval |= L2CAP_LM_AUTH; break; diff --git a/src/nfc/qnearfieldtagtype1.cpp b/src/nfc/qnearfieldtagtype1.cpp index 5d46b8c5..34f2c8b8 100644 --- a/src/nfc/qnearfieldtagtype1.cpp +++ b/src/nfc/qnearfieldtagtype1.cpp @@ -174,7 +174,7 @@ void QNearFieldTagType1Private::progressToNextNdefReadMessageState() delete m_tlvReader; m_tlvReader = new QTlvReader(q); - // fall through + Q_FALLTHROUGH(); // fall through } case NdefReadReadingTlv: Q_ASSERT(m_tlvReader); @@ -252,7 +252,7 @@ void QNearFieldTagType1Private::progressToNextNdefWriteMessageState() delete m_tlvReader; m_tlvReader = new QTlvReader(q); - // fall through + Q_FALLTHROUGH(); // fall through } case NdefWriteReadingTlv: Q_ASSERT(m_tlvReader); |