Hello community,
here is the log from the commit of package libqt5-qtserialport for
openSUSE:13.1 checked in at 2013-10-04 13:53:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:13.1/libqt5-qtserialport (Old)
and /work/SRC/openSUSE:13.1/.libqt5-qtserialport.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtserialport"
Changes:
--------
--- /work/SRC/openSUSE:13.1/libqt5-qtserialport/libqt5-qtserialport.changes
2013-10-01 08:14:31.000000000 +0200
+++
/work/SRC/openSUSE:13.1/.libqt5-qtserialport.new/libqt5-qtserialport.changes
2013-10-04 13:53:36.000000000 +0200
@@ -1,0 +2,10 @@
+Thu Aug 29 20:43:44 UTC 2013 - [email protected]
+
+- Update to version 5.1.1:
+ * Bugfix release, please see
+ http://blog.qt.digia.com/blog/2013/08/28/qt-5-1-1-released/
+ http://qt.gitorious.org/qt/qtserialport/blobs/release/dist/changes-5.1.1
+ and http://qt-project.org/wiki/Qt511KnownIssues for known issues
+- Small spec cleanup
+
+-------------------------------------------------------------------
Old:
----
qtserialport-opensource-src-5.1.0.tar.xz
New:
----
qtserialport-opensource-src-5.1.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtserialport.spec ++++++
--- /var/tmp/diff_new_pack.4uY9Fu/_old 2013-10-04 13:53:36.000000000 +0200
+++ /var/tmp/diff_new_pack.4uY9Fu/_new 2013-10-04 13:53:36.000000000 +0200
@@ -19,20 +19,20 @@
%define libname libQt5SerialPort5
Name: libqt5-qtserialport
-BuildRequires: fdupes
-Version: 5.1.0
+Version: 5.1.1
Release: 0
-%define base_name libqt5
-%define real_version 5.1.0
-%define so_version 5.1.0
-%define tar_version qtserialport-opensource-src-%{real_version}
-BuildRequires: libqt5-qtbase-devel
-BuildRequires: xz
-Url: http://qt.digia.com
-Summary: Qt 5 Serial Port Addon
License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0
+Summary: Qt 5 Serial Port Addon
+Url: http://qt.digia.com
Group: Development/Libraries/X11
Source: %{tar_version}.tar.xz
+BuildRequires: fdupes
+%define base_name libqt5
+%define real_version 5.1.1
+%define so_version 5.1.1
+%define tar_version qtserialport-opensource-src-%{real_version}
+BuildRequires: libqt5-qtbase-devel >= %{version}
+BuildRequires: xz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -41,8 +41,6 @@
This package contains base tools, like string, xml, and network
handling.
-
-
%prep
%setup -q -n qtserialport-opensource-src-%{real_version}
@@ -59,8 +57,8 @@
%package -n libQt5SerialPort-devel
Summary: Qt Development Kit
Group: Development/Libraries/X11
-Requires: %libname = %version
-Requires: libqt5-qtbase-devel
+Requires: %libname = %{version}
+Requires: libqt5-qtbase-devel >= %{version}
%description -n libQt5SerialPort-devel
You need this package, if you want to compile programs with qtserialport.
@@ -68,8 +66,8 @@
%package -n libQt5SerialPort-private-headers-devel
Summary: Non-ABI stable experimental API
Group: Development/Libraries/C and C++
-Requires: libQt5SerialPort-devel = %version
-Requires: libqt5-qtbase-devel
+Requires: libQt5SerialPort-devel = %{version}
+Requires: libqt5-qtbase-devel >= %{version}
%description -n libQt5SerialPort-private-headers-devel
This package provides private headers of libqt5-qtserialport that are normally
@@ -82,21 +80,21 @@
%postun -n %libname -p /sbin/ldconfig
%build
-export PATH=%_libqt5_bindir:$PATH
+export PATH=%{_libqt5_bindir}:$PATH
%ifarch ppc64
- RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mminimal-toc"
+ RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
%endif
-export CXXFLAGS="$CXXFLAGS $RPM_OPT_FLAGS -DOPENSSL_LOAD_CONF"
-export CFLAGS="$CFLAGS $RPM_OPT_FLAGS -DOPENSSL_LOAD_CONF"
-export MAKEFLAGS="%{?jobs:-j %jobs}"
+export CXXFLAGS="$CXXFLAGS %{optflags} -DOPENSSL_LOAD_CONF"
+export CFLAGS="$CFLAGS %{optflags} -DOPENSSL_LOAD_CONF"
+export MAKEFLAGS="%{?_smp_mflags}"
qmake
make
%install
-make INSTALL_ROOT=$RPM_BUILD_ROOT install
+make INSTALL_ROOT=%{buildroot} install
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%files -n %libname
%defattr(-,root,root,755)
@@ -104,12 +102,12 @@
%files -n libQt5SerialPort-private-headers-devel
%defattr(-,root,root,755)
-%_libqt5_includedir/Qt*/%{so_version}
+%{_libqt5_includedir}/Qt*/%{so_version}
%files -n libQt5SerialPort-devel
%defattr(-,root,root,755)
-%exclude %_libqt5_includedir/Qt*/%{so_version}
-%_libqt5_includedir/Qt*
+%exclude %{_libqt5_includedir}/Qt*/%{so_version}
+%{_libqt5_includedir}/Qt*
%{_libqt5_libdir}/cmake/Qt5SerialPort
%{_libqt5_libdir}/libQt5SerialPort.la
%{_libqt5_libdir}/libQt5SerialPort.prl
++++++ qtserialport-opensource-src-5.1.0.tar.xz ->
qtserialport-opensource-src-5.1.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtserialport-opensource-src-5.1.0/.qmake.conf
new/qtserialport-opensource-src-5.1.1/.qmake.conf
--- old/qtserialport-opensource-src-5.1.0/.qmake.conf 2013-07-02
09:10:03.000000000 +0200
+++ new/qtserialport-opensource-src-5.1.1/.qmake.conf 2013-08-25
20:04:16.000000000 +0200
@@ -1,3 +1,3 @@
load(qt_build_config)
-MODULE_VERSION = 5.1.0
+MODULE_VERSION = 5.1.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtserialport-opensource-src-5.1.0/dist/changes-5.1.1
new/qtserialport-opensource-src-5.1.1/dist/changes-5.1.1
--- old/qtserialport-opensource-src-5.1.0/dist/changes-5.1.1 1970-01-01
01:00:00.000000000 +0100
+++ new/qtserialport-opensource-src-5.1.1/dist/changes-5.1.1 2013-08-25
20:04:16.000000000 +0200
@@ -0,0 +1,25 @@
+Qt 5.1.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.1.0.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+ http://qt-project.org/doc/qt-5.1/
+
+The Qt version 5.1 series is binary compatible with the 5.0.x series.
+Applications compiled for 5.0 will continue to run with 5.1.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+ http://bugreports.qt-project.org/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+
+****************************************************************************
+* General *
+****************************************************************************
+
+ - This release contains only minor code improvements.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialport-opensource-src-5.1.0/examples/serialport/enumerator/main.cpp
new/qtserialport-opensource-src-5.1.1/examples/serialport/enumerator/main.cpp
---
old/qtserialport-opensource-src-5.1.0/examples/serialport/enumerator/main.cpp
2013-07-02 09:10:03.000000000 +0200
+++
new/qtserialport-opensource-src-5.1.1/examples/serialport/enumerator/main.cpp
2013-08-25 20:04:16.000000000 +0200
@@ -62,7 +62,7 @@
+ QObject::tr("Description: ") + info.description() + "\n"
+ QObject::tr("Manufacturer: ") + info.manufacturer() +
"\n"
+ QObject::tr("Vendor Identifier: ") +
(info.hasVendorIdentifier() ? QString::number(info.vendorIdentifier(), 16) :
QString()) + "\n"
- + QObject::tr("Product Identifier: ") +
(info.hasProductIdentifier() ?QString::number(info.productIdentifier(), 16) :
QString()) + "\n"
+ + QObject::tr("Product Identifier: ") +
(info.hasProductIdentifier() ? QString::number(info.productIdentifier(), 16) :
QString()) + "\n"
+ QObject::tr("Busy: ") + (info.isBusy() ?
QObject::tr("Yes") : QObject::tr("No")) + "\n";
QLabel *label = new QLabel(s);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialport-opensource-src-5.1.0/include/QtSerialPort/5.1.0/QtSerialPort/private/qringbuffer_p.h
new/qtserialport-opensource-src-5.1.1/include/QtSerialPort/5.1.0/QtSerialPort/private/qringbuffer_p.h
---
old/qtserialport-opensource-src-5.1.0/include/QtSerialPort/5.1.0/QtSerialPort/private/qringbuffer_p.h
2013-07-02 09:10:03.000000000 +0200
+++
new/qtserialport-opensource-src-5.1.1/include/QtSerialPort/5.1.0/QtSerialPort/private/qringbuffer_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/serialport/qt4support/qringbuffer_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialport-opensource-src-5.1.0/include/QtSerialPort/5.1.0/QtSerialPort/private/qserialport_p.h
new/qtserialport-opensource-src-5.1.1/include/QtSerialPort/5.1.0/QtSerialPort/private/qserialport_p.h
---
old/qtserialport-opensource-src-5.1.0/include/QtSerialPort/5.1.0/QtSerialPort/private/qserialport_p.h
2013-07-02 09:10:03.000000000 +0200
+++
new/qtserialport-opensource-src-5.1.1/include/QtSerialPort/5.1.0/QtSerialPort/private/qserialport_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/serialport/qserialport_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialport-opensource-src-5.1.0/include/QtSerialPort/5.1.0/QtSerialPort/private/qserialport_symbian_p.h
new/qtserialport-opensource-src-5.1.1/include/QtSerialPort/5.1.0/QtSerialPort/private/qserialport_symbian_p.h
---
old/qtserialport-opensource-src-5.1.0/include/QtSerialPort/5.1.0/QtSerialPort/private/qserialport_symbian_p.h
2013-07-02 09:10:03.000000000 +0200
+++
new/qtserialport-opensource-src-5.1.1/include/QtSerialPort/5.1.0/QtSerialPort/private/qserialport_symbian_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/serialport/qserialport_symbian_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialport-opensource-src-5.1.0/include/QtSerialPort/5.1.0/QtSerialPort/private/qserialport_unix_p.h
new/qtserialport-opensource-src-5.1.1/include/QtSerialPort/5.1.0/QtSerialPort/private/qserialport_unix_p.h
---
old/qtserialport-opensource-src-5.1.0/include/QtSerialPort/5.1.0/QtSerialPort/private/qserialport_unix_p.h
2013-07-02 09:10:03.000000000 +0200
+++
new/qtserialport-opensource-src-5.1.1/include/QtSerialPort/5.1.0/QtSerialPort/private/qserialport_unix_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/serialport/qserialport_unix_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialport-opensource-src-5.1.0/include/QtSerialPort/5.1.0/QtSerialPort/private/qserialport_win_p.h
new/qtserialport-opensource-src-5.1.1/include/QtSerialPort/5.1.0/QtSerialPort/private/qserialport_win_p.h
---
old/qtserialport-opensource-src-5.1.0/include/QtSerialPort/5.1.0/QtSerialPort/private/qserialport_win_p.h
2013-07-02 09:10:03.000000000 +0200
+++
new/qtserialport-opensource-src-5.1.1/include/QtSerialPort/5.1.0/QtSerialPort/private/qserialport_win_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/serialport/qserialport_win_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialport-opensource-src-5.1.0/include/QtSerialPort/5.1.0/QtSerialPort/private/qserialportinfo_p.h
new/qtserialport-opensource-src-5.1.1/include/QtSerialPort/5.1.0/QtSerialPort/private/qserialportinfo_p.h
---
old/qtserialport-opensource-src-5.1.0/include/QtSerialPort/5.1.0/QtSerialPort/private/qserialportinfo_p.h
2013-07-02 09:10:03.000000000 +0200
+++
new/qtserialport-opensource-src-5.1.1/include/QtSerialPort/5.1.0/QtSerialPort/private/qserialportinfo_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/serialport/qserialportinfo_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialport-opensource-src-5.1.0/include/QtSerialPort/5.1.0/QtSerialPort/private/qttylocker_unix_p.h
new/qtserialport-opensource-src-5.1.1/include/QtSerialPort/5.1.0/QtSerialPort/private/qttylocker_unix_p.h
---
old/qtserialport-opensource-src-5.1.0/include/QtSerialPort/5.1.0/QtSerialPort/private/qttylocker_unix_p.h
2013-07-02 09:10:03.000000000 +0200
+++
new/qtserialport-opensource-src-5.1.1/include/QtSerialPort/5.1.0/QtSerialPort/private/qttylocker_unix_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/serialport/qttylocker_unix_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialport-opensource-src-5.1.0/include/QtSerialPort/5.1.0/QtSerialPort/private/qwineventnotifier_p.h
new/qtserialport-opensource-src-5.1.1/include/QtSerialPort/5.1.0/QtSerialPort/private/qwineventnotifier_p.h
---
old/qtserialport-opensource-src-5.1.0/include/QtSerialPort/5.1.0/QtSerialPort/private/qwineventnotifier_p.h
2013-07-02 09:10:03.000000000 +0200
+++
new/qtserialport-opensource-src-5.1.1/include/QtSerialPort/5.1.0/QtSerialPort/private/qwineventnotifier_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/serialport/qt4support/qwineventnotifier_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialport-opensource-src-5.1.0/include/QtSerialPort/5.1.1/QtSerialPort/private/qringbuffer_p.h
new/qtserialport-opensource-src-5.1.1/include/QtSerialPort/5.1.1/QtSerialPort/private/qringbuffer_p.h
---
old/qtserialport-opensource-src-5.1.0/include/QtSerialPort/5.1.1/QtSerialPort/private/qringbuffer_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtserialport-opensource-src-5.1.1/include/QtSerialPort/5.1.1/QtSerialPort/private/qringbuffer_p.h
2013-08-25 20:04:16.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/serialport/qt4support/qringbuffer_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialport-opensource-src-5.1.0/include/QtSerialPort/5.1.1/QtSerialPort/private/qserialport_p.h
new/qtserialport-opensource-src-5.1.1/include/QtSerialPort/5.1.1/QtSerialPort/private/qserialport_p.h
---
old/qtserialport-opensource-src-5.1.0/include/QtSerialPort/5.1.1/QtSerialPort/private/qserialport_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtserialport-opensource-src-5.1.1/include/QtSerialPort/5.1.1/QtSerialPort/private/qserialport_p.h
2013-08-25 20:04:16.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/serialport/qserialport_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialport-opensource-src-5.1.0/include/QtSerialPort/5.1.1/QtSerialPort/private/qserialport_symbian_p.h
new/qtserialport-opensource-src-5.1.1/include/QtSerialPort/5.1.1/QtSerialPort/private/qserialport_symbian_p.h
---
old/qtserialport-opensource-src-5.1.0/include/QtSerialPort/5.1.1/QtSerialPort/private/qserialport_symbian_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtserialport-opensource-src-5.1.1/include/QtSerialPort/5.1.1/QtSerialPort/private/qserialport_symbian_p.h
2013-08-25 20:04:16.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/serialport/qserialport_symbian_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialport-opensource-src-5.1.0/include/QtSerialPort/5.1.1/QtSerialPort/private/qserialport_unix_p.h
new/qtserialport-opensource-src-5.1.1/include/QtSerialPort/5.1.1/QtSerialPort/private/qserialport_unix_p.h
---
old/qtserialport-opensource-src-5.1.0/include/QtSerialPort/5.1.1/QtSerialPort/private/qserialport_unix_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtserialport-opensource-src-5.1.1/include/QtSerialPort/5.1.1/QtSerialPort/private/qserialport_unix_p.h
2013-08-25 20:04:16.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/serialport/qserialport_unix_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialport-opensource-src-5.1.0/include/QtSerialPort/5.1.1/QtSerialPort/private/qserialport_win_p.h
new/qtserialport-opensource-src-5.1.1/include/QtSerialPort/5.1.1/QtSerialPort/private/qserialport_win_p.h
---
old/qtserialport-opensource-src-5.1.0/include/QtSerialPort/5.1.1/QtSerialPort/private/qserialport_win_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtserialport-opensource-src-5.1.1/include/QtSerialPort/5.1.1/QtSerialPort/private/qserialport_win_p.h
2013-08-25 20:04:16.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/serialport/qserialport_win_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialport-opensource-src-5.1.0/include/QtSerialPort/5.1.1/QtSerialPort/private/qserialportinfo_p.h
new/qtserialport-opensource-src-5.1.1/include/QtSerialPort/5.1.1/QtSerialPort/private/qserialportinfo_p.h
---
old/qtserialport-opensource-src-5.1.0/include/QtSerialPort/5.1.1/QtSerialPort/private/qserialportinfo_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtserialport-opensource-src-5.1.1/include/QtSerialPort/5.1.1/QtSerialPort/private/qserialportinfo_p.h
2013-08-25 20:04:16.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/serialport/qserialportinfo_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialport-opensource-src-5.1.0/include/QtSerialPort/5.1.1/QtSerialPort/private/qttylocker_unix_p.h
new/qtserialport-opensource-src-5.1.1/include/QtSerialPort/5.1.1/QtSerialPort/private/qttylocker_unix_p.h
---
old/qtserialport-opensource-src-5.1.0/include/QtSerialPort/5.1.1/QtSerialPort/private/qttylocker_unix_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtserialport-opensource-src-5.1.1/include/QtSerialPort/5.1.1/QtSerialPort/private/qttylocker_unix_p.h
2013-08-25 20:04:16.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/serialport/qttylocker_unix_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialport-opensource-src-5.1.0/include/QtSerialPort/5.1.1/QtSerialPort/private/qwineventnotifier_p.h
new/qtserialport-opensource-src-5.1.1/include/QtSerialPort/5.1.1/QtSerialPort/private/qwineventnotifier_p.h
---
old/qtserialport-opensource-src-5.1.0/include/QtSerialPort/5.1.1/QtSerialPort/private/qwineventnotifier_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtserialport-opensource-src-5.1.1/include/QtSerialPort/5.1.1/QtSerialPort/private/qwineventnotifier_p.h
2013-08-25 20:04:16.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/serialport/qt4support/qwineventnotifier_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialport-opensource-src-5.1.0/include/QtSerialPort/qtserialportversion.h
new/qtserialport-opensource-src-5.1.1/include/QtSerialPort/qtserialportversion.h
---
old/qtserialport-opensource-src-5.1.0/include/QtSerialPort/qtserialportversion.h
2013-07-02 09:10:03.000000000 +0200
+++
new/qtserialport-opensource-src-5.1.1/include/QtSerialPort/qtserialportversion.h
2013-08-25 20:04:16.000000000 +0200
@@ -2,8 +2,8 @@
#ifndef QT_QTSERIALPORT_VERSION_H
#define QT_QTSERIALPORT_VERSION_H
-#define QTSERIALPORT_VERSION_STR "5.1.0"
+#define QTSERIALPORT_VERSION_STR "5.1.1"
-#define QTSERIALPORT_VERSION 0x050100
+#define QTSERIALPORT_VERSION 0x050101
#endif // QT_QTSERIALPORT_VERSION_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialport-opensource-src-5.1.0/src/serialport/qserialport.h
new/qtserialport-opensource-src-5.1.1/src/serialport/qserialport.h
--- old/qtserialport-opensource-src-5.1.0/src/serialport/qserialport.h
2013-07-02 09:10:03.000000000 +0200
+++ new/qtserialport-opensource-src-5.1.1/src/serialport/qserialport.h
2013-08-25 20:04:16.000000000 +0200
@@ -67,7 +67,8 @@
Q_PROPERTY(SerialPortError error READ error RESET clearError NOTIFY error)
Q_PROPERTY(bool settingsRestoredOnClose READ settingsRestoredOnClose WRITE
setSettingsRestoredOnClose NOTIFY settingsRestoredOnCloseChanged)
- Q_ENUMS( Directions Rate DataBits Parity StopBits FlowControl
PinoutSignals DataErrorPolicy SerialPortError )
+ Q_ENUMS(BaudRate DataBits Parity StopBits FlowControl DataErrorPolicy
SerialPortError)
+ Q_FLAGS(Directions PinoutSignals)
public:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialport-opensource-src-5.1.0/src/serialport/qserialport_unix.cpp
new/qtserialport-opensource-src-5.1.1/src/serialport/qserialport_unix.cpp
--- old/qtserialport-opensource-src-5.1.0/src/serialport/qserialport_unix.cpp
2013-07-02 09:10:03.000000000 +0200
+++ new/qtserialport-opensource-src-5.1.1/src/serialport/qserialport_unix.cpp
2013-08-25 20:04:16.000000000 +0200
@@ -429,7 +429,8 @@
bool timedOut = false;
if (!waitForReadOrWrite(&readyToRead, &readyToWrite, true,
!writeBuffer.isEmpty(),
timeoutValue(msecs, stopWatch.elapsed()),
&timedOut)) {
- q_ptr->setError(decodeSystemError());
+ if (!timedOut)
+ q_ptr->setError(decodeSystemError());
return false;
}
@@ -460,7 +461,8 @@
bool timedOut = false;
if (!waitForReadOrWrite(&readyToRead, &readyToWrite, true,
!writeBuffer.isEmpty(),
timeoutValue(msecs, stopWatch.elapsed()),
&timedOut)) {
- q_ptr->setError(decodeSystemError());
+ if (!timedOut)
+ q_ptr->setError(decodeSystemError());
return false;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialport-opensource-src-5.1.0/src/serialport/qserialport_win.cpp
new/qtserialport-opensource-src-5.1.1/src/serialport/qserialport_win.cpp
--- old/qtserialport-opensource-src-5.1.0/src/serialport/qserialport_win.cpp
2013-07-02 09:10:03.000000000 +0200
+++ new/qtserialport-opensource-src-5.1.1/src/serialport/qserialport_win.cpp
2013-08-25 20:04:16.000000000 +0200
@@ -476,7 +476,8 @@
if (!waitAnyEvent(timeoutValue(msecs, stopWatch.elapsed()), &timedOut,
&n) || !n) {
// This is occur timeout or another error
- q_ptr->setError(decodeSystemError());
+ if (!timedOut)
+ q_ptr->setError(decodeSystemError());
return false;
}
@@ -511,7 +512,8 @@
AbstractOverlappedEventNotifier *n = 0;
if (!waitAnyEvent(timeoutValue(msecs, stopWatch.elapsed()), &timedOut,
&n) || !n) {
- q_ptr->setError(decodeSystemError());
+ if (!timedOut)
+ q_ptr->setError(decodeSystemError());
return false;
}
@@ -960,7 +962,7 @@
return false;
}
- if (int(waitResult) > (handles.count() - 1))
+ if (waitResult >= DWORD(WAIT_OBJECT_0 + handles.count()))
return false;
HANDLE h = handles.at(waitResult - WAIT_OBJECT_0);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialport-opensource-src-5.1.0/src/serialport/qserialportinfo.cpp
new/qtserialport-opensource-src-5.1.1/src/serialport/qserialportinfo.cpp
--- old/qtserialport-opensource-src-5.1.0/src/serialport/qserialportinfo.cpp
2013-07-02 09:10:03.000000000 +0200
+++ new/qtserialport-opensource-src-5.1.1/src/serialport/qserialportinfo.cpp
2013-08-25 20:04:16.000000000 +0200
@@ -146,6 +146,8 @@
/*!
Returns the name of the serial port.
+
+ \sa systemLocation()
*/
QString QSerialPortInfo::portName() const
{
@@ -155,6 +157,8 @@
/*!
Returns the system location of the serial port.
+
+ \sa portName()
*/
QString QSerialPortInfo::systemLocation() const
{
@@ -165,6 +169,8 @@
/*!
Returns the description string of the serial port,
if available; otherwise returns an empty string.
+
+ \sa manufacturer()
*/
QString QSerialPortInfo::description() const
{
@@ -175,6 +181,8 @@
/*!
Returns the manufacturer string of the serial port,
if available; otherwise returns an empty string.
+
+ \sa description()
*/
QString QSerialPortInfo::manufacturer() const
{
@@ -185,6 +193,8 @@
/*!
Returns the 16-bit vendor number for the serial port, if available;
otherwise returns zero.
+
+ \sa hasVendorIdentifier(), productIdentifier(), hasProductIdentifier()
*/
quint16 QSerialPortInfo::vendorIdentifier() const
{
@@ -195,6 +205,8 @@
/*!
Returns the 16-bit product number for the serial port, if available;
otherwise returns zero.
+
+ \sa hasProductIdentifier(), vendorIdentifier(), hasVendorIdentifier()
*/
quint16 QSerialPortInfo::productIdentifier() const
{
@@ -205,6 +217,8 @@
/*!
Returns true if there is a valid 16-bit vendor number present; otherwise
returns false.
+
+ \sa vendorIdentifier(), productIdentifier(), hasProductIdentifier()
*/
bool QSerialPortInfo::hasVendorIdentifier() const
{
@@ -215,6 +229,8 @@
/*!
Returns true if there is a valid 16-bit product number present; otherwise
returns false.
+
+ \sa productIdentifier(), vendorIdentifier(), hasVendorIdentifier()
*/
bool QSerialPortInfo::hasProductIdentifier() const
{
@@ -227,6 +243,8 @@
Returns whether this QSerialPortInfo object holds a
serial port definition.
+
+ \sa isBusy(), isValid()
*/
/*!
@@ -234,6 +252,8 @@
Returns true if serial port is busy;
otherwise returns false.
+
+ \sa isNull(), isValid()
*/
/*!
@@ -241,6 +261,8 @@
Returns true if serial port is present on system;
otherwise returns false.
+
+ \sa isNull(), isBusy()
*/
/*!
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialport-opensource-src-5.1.0/src/serialport/qserialportinfo_mac.cpp
new/qtserialport-opensource-src-5.1.1/src/serialport/qserialportinfo_mac.cpp
---
old/qtserialport-opensource-src-5.1.0/src/serialport/qserialportinfo_mac.cpp
2013-07-02 09:10:03.000000000 +0200
+++
new/qtserialport-opensource-src-5.1.1/src/serialport/qserialportinfo_mac.cpp
2013-08-25 20:04:16.000000000 +0200
@@ -59,12 +59,11 @@
QT_BEGIN_NAMESPACE
-enum { MATCHING_PROPERTIES_COUNT = 6 };
-
QList<QSerialPortInfo> QSerialPortInfo::availablePorts()
{
QList<QSerialPortInfo> serialPortInfoList;
+ static const int propertyCount = 6;
int matchingPropertiesCounter = 0;
@@ -185,7 +184,7 @@
}
// If all matching properties is found, then force break loop.
- if (matchingPropertiesCounter == MATCHING_PROPERTIES_COUNT)
+ if (matchingPropertiesCounter == propertyCount)
break;
kr = ::IORegistryEntryGetParentEntry(entry, kIOServicePlane,
&entry);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialport-opensource-src-5.1.0/src/serialport/qserialportinfo_unix.cpp
new/qtserialport-opensource-src-5.1.1/src/serialport/qserialportinfo_unix.cpp
---
old/qtserialport-opensource-src-5.1.0/src/serialport/qserialportinfo_unix.cpp
2013-07-02 09:10:03.000000000 +0200
+++
new/qtserialport-opensource-src-5.1.1/src/serialport/qserialportinfo_unix.cpp
2013-08-25 20:04:16.000000000 +0200
@@ -77,6 +77,7 @@
<< QLatin1String("ttyACM*") // CDC_ACM converters (i.e. Mobile Phones).
<< QLatin1String("ttyGS*") // Gadget serial device (i.e. Mobile Phones
with gadget serial driver).
<< QLatin1String("ttyMI*") // MOXA pci/serial converters.
+ << QLatin1String("ttymxc*") // Motorola IMX serial ports (i.e. Freescale
i.MX).
<< QLatin1String("ttyAMA*") // AMBA serial device for embedded platform
on ARM (i.e. Raspberry Pi).
<< QLatin1String("rfcomm*") // Bluetooth serial device.
<< QLatin1String("ircomm*"); // IrDA serial device.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialport-opensource-src-5.1.0/src/serialport/qserialportinfo_win.cpp
new/qtserialport-opensource-src-5.1.1/src/serialport/qserialportinfo_win.cpp
---
old/qtserialport-opensource-src-5.1.0/src/serialport/qserialportinfo_win.cpp
2013-07-02 09:10:03.000000000 +0200
+++
new/qtserialport-opensource-src-5.1.1/src/serialport/qserialportinfo_win.cpp
2013-08-25 20:04:16.000000000 +0200
@@ -142,9 +142,12 @@
QList<QSerialPortInfo> QSerialPortInfo::availablePorts()
{
- static const QString vendorIdentifierPrefix(QLatin1String("VID_"));
+ static const QString usbVendorIdentifierPrefix(QLatin1String("VID_"));
+ static const QString usbProductIdentifierPrefix(QLatin1String("PID_"));
+ static const QString pciVendorIdentifierPrefix(QLatin1String("VEN_"));
+ static const QString pciDeviceIdentifierPrefix(QLatin1String("DEV_"));
+
static const int vendorIdentifierSize = 4;
- static const QString productIdentifierPrefix(QLatin1String("PID_"));
static const int productIdentifierSize = 4;
QList<QSerialPortInfo> serialPortInfoList;
@@ -176,15 +179,27 @@
s = deviceRegistryProperty(deviceInfoSet, &deviceInfoData,
SPDRP_HARDWAREID).toStringList().first().toUpper();
- int index = s.indexOf(vendorIdentifierPrefix);
- if (index != -1)
- serialPortInfo.d_ptr->vendorIdentifier = s.mid(index +
vendorIdentifierPrefix.size(), vendorIdentifierSize)
-
.toInt(&serialPortInfo.d_ptr->hasVendorIdentifier, 16);
-
- index = s.indexOf(productIdentifierPrefix);
- if (index != -1)
- serialPortInfo.d_ptr->productIdentifier = s.mid(index +
productIdentifierPrefix.size(), productIdentifierSize)
-
.toInt(&serialPortInfo.d_ptr->hasProductIdentifier, 16);
+ int index = s.indexOf(usbVendorIdentifierPrefix);
+ if (index != -1) {
+ serialPortInfo.d_ptr->vendorIdentifier = s.mid(index +
usbVendorIdentifierPrefix.size(), vendorIdentifierSize)
+ .toInt(&serialPortInfo.d_ptr->hasVendorIdentifier, 16);
+ } else {
+ index = s.indexOf(pciVendorIdentifierPrefix);
+ if (index != -1)
+ serialPortInfo.d_ptr->vendorIdentifier = s.mid(index +
pciVendorIdentifierPrefix.size(), vendorIdentifierSize)
+ .toInt(&serialPortInfo.d_ptr->hasVendorIdentifier,
16);
+ }
+
+ index = s.indexOf(usbProductIdentifierPrefix);
+ if (index != -1) {
+ serialPortInfo.d_ptr->productIdentifier = s.mid(index +
usbProductIdentifierPrefix.size(), productIdentifierSize)
+ .toInt(&serialPortInfo.d_ptr->hasProductIdentifier,
16);
+ } else {
+ index = s.indexOf(pciDeviceIdentifierPrefix);
+ if (index != -1)
+ serialPortInfo.d_ptr->productIdentifier = s.mid(index +
pciDeviceIdentifierPrefix.size(), productIdentifierSize)
+
.toInt(&serialPortInfo.d_ptr->hasProductIdentifier, 16);
+ }
serialPortInfoList.append(serialPortInfo);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialport-opensource-src-5.1.0/src/serialport/qt4support/install-helper.pri
new/qtserialport-opensource-src-5.1.1/src/serialport/qt4support/install-helper.pri
---
old/qtserialport-opensource-src-5.1.0/src/serialport/qt4support/install-helper.pri
2013-07-02 09:10:03.000000000 +0200
+++
new/qtserialport-opensource-src-5.1.1/src/serialport/qt4support/install-helper.pri
2013-08-25 20:04:16.000000000 +0200
@@ -24,7 +24,7 @@
\"$$QTSERIALPORT_PROJECT_INCLUDEDIR/QSerialPortInfo\"
target_headers.files = $$PUBLIC_HEADERS
-target_headers.path = $$[QT_INSTALL_PREFIX]/include/QtSerialPort
+target_headers.path = $$[QT_INSTALL_HEADERS]/QtSerialPort
INSTALLS += target_headers
mkspecs_features.files =
$$QTSERIALPORT_PROJECT_ROOT/src/serialport/qt4support/serialport.prf
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtserialport-opensource-src-5.1.0/src/serialport/qt4support/serialport.prf
new/qtserialport-opensource-src-5.1.1/src/serialport/qt4support/serialport.prf
---
old/qtserialport-opensource-src-5.1.0/src/serialport/qt4support/serialport.prf
2013-07-02 09:10:03.000000000 +0200
+++
new/qtserialport-opensource-src-5.1.1/src/serialport/qt4support/serialport.prf
2013-08-25 20:04:16.000000000 +0200
@@ -5,7 +5,7 @@
QMAKE_INCDIR += $$QTSERIALPORT_BUILD_ROOT/include
$$QTSERIALPORT_BUILD_ROOT/include/QtSerialPort
QTSERIALPORT_BUILD_SUBDIR = src/serialport
- win32 {
+ debug_and_release_target {
CONFIG(debug, debug|release) {
QTSERIALPORT_BUILD_SUBDIR = $$QTSERIALPORT_BUILD_SUBDIR/debug
} else {
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
