Hello community,
here is the log from the commit of package libqt5-qtserialport for
openSUSE:Factory checked in at 2013-12-17 08:51:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtserialport (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtserialport.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtserialport"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtserialport/libqt5-qtserialport.changes
2013-12-02 09:51:47.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.libqt5-qtserialport.new/libqt5-qtserialport.changes
2013-12-17 08:51:25.000000000 +0100
@@ -1,0 +2,8 @@
+Thu Dec 12 13:42:39 UTC 2013 - [email protected]
+- Update to 5.2.0 final:
+ * For more details please see:
+ http://blog.qt.digia.com/blog/2013/12/12/qt-5-2-released-the-best-qt-yet/
+ http://qt-project.org/qt5/qt52
+ http://qt.digia.com/Product/Whats-New/Qt-52/
+
+-------------------------------------------------------------------
Old:
----
qtserialport-opensource-src-5.2.0-rc1.tar.xz
New:
----
qtserialport-opensource-src-5.2.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtserialport.spec ++++++
--- /var/tmp/diff_new_pack.xPS6cP/_old 2013-12-17 08:51:26.000000000 +0100
+++ /var/tmp/diff_new_pack.xPS6cP/_new 2013-12-17 08:51:26.000000000 +0100
@@ -19,7 +19,7 @@
%define libname libQt5SerialPort5
Name: libqt5-qtserialport
-Version: 5.2.0~rc1
+Version: 5.2.0
Release: 0
Summary: Qt 5 Serial Port Addon
License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0
@@ -28,7 +28,7 @@
Source: %{tar_version}.tar.xz
BuildRequires: fdupes
%define base_name libqt5
-%define real_version 5.2.0-rc1
+%define real_version 5.2.0
%define so_version 5.2.0
%define tar_version qtserialport-opensource-src-%{real_version}
BuildRequires: libqt5-qtbase-devel >= %{version}
++++++ qtserialport-opensource-src-5.2.0-rc1.tar.xz ->
qtserialport-opensource-src-5.2.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtserialport-opensource-src-5.2.0-rc1/.tag
new/qtserialport-opensource-src-5.2.0/.tag
--- old/qtserialport-opensource-src-5.2.0-rc1/.tag 2013-11-27
02:01:17.000000000 +0100
+++ new/qtserialport-opensource-src-5.2.0/.tag 2013-12-08 18:09:55.000000000
+0100
@@ -1 +1 @@
-e0be9ed761e730bec7b26bcaba014f028f6340d0
+97bbe2acd8b4c14315653a3d9dc5757d6518220e
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialport-opensource-src-5.2.0-rc1/dist/changes-5.2.0
new/qtserialport-opensource-src-5.2.0/dist/changes-5.2.0
--- old/qtserialport-opensource-src-5.2.0-rc1/dist/changes-5.2.0
2013-11-27 02:01:17.000000000 +0100
+++ new/qtserialport-opensource-src-5.2.0/dist/changes-5.2.0 2013-12-08
18:09:55.000000000 +0100
@@ -64,9 +64,6 @@
- [QTBUG-33774] Document that the serial port parameters cannot be set before
opening.
-- Add an "UnknownSignal" value for the pinout signals. This is now the returned
-value when the pinout state of the signals cannot be detected properly.
-
- No more unnecessary syscalls (parameter settings, pinout signal query, etc)
in the
backend when the port is closed. This also means no improper errors are set
accordingly.
@@ -124,3 +121,11 @@
- [QTBUG-35064] PCI support has been added to the sysfs backend on Linux to
support the enumeration of such devices.
+
+- [QTBUG-35184] Mark the isValid() method in QSerialPortInfo deprecated because
+it has no common use case.
+
+- [QTBUG-35215] Mark the QSerialPort::Unknown* enumeration values in
QSerialPort
+deprecated because it has no use case, and was added mistakenly. There is no
+such "standard" serial port behavior general for these as "unknown". It is an
+implementation detail for error reporting, and hence not recommended anymore.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialport-opensource-src-5.2.0-rc1/src/serialport/qserialport.cpp
new/qtserialport-opensource-src-5.2.0/src/serialport/qserialport.cpp
--- old/qtserialport-opensource-src-5.2.0-rc1/src/serialport/qserialport.cpp
2013-11-27 02:01:17.000000000 +0100
+++ new/qtserialport-opensource-src-5.2.0/src/serialport/qserialport.cpp
2013-12-08 18:09:55.000000000 +0100
@@ -70,10 +70,10 @@
, error(QSerialPort::NoError)
, inputBaudRate(0)
, outputBaudRate(0)
- , dataBits(QSerialPort::UnknownDataBits)
- , parity(QSerialPort::UnknownParity)
- , stopBits(QSerialPort::UnknownStopBits)
- , flow(QSerialPort::UnknownFlowControl)
+ , dataBits(QSerialPort::Data8)
+ , parity(QSerialPort::NoParity)
+ , stopBits(QSerialPort::OneStop)
+ , flow(QSerialPort::NoFlowControl)
, policy(QSerialPort::IgnorePolicy)
, settingsRestoredOnClose(true)
, q_ptr(q)
@@ -198,7 +198,9 @@
\value Baud38400 38400 baud.
\value Baud57600 57600 baud.
\value Baud115200 115200 baud.
- \value UnknownBaud Unknown baud.
+ \value UnknownBaud Unknown baud. This value is obsolete. It is provided to
+ keep old source code working. We strongly advise
against
+ using it in new code.
\sa QSerialPort::baudRate
*/
@@ -212,7 +214,9 @@
\value Data6 Six bits.
\value Data7 Seven bits
\value Data8 Eight bits.
- \value UnknownDataBits Unknown number of bits.
+ \value UnknownDataBits Unknown number of bits. This value is obsolete. It
+ is provided to keep old source code working. We
+ strongly advise against using it in new code.
\sa QSerialPort::dataBits
*/
@@ -227,7 +231,9 @@
\value OddParity Odd parity.
\value SpaceParity Space parity.
\value MarkParity Mark parity.
- \value UnknownParity Unknown parity.
+ \value UnknownParity Unknown parity. This value is obsolete. It is
+ provided to keep old source code working. We
+ strongly advise against using it in new code.
\sa QSerialPort::parity
*/
@@ -240,7 +246,9 @@
\value OneStop 1 stop bit.
\value OneAndHalfStop 1.5 stop bits.
\value TwoStop 2 stop bits.
- \value UnknownStopBits Unknown number of stop bit.
+ \value UnknownStopBits Unknown number of stop bit. This value is obsolete.
+ It is provided to keep old source code working. We
+ strongly advise against using it in new code.
\sa QSerialPort::stopBits
*/
@@ -253,7 +261,9 @@
\value NoFlowControl No flow control.
\value HardwareControl Hardware flow control (RTS/CTS).
\value SoftwareControl Software flow control (XON/XOFF).
- \value UnknownFlowControl Unknown flow control.
+ \value UnknownFlowControl Unknown flow control. This value is obsolete.
It
+ is provided to keep old source code working. We
+ strongly advise against using it in new code.
\sa QSerialPort::flowControl
*/
@@ -274,7 +284,6 @@
\value ClearToSendSignal CTS (Clear To Send).
\value SecondaryTransmittedDataSignal STD (Secondary Transmitted Data).
\value SecondaryReceivedDataSignal SRD (Secondary Received Data).
- \value UnknownSignal Unknown line state. This value was
introduced in QtSerialPort 5.2.
\sa pinoutSignals(), QSerialPort::dataTerminalReady,
QSerialPort::requestToSend
@@ -621,7 +630,7 @@
Q_D(const QSerialPort);
if (directions == QSerialPort::AllDirections)
return d->inputBaudRate == d->outputBaudRate ?
- d->inputBaudRate : QSerialPort::UnknownBaud;
+ d->inputBaudRate : -1;
return directions & QSerialPort::Input ? d->inputBaudRate :
d->outputBaudRate;
}
@@ -953,8 +962,7 @@
operating systems cannot provide proper notifications about the changes.
\note The serial port has to be open before trying to get the pinout
- signals; otherwise returns UnknownSignal and sets the NotOpenError error
- code.
+ signals; otherwise returns NoSignal and sets the NotOpenError error code.
\sa isDataTerminalReady(), isRequestToSend, setDataTerminalReady(),
setRequestToSend()
@@ -966,7 +974,7 @@
if (!isOpen()) {
setError(QSerialPort::NotOpenError);
qWarning("%s: device not open", Q_FUNC_INFO);
- return QSerialPort::UnknownSignal;
+ return QSerialPort::NoSignal;
}
return d->pinoutSignals();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialport-opensource-src-5.2.0-rc1/src/serialport/qserialport.h
new/qtserialport-opensource-src-5.2.0/src/serialport/qserialport.h
--- old/qtserialport-opensource-src-5.2.0-rc1/src/serialport/qserialport.h
2013-11-27 02:01:17.000000000 +0100
+++ new/qtserialport-opensource-src-5.2.0/src/serialport/qserialport.h
2013-12-08 18:09:55.000000000 +0100
@@ -47,10 +47,6 @@
#include <QtSerialPort/qserialportglobal.h>
-#ifndef QT_DEPRECATED_SINCE
-#define QT_DEPRECATED_SINCE(major, minor) 1
-#endif
-
QT_BEGIN_NAMESPACE
class QSerialPortInfo;
@@ -135,6 +131,16 @@
UnknownFlowControl = -1
};
+#if QT_DEPRECATED_SINCE(5, 2)
+#if defined _MSC_VER
+#pragma deprecated(UnknownBaud)
+#pragma deprecated(UnknownDataBits)
+#pragma deprecated(UnknownParity)
+#pragma deprecated(UnknownStopBits)
+#pragma deprecated(UnknownFlowControl)
+#endif
+#endif
+
enum PinoutSignal {
NoSignal = 0x00,
TransmittedDataSignal = 0x01,
@@ -146,8 +152,7 @@
RequestToSendSignal = 0x40,
ClearToSendSignal = 0x80,
SecondaryTransmittedDataSignal = 0x100,
- SecondaryReceivedDataSignal = 0x200,
- UnknownSignal = -1
+ SecondaryReceivedDataSignal = 0x200
};
Q_DECLARE_FLAGS(PinoutSignals, PinoutSignal)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialport-opensource-src-5.2.0-rc1/src/serialport/qserialport_symbian.cpp
new/qtserialport-opensource-src-5.2.0/src/serialport/qserialport_symbian.cpp
---
old/qtserialport-opensource-src-5.2.0-rc1/src/serialport/qserialport_symbian.cpp
2013-11-27 02:01:17.000000000 +0100
+++
new/qtserialport-opensource-src-5.2.0/src/serialport/qserialport_symbian.cpp
2013-12-08 18:09:55.000000000 +0100
@@ -433,7 +433,8 @@
dataBits = QSerialPort::Data8;
break;
default:
- dataBits = QSerialPort::UnknownDataBits;
+ qWarning("%s: Unexpected data bits settings", Q_FUNC_INFO);
+ dataBits = QSerialPort::Data8;
break;
}
@@ -455,7 +456,8 @@
parity = QSerialPort::SpaceParity;
break;
default:
- parity = QSerialPort::UnknownParity;
+ qWarning("%s: Unexpected parity settings", Q_FUNC_INFO);
+ parity = QSerialPort::NoParity;
break;
}
@@ -468,7 +470,8 @@
stopBits = QSerialPort::TwoStop;
break;
default:
- stopBits = QSerialPort::UnknownStopBits;
+ qWarning("%s: Unexpected stop bits settings", Q_FUNC_INFO);
+ stopBits = QSerialPort::OneStop;
break;
}
@@ -481,8 +484,10 @@
flow = QSerialPort::HardwareControl;
else if (currentSettings().iHandshake & KConfigFailDSR)
flow = QSerialPort::NoFlowControl;
- else
- flow = QSerialPort::UnknownFlowControl;
+ else {
+ qWarning("%s: Unexpected flow control settings", Q_FUNC_INFO);
+ flow = QSerialPort::NoFlowControl;
+ }
}
QSerialPort::SerialPortError QSerialPortPrivate::decodeSystemError() const
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialport-opensource-src-5.2.0-rc1/src/serialport/qserialport_unix.cpp
new/qtserialport-opensource-src-5.2.0/src/serialport/qserialport_unix.cpp
---
old/qtserialport-opensource-src-5.2.0-rc1/src/serialport/qserialport_unix.cpp
2013-11-27 02:01:17.000000000 +0100
+++ new/qtserialport-opensource-src-5.2.0/src/serialport/qserialport_unix.cpp
2013-12-08 18:09:55.000000000 +0100
@@ -305,7 +305,7 @@
if (::ioctl(descriptor, TIOCMGET, &arg) == -1) {
q->setError(decodeSystemError());
- return QSerialPort::UnknownSignal;
+ return QSerialPort::NoSignal;
}
QSerialPort::PinoutSignals ret = QSerialPort::NoSignal;
@@ -921,7 +921,8 @@
dataBits = QSerialPort::Data8;
break;
default:
- dataBits = QSerialPort::UnknownDataBits;
+ qWarning("%s: Unexpected data bits settings", Q_FUNC_INFO);
+ dataBits = QSerialPort::Data8;
break;
}
@@ -953,8 +954,10 @@
flow = QSerialPort::SoftwareControl;
else if ((currentTermios.c_cflag & CRTSCTS) && (!(currentTermios.c_iflag &
(IXON | IXOFF | IXANY))))
flow = QSerialPort::HardwareControl;
- else
- flow = QSerialPort::UnknownFlowControl;
+ else {
+ qWarning("%s: Unexpected flow control settings", Q_FUNC_INFO);
+ flow = QSerialPort::NoFlowControl;
+ }
}
QSerialPort::SerialPortError QSerialPortPrivate::decodeSystemError() const
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialport-opensource-src-5.2.0-rc1/src/serialport/qserialport_win.cpp
new/qtserialport-opensource-src-5.2.0/src/serialport/qserialport_win.cpp
---
old/qtserialport-opensource-src-5.2.0-rc1/src/serialport/qserialport_win.cpp
2013-11-27 02:01:17.000000000 +0100
+++ new/qtserialport-opensource-src-5.2.0/src/serialport/qserialport_win.cpp
2013-12-08 18:09:55.000000000 +0100
@@ -326,7 +326,7 @@
if (!::GetCommModemStatus(descriptor, &modemStat)) {
q->setError(decodeSystemError());
- return QSerialPort::UnknownSignal;
+ return QSerialPort::NoSignal;
}
QSerialPort::PinoutSignals ret = QSerialPort::NoSignal;
@@ -890,7 +890,8 @@
dataBits = QSerialPort::Data8;
break;
default:
- dataBits = QSerialPort::UnknownDataBits;
+ qWarning("%s: Unexpected data bits settings", Q_FUNC_INFO);
+ dataBits = QSerialPort::Data8;
break;
}
@@ -905,8 +906,10 @@
parity = QSerialPort::EvenParity;
else if ((currentDcb.Parity == ODDPARITY) && currentDcb.fParity)
parity = QSerialPort::OddParity;
- else
- parity = QSerialPort::UnknownParity;
+ else {
+ qWarning("%s: Unexpected parity settings", Q_FUNC_INFO);
+ parity = QSerialPort::NoParity;
+ }
// Detect stopbits.
switch (currentDcb.StopBits) {
@@ -920,7 +923,8 @@
stopBits = QSerialPort::TwoStop;
break;
default:
- stopBits = QSerialPort::UnknownStopBits;
+ qWarning("%s: Unexpected stop bits settings", Q_FUNC_INFO);
+ stopBits = QSerialPort::OneStop;
break;
}
@@ -934,8 +938,10 @@
} else if (currentDcb.fOutxCtsFlow && (currentDcb.fRtsControl ==
RTS_CONTROL_HANDSHAKE)
&& !currentDcb.fInX && !currentDcb.fOutX) {
flow = QSerialPort::HardwareControl;
- } else
- flow = QSerialPort::UnknownFlowControl;
+ } else {
+ qWarning("%s: Unexpected flow control settings", Q_FUNC_INFO);
+ flow = QSerialPort::NoFlowControl;
+ }
}
QSerialPort::SerialPortError QSerialPortPrivate::decodeSystemError() const
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialport-opensource-src-5.2.0-rc1/src/serialport/qserialportglobal.h
new/qtserialport-opensource-src-5.2.0/src/serialport/qserialportglobal.h
---
old/qtserialport-opensource-src-5.2.0-rc1/src/serialport/qserialportglobal.h
2013-11-27 02:01:17.000000000 +0100
+++ new/qtserialport-opensource-src-5.2.0/src/serialport/qserialportglobal.h
2013-12-08 18:09:55.000000000 +0100
@@ -59,6 +59,10 @@
#endif
// These macros have been available only since Qt 5.0
+#ifndef QT_DEPRECATED_SINCE
+#define QT_DEPRECATED_SINCE(major, minor) 1
+#endif
+
#ifndef Q_DECL_OVERRIDE
#define Q_DECL_OVERRIDE
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialport-opensource-src-5.2.0-rc1/src/serialport/qserialportinfo.cpp
new/qtserialport-opensource-src-5.2.0/src/serialport/qserialportinfo.cpp
---
old/qtserialport-opensource-src-5.2.0-rc1/src/serialport/qserialportinfo.cpp
2013-11-27 02:01:17.000000000 +0100
+++ new/qtserialport-opensource-src-5.2.0/src/serialport/qserialportinfo.cpp
2013-12-08 18:09:55.000000000 +0100
@@ -258,6 +258,7 @@
/*!
\fn bool QSerialPortInfo::isValid() const
+ \obsolete
Returns true if serial port is present on system;
otherwise returns false.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialport-opensource-src-5.2.0-rc1/src/serialport/qserialportinfo.h
new/qtserialport-opensource-src-5.2.0/src/serialport/qserialportinfo.h
--- old/qtserialport-opensource-src-5.2.0-rc1/src/serialport/qserialportinfo.h
2013-11-27 02:01:17.000000000 +0100
+++ new/qtserialport-opensource-src-5.2.0/src/serialport/qserialportinfo.h
2013-12-08 18:09:55.000000000 +0100
@@ -80,7 +80,9 @@
bool isNull() const;
bool isBusy() const;
- bool isValid() const;
+#if QT_DEPRECATED_SINCE(5, 2)
+ QT_DEPRECATED bool isValid() const;
+#endif
static QList<qint32> standardBaudRates();
static QList<QSerialPortInfo> availablePorts();
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
