From fc1dc2d22781a46df2351848fa408eed96ccdd06 Mon Sep 17 00:00:00 2001 From: Denis Shienkov Date: Sun, 12 Jul 2015 14:59:57 +0300 Subject: Add missing QT_DEPRECATED_SINCE(5, 2) macro The macro was added in the header file, but not in the implementation file. Change-Id: I51bc62eedbaba627fb525c04dc126bf0125e7a39 Reviewed-by: Marc Mutz Reviewed-by: Denis Shienkov --- src/serialport/qserialportinfo.cpp | 2 ++ src/serialport/qserialportinfo_mac.cpp | 2 ++ src/serialport/qserialportinfo_unix.cpp | 2 ++ src/serialport/qserialportinfo_win.cpp | 2 ++ src/serialport/qserialportinfo_wince.cpp | 2 ++ 5 files changed, 10 insertions(+) diff --git a/src/serialport/qserialportinfo.cpp b/src/serialport/qserialportinfo.cpp index 26b275d..055b226 100644 --- a/src/serialport/qserialportinfo.cpp +++ b/src/serialport/qserialportinfo.cpp @@ -266,6 +266,7 @@ bool QSerialPortInfo::hasProductIdentifier() const \sa isNull() */ +#if QT_DEPRECATED_SINCE(5, 2) /*! \fn bool QSerialPortInfo::isValid() const \obsolete @@ -275,6 +276,7 @@ bool QSerialPortInfo::hasProductIdentifier() const \sa isNull(), isBusy() */ +#endif // QT_DEPRECATED_SINCE(5, 2) /*! \fn QList QSerialPortInfo::standardBaudRates() diff --git a/src/serialport/qserialportinfo_mac.cpp b/src/serialport/qserialportinfo_mac.cpp index 54abe21..380a9b8 100644 --- a/src/serialport/qserialportinfo_mac.cpp +++ b/src/serialport/qserialportinfo_mac.cpp @@ -236,11 +236,13 @@ bool QSerialPortInfo::isBusy() const return true; } +#if QT_DEPRECATED_SINCE(5, 2) bool QSerialPortInfo::isValid() const { QFile f(systemLocation()); return f.exists(); } +#endif // QT_DEPRECATED_SINCE(5, 2) QString QSerialPortInfoPrivate::portNameToSystemLocation(const QString &source) { diff --git a/src/serialport/qserialportinfo_unix.cpp b/src/serialport/qserialportinfo_unix.cpp index 07587ec..2eb2bf6 100644 --- a/src/serialport/qserialportinfo_unix.cpp +++ b/src/serialport/qserialportinfo_unix.cpp @@ -463,11 +463,13 @@ bool QSerialPortInfo::isBusy() const return true; } +#if QT_DEPRECATED_SINCE(5, 2) bool QSerialPortInfo::isValid() const { QFile f(systemLocation()); return f.exists(); } +#endif // QT_DEPRECATED_SINCE(5, 2) QString QSerialPortInfoPrivate::portNameToSystemLocation(const QString &source) { diff --git a/src/serialport/qserialportinfo_win.cpp b/src/serialport/qserialportinfo_win.cpp index 493c4d0..f6d9228 100644 --- a/src/serialport/qserialportinfo_win.cpp +++ b/src/serialport/qserialportinfo_win.cpp @@ -365,6 +365,7 @@ bool QSerialPortInfo::isBusy() const return false; } +#if QT_DEPRECATED_SINCE(5, 2) bool QSerialPortInfo::isValid() const { const HANDLE handle = ::CreateFile(reinterpret_cast(systemLocation().utf16()), @@ -378,6 +379,7 @@ bool QSerialPortInfo::isValid() const } return true; } +#endif // QT_DEPRECATED_SINCE(5, 2) QString QSerialPortInfoPrivate::portNameToSystemLocation(const QString &source) { diff --git a/src/serialport/qserialportinfo_wince.cpp b/src/serialport/qserialportinfo_wince.cpp index 78439c9..9f1980f 100644 --- a/src/serialport/qserialportinfo_wince.cpp +++ b/src/serialport/qserialportinfo_wince.cpp @@ -139,6 +139,7 @@ bool QSerialPortInfo::isBusy() const return false; } +#if QT_DEPRECATED_SINCE(5, 2) bool QSerialPortInfo::isValid() const { const HANDLE handle = ::CreateFile(reinterpret_cast(systemLocation().utf16()), @@ -152,6 +153,7 @@ bool QSerialPortInfo::isValid() const } return true; } +#endif // QT_DEPRECATED_SINCE(5, 2) QString QSerialPortInfoPrivate::portNameToSystemLocation(const QString &source) { -- cgit v1.2.1