diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-21 03:00:38 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-21 03:00:38 +0200 |
| commit | 8d3cfb4f6ed698c48577f1afac29cbca04b91244 (patch) | |
| tree | 8d691dd88c053c700a0d9054ff563a1f5298bfd7 | |
| parent | af1685e0454db37c2c208b2a213557c5cdb429f0 (diff) | |
| parent | b5f0519e8e6f8f125f711d61832072649d841dfe (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I95b61b3a3ee49cdab0982c11fb0fcf04476f0c64
| -rw-r--r-- | src/serialport/qserialport.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/serialport/qserialport.h b/src/serialport/qserialport.h index 655297c8..9a5c1d03 100644 --- a/src/serialport/qserialport.h +++ b/src/serialport/qserialport.h @@ -152,7 +152,7 @@ public: Q_DECLARE_FLAGS(PinoutSignals, PinoutSignal) #if QT_DEPRECATED_SINCE(5, 2) -#if defined(_MSC_VER) +#if defined(Q_CC_MSVC) && !defined(Q_CC_CLANG) #pragma deprecated(UnknownBaud) #pragma deprecated(UnknownDataBits) #pragma deprecated(UnknownParity) @@ -193,7 +193,7 @@ public: Q_ENUM(SerialPortError) #if QT_DEPRECATED_SINCE(5, 6) -#if defined(_MSC_VER) +#if defined(Q_CC_MSVC) && !defined(Q_CC_CLANG) #pragma deprecated(ParityError) #pragma deprecated(FramingError) #pragma deprecated(BreakConditionError) |