Hello community,
here is the log from the commit of package libqt5-qtwebsockets for
openSUSE:Factory checked in at 2018-10-01 08:13:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtwebsockets (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtwebsockets.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtwebsockets"
Mon Oct 1 08:13:07 2018 rev:26 rq:637857 version:5.11.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtwebsockets/libqt5-qtwebsockets.changes
2018-06-26 10:32:52.528822980 +0200
+++
/work/SRC/openSUSE:Factory/.libqt5-qtwebsockets.new/libqt5-qtwebsockets.changes
2018-10-01 08:13:30.634118514 +0200
@@ -1,0 +2,8 @@
+Fri Sep 21 07:59:59 UTC 2018 - [email protected]
+
+- Update to 5.11.2
+ * New bugfix release
+ * For more details please see:
+ *
http://code.qt.io/cgit/qt/qtwebsockets.git/plain/dist/changes-5.11.2/?h=v5.11.2
+
+-------------------------------------------------------------------
Old:
----
qtwebsockets-everywhere-src-5.11.1.tar.xz
New:
----
qtwebsockets-everywhere-src-5.11.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtwebsockets.spec ++++++
--- /var/tmp/diff_new_pack.cqy6Vp/_old 2018-10-01 08:13:32.042117605 +0200
+++ /var/tmp/diff_new_pack.cqy6Vp/_new 2018-10-01 08:13:32.050117601 +0200
@@ -21,16 +21,16 @@
%define libname libQt5WebSockets5
Name: libqt5-qtwebsockets
-Version: 5.11.1
+Version: 5.11.2
Release: 0
Summary: Qt 5 WebSockets Library
License: LGPL-2.1-with-Qt-Company-Qt-exception-1.1 or LGPL-3.0-only
Group: Development/Libraries/X11
Url: https://www.qt.io
%define base_name libqt5
-%define real_version 5.11.1
-%define so_version 5.11.1
-%define tar_version qtwebsockets-everywhere-src-5.11.1
+%define real_version 5.11.2
+%define so_version 5.11.2
+%define tar_version qtwebsockets-everywhere-src-5.11.2
Source:
https://download.qt.io/official_releases/qt/5.11/%{real_version}/submodules/%{tar_version}.tar.xz
Source1: baselibs.conf
BuildRequires: libQt5Core-private-headers-devel >= %{version}
++++++ qtwebsockets-everywhere-src-5.11.1.tar.xz ->
qtwebsockets-everywhere-src-5.11.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-everywhere-src-5.11.1/.QT-FOR-AUTOMATION-LICENSE-AGREEMENT
new/qtwebsockets-everywhere-src-5.11.2/.QT-FOR-AUTOMATION-LICENSE-AGREEMENT
--- old/qtwebsockets-everywhere-src-5.11.1/.QT-FOR-AUTOMATION-LICENSE-AGREEMENT
2018-06-18 09:47:03.000000000 +0200
+++ new/qtwebsockets-everywhere-src-5.11.2/.QT-FOR-AUTOMATION-LICENSE-AGREEMENT
2018-09-14 18:37:31.000000000 +0200
@@ -809,3 +809,4 @@
include, but are not limited to:
- No parts of the Licensed Software other than Redistributables are licensed to
the Licensee under this Agreement.
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-everywhere-src-5.11.1/.QT-INDIE-LICENSE-AGREEMENT
new/qtwebsockets-everywhere-src-5.11.2/.QT-INDIE-LICENSE-AGREEMENT
--- old/qtwebsockets-everywhere-src-5.11.1/.QT-INDIE-LICENSE-AGREEMENT
2018-06-18 09:47:03.000000000 +0200
+++ new/qtwebsockets-everywhere-src-5.11.2/.QT-INDIE-LICENSE-AGREEMENT
1970-01-01 01:00:00.000000000 +0100
@@ -1,265 +0,0 @@
-Qt INDIE LICENSE AGREEMENT
-Agreement version 3.2
-
-This Qt Indie License Agreement ("Agreement") is a legal agreement between The
Qt Company Ltd ("The Qt Company") with its registered office at Valimotie 21,
FI-00380 Helsinki, Finland, and you (either an individual or a legal entity)
("You" or "Licensee" as applicable) for the Licensed Software (as defined
below).
-
-Please, read these license terms through carefully. By selecting "I accept the
Agreement ", You are deemed to accept these license terms and to commit
Yourself to observing them. When representing a legal entity, You should ensure
Your due authorization to approve these terms before You select "I accept the
Agreement". Otherwise, we regard You as personally responsible for compliance
with this Agreement.
-
-
-1. DEFINITIONS
-
-"Affiliate" of a Party shall mean an entity (i) which is directly or
indirectly controlling such Party; (ii) which is under the same direct or
indirect ownership or control as such Party; or (iii) which is directly or
indirectly owned or controlled by such Party. For these purposes, an entity
shall be treated as being controlled by another if that other entity has fifty
percent (50 %) or more of the votes in such entity, is able to direct its
affairs and/or to control the composition of its board of directors or
equivalent body.
-
-"Applications" shall mean Licensee's software products created using the
Licensed Software which may include portions of the Licensed Software.
-
-"Deployment Platforms" shall mean those operating systems in which the
Licensed Software can be distributed on according to the terms and conditions
of this Agreement, especially Section 5.2.
-
-"Development Platforms" shall mean those operating systems in which the
Licensed Software can be used only for designing, developing and testing
Applications, but not distributed in any form or used for any other purpose.
-
-"Designated User(s)" shall mean the employee(s) of Licensee acting within the
scope of their employment or Licensee's consultant(s) or contractor(s) acting
within the scope of their services for Licensee and on behalf of Licensee.
-
-"Evaluation Term" shall mean the period of thirty (30) days from the later of
(a) the Effective Date; or (b) the date the Licensed Software was initially
delivered to Licensee by The Qt Company. If no specific Effective Date is set
forth in the Agreement, the Effective Date shall be deemed to be the date the
Licensed Software was initially delivered to Licensee.
-
-"Usage Term" shall mean a time period that You have selected and paid for the
usage of the Licensed Software, calculated from either (i) the end of the
Evaluation Term, or (ii) from the purchase of the Usage Term, or (iii) from end
of the previous Usage Term, as applicable.
-
-"License Certificate" shall mean the document accompanying the Licensed
Software which specifies the modules which are licensed under the Agreement,
Development Platforms, Deployment Platforms and Designated Users.
-
-"Licensed Software" shall mean the computer software, "online" or electronic
documentation, associated media and printed materials, including the source
code, example programs and the documentation delivered by The Qt Company to
Licensee in conjunction with this Agreement. Licensed Software does not include
Third Party Software (as defined in Section 7).
-
-"Modified Software" shall mean modifications made to the Licensed Software by
Licensee.
-
-"Nokia" shall mean Nokia Corporation, a corporation incorporated under the
laws of Finland, having its registered office at PO box 226, 00045 Nokia Group,
Finland (visiting address Karakaari 7, 02610 Espoo, Finland) and registered
with the Finnish Trade Register under business ID 0112038-9 and acting on
behalf of its respective Affiliates.
-
-"Online Services" shall mean any services or access to systems provided by The
Qt Company to the Licensee over Internet in conjunction with the Licensed
Software or for the purpose of use by the Licensee of the Licensed Software or
Support. Using some of the Online Services may be subject to additional fees.
-
-"Party or Parties" shall mean Licensee and/or The Qt Company.
-
-"Redistributables" shall mean the portions of the Licensed Software set forth
in Appendix 1, Section 1 that may be distributed with or as part of
Applications in object code form.
-
-"Subscription" shall mean all the software and services that You have ordered
and paid as a bundled subscription package from The Qt Company via qt.The Qt
Company.com
-
-"Support" shall mean standard developer support that is provided by The Qt
Company to assist eligible Designated Users in using the Licensed Software in
accordance with its established standard support procedures.
-
-"Updates" shall mean a release or version of the Licensed Software containing
enhancements, new features, bug fixes, error corrections and other changes that
are generally made available to users of the Licensed Software that have
contracted for maintenance and support.
-
-
-2. OWNERSHIP
-
-The Licensed Software is protected by copyright laws and international
copyright treaties, as well as other intellectual property laws and treaties.
The Licensed Software is licensed, not sold.
-
-To the extent Licensee submits bug fixes or error corrections, including
information related thereto, Licensee hereby grants The Qt Company a
sublicensable, irrevocable, perpetual, worldwide, non-exclusive, royalty-free
and fully paid-up copyright and trade secret license to reproduce, adapt,
translate, modify, and prepare derivative works of, publicly display, publicly
perform, sublicense, make available and distribute error corrections and bug
fixes, including derivative works thereof. All The Qt Company's and/or its
licensors' trademarks, service marks, trade names, logos or other words or
symbols are and shall remain the exclusive property of The Qt Company or its
licensors respectively.
-
-
-3. MODULES
-
-Some of the files in the Licensed Software have been grouped into modules.
These files contain specific notices defining the module of which they are a
part. The modules licensed to Licensee are specified in the License Certificate
accompanying the Licensed Software. The terms of the License Certificate are
considered part of the Agreement. In the event of inconsistency or conflict
between the language of this Agreement and the License Certificate, the
provisions of this Agreement shall govern.
-
-
-4. VALIDITY OF THE AGREEMENT
-
-By installing, copying, or otherwise using the Licensed Software, Licensee
agrees to be bound by the terms of this Agreement. If Licensee does not agree
to the terms of this Agreement, Licensee should not install, copy, or otherwise
use the Licensed Software. In addition, by installing, copying, or otherwise
using any Updates or other components of the Licensed Software that Licensee
receives separately as part of the Licensed Software, Licensee agrees to be
bound by any additional license terms that accompany such Updates, if any. If
Licensee does not agree to the additional license terms that accompany such
Updates, Licensee should not install, copy, or otherwise use such Updates.
-
-Upon Licensee's acceptance of the terms and conditions of this Agreement, The
Qt Company grants Licensee the right to use the Licensed Software in the manner
provided below.
-
-
-5. LICENSES FOR (I) EVALUATION TERM AND (II) USAGE TERM
-
-GENERAL:
-
-Licensee is hereby granted a free of charge limited thirty (30) days
evaluation license for the Evaluation Term as described in Section 5.1 below.
-
-After Evaluation Term, Licensee may purchase additional license(s) for Usage
Term, as described in Section 5.2 below, subject to The Qt Company's payment
terms and conditions applicable at the time of purchase. In addition, Licensee
may purchase license(s) for the Usage Term without such an Evaluation Term.
-
-
-(I) LICENSE FOR EVALUATION TERM
-
-5.1 Evaluation license granted during the Evaluation Term
-
-5.1.1 Using and Copying
-
-The Qt Company grants to Licensee a non-exclusive, non-transferable,
time-limited license to use and copy the Licensed Software for sole purpose of
evaluating the Licensed Software during the Evaluation Term.
-
-Licensee may install copies of the Licensed Software on an unlimited number of
computers provided that (a) if an individual, only such individual; or (b) if a
legal entity only its employees; use the Licensed Software for the authorized
purposes.
-
-5.1.2 No Distribution or Modifications
-
-Licensee may not disclose, modify, sell, market, commercialize, distribute,
loan, rent, lease, or license the Licensed Software or any copy of it or use
the Licensed Software for any purpose that is not expressly granted in this
Section 5.1. Licensee may not alter or remove any details of ownership,
copyright, trademark or other property right connected with the Licensed
Software. Licensee may not distribute any software statically or dynamically
linked with the Licensed Software.
-
-5.1.3 No Technical Support
-
-The Qt Company has no obligation to furnish Licensee with any technical
support whatsoever. Any such support is subject to separate agreement between
the Parties.
-
-5.1.4 Further Requirements
-
-It is expressly acknowledged and understood by Licensee, that Licensee is
strictly prohibited from using or licensing Licensed Software for creation of
mobile phones or tablet computers targeted for consumer end users. However,
creation of Applications for mobile phones or tablet computers is allowed under
this Agreement.
-
-Notwithstanding anything contrary to this Agreement, it is expressly
acknowledged and understood by Licensee, that Nokia shall hereby be named as a
third party beneficiary under this Agreement with respect to this Section
5.1.4. Therefore, Nokia shall have the same rights as The Qt Company under this
Agreement with respect to this Section 5.1.4, and shall be entitled to exercise
such rights independent from The Qt Company.
-
-
-(II) LICENSE FOR USAGE TERM
-
-5.2 Licenses granted during the Usage Term
-
-5.2.1 Using, Modifying and Copying
-
-The Qt Company grants to Licensee a non-exclusive, non-transferable, limited
term license to use and copy the Licensed Software for Designated Users
specified in the License Certificate for the sole purposes of:
-(i) designing, developing, and testing Application(s); and
-(ii) compiling the Licensed Software into object code.
-
-Licensee may install copies of the Licensed Software on an unlimited number of
computers provided that only the Designated Users use the Licensed Software.
Licensee may at any time designate another Designated User to replace a
then-current Designated User by notifying The Qt Company, provided that a) the
then-current Designated User has not been designated as a replacement during
the last six (6) months; and b) there is no more than the specified number of
Designated Users at any given time.
-
-5.2.2 Limited Redistribution
-
-a) The Qt Company grants Licensee a non-exclusive, royalty-free right to
reproduce and distribute the object code form of Redistributables (listed in
Appendix 1, Section 1) for execution on the specified Deployment Platforms as
defined in License Certificate, excluding the Joint Hardware and Software
Distribution as defined in b) below. Copies of Redistributables may only be
distributed with and for the sole purpose of executing Applications permitted
under this Agreement that Licensee has created using the Licensed Software.
Under no circumstances may any copies of Redistributables be distributed
separately. This Agreement does not give Licensee any rights to distribute any
of the parts of the Licensed Software listed in Appendix 1, Section 2, neither
as a whole nor as parts or snippets of code.
-
-b) Licensee may not distribute, transfer, assign or otherwise dispose of
Applications and/or Redistributables, in binary/compiled form, or in any other
form, if such action is part of a Joint Software and Hardware Distribution. A
Joint Hardware and Software Distribution shall be defined as either:
-(i) distribution of a hardware device where, in its final end user
configuration, the main user interface or substantial functionality of the
device is provided by Application(s) created by Licensee or others, using
Licensed Software or Licensed Software based software product, and depends on
the Licensed Software or an open source version of Qt or any Qt based software
product; or
-(ii) distribution of the Licensed Software with a device designed to
facilitate the installation of the Licensed Software onto the same device where
the main user interface or substantial functionality of such device is provided
by Application(s) created by Licensee or others, using the Licensed Software,
and depends on the Licensed Software.
-
-c) Licensee may only distribute the Applications via Public Application Stores
such as Google Play, Windows Store and Apple AppStore ("Public Application
Stores").
-
-5.2.3 Revenue Limitation
-
-Licensee hereby explicitly warrants that the total aggregate amount of revenue
that the Licensee and its Affiliates generate does not exceed one hundred
thousand euros (100.000 €) per calendar year ("Revenue Limitation"). If the
revenue of the Licensee and its Affiliates exceeds the Revenue Limitation,
Licensee´s Subscription shall be upgraded to Professional or other commercial
license of Licensed Software that does not contain Revenue Limitation. In such
case Licensee shall be obliged to pay to The Qt Company all applicable license
fees pursuant to applicable commercial license calculated from the date that
Licensee exceeded the Revenue Limitation. Licensee shall be obliged to
immediately notify The Qt Company in writing, in accordance with Section 14.8
of this Agreement, in case Licensee would exceed the Revenue Limitation. If
Licensee fails to notify The Qt Company about exceeding the Revenue Limitation
within thirty (30) days from the date it took place, this Agreement and
Licensee's right to use the Licensed Software shall terminate forthwith.
-
-5.2.4 Further Requirements
-
-It is expressly acknowledged and understood by Licensee, that Licensee is
strictly prohibited from using or licensing Licensed Software for creation of
mobile phones or tablet computers targeted for consumer end users.
-
-The aforementioned shall not prohibit Licensee from using Licensed Software
for the purpose of creating Applications for any devices, including mobile
phones and tablet computers. Notwithstanding anything contrary to this
Agreement, it is expressly acknowledged and understood by Licensee, that Nokia
shall hereby be named as a third party beneficiary under this Agreement with
respect to this Section 5.2.3. Therefore, Nokia shall have the same rights as
The Qt Company under this Agreement with respect to this Section 5.2.3, and
shall be entitled to exercise such rights independent from The Qt Company.
-
-The licenses granted in this Section 5.2 by The Qt Company to Licensee are
subject to Licensee's compliance with Section 8 of this Agreement.
-
-
-6. VERIFICATION
-
-The Qt Company or a certified auditor on The Qt Company's behalf, may, upon
its reasonable request and at its expense, audit Licensee with respect to the
use of the Licensed Software. Such audit may be conducted by mail, electronic
means or through an in-person visit to Licensee's place of business. Any such
in-person audit shall be conducted during regular business hours at Licensee's
facilities and shall not unreasonably interfere with Licensee's business
activities. The Qt Company will not remove, copy, or redistribute any
electronic material during the course of an audit. If an audit reveals that
Licensee is using the Licensed Software in a way that is in material violation
of the terms of the Agreement, then Licensee shall pay The Qt Company's
reasonable costs of conducting the audit. In the case of a material violation,
Licensee agrees to pay The Qt Company any amounts owing that are attributable
to the unauthorized use. Alternatively, The Qt Company reserves the right, at
The Qt Company's sole option, to terminate the licenses for the Licensed
Software.
-
-
-7. THIRD PARTY SOFTWARE
-
-The Licensed Software may provide links to third party libraries or code
(collectively "Third Party Software") to implement various functions. Third
Party Software does not comprise part of the Licensed Software. In some cases,
access to Third Party Software may be included along with the Licensed Software
delivery as a convenience for development and testing only. Such source code
and libraries may be listed in the ".../src/3rdparty" source tree delivered
with the Licensed Software or documented in the Licensed Software where the
Third Party Software is used, as may be amended from time to time, do not
comprise the Licensed Software. Licensee acknowledges (i) that some part of
Third Party Software may require additional licensing of copyright and patents
from the owners of such, and (ii) that distribution of any of the Licensed
Software referencing any portion of a Third Party Software may require
appropriate licensing from such third parties.
-
-
-8. CONDITIONS FOR CREATING APPLICATIONS
-
-The licenses granted in this Agreement for Licensee to create, modify and
distribute Applications is subject to all of the following conditions: (i) all
copies of the Applications Licensee creates must bear a valid copyright notice
either Licensee's own or the copyright notice that appears on the Licensed
Software; (ii) Licensee may not remove or alter any copyright, trademark or
other proprietary rights notice contained in any portion of the Licensed
Software including but not limited to the About Boxes; (iii) Licensee will
indemnify and hold The Qt Company, its Affiliates, contractors, and its
suppliers, harmless from and against any claims or liabilities arising out of
the use, reproduction or distribution of Applications; (iv) Applications must
be developed using a licensed, registered copy of the Licensed Software; (v)
Applications must add primary and substantial functionality to the Licensed
Software; (vi) Applications may not pass on functionality which in any way
makes it possible for others to create software with the Licensed Software;
however Licensee may use the Licensed Software's scripting and QML ("Qt Quick")
functionality solely in order to enable scripting, themes and styles that
augment the functionality and appearance of the Application(s) without adding
primary and substantial functionality to the Application(s); (vii) Licensee may
not create Modified Software or break the source or binary compatibility with
the Licensed Software. Modified Software includes, but is not limited to,
changing the functionality or application programming interfaces ("API") by
adding, changing or deleting any variable, method, or class signature in the
Licensed Software, the inter-process QCop specification, and/or any
inter-process protocols, services or standards in the Licensed Software
libraries; (viii) Applications may not compete with the Licensed Software; (ix)
Licensee may not use The Qt Company's or any of its suppliers' names, logos, or
trademarks to market Applications, except to state that Licensee's
Application(s) was developed using the Licensed Software; (x) each Designated
User creating the Application(s) needs to have a separate license for the
Licensed Software.
-
-
-9. PRE-RELEASE CODE
-
-The Licensed Software may contain pre-release code and functionality marked or
otherwise stated as "Technology Preview", "Alpha", "Beta" or similar. Such
pre-release code may be present in order to provide experimental support for
new platforms or preliminary version of new functionality. The pre-release code
is not at the level of performance and compatibility of a final, generally
available, product offering. The pre- release parts of the Licensed Software
may not operate correctly and may be substantially modified prior to the first
commercial product release, if any. The Qt Company is under no obligation to
make pre-release code commercially available, or provide any Support or Updates
relating thereto. The pre-release code must not be used for commercial purposes
or in a live operating environment where it may be relied upon to perform in
the same manner as a commercially released product or with data that has not
been sufficiently backed up.
-
-
-10. LIMITED WARRANTY AND WARRANTY DISCLAIMER
-
-The Qt Company hereby represents and warrants with respect to the Licensed
Software that it has the power and authority to grant the rights and licenses
granted to Licensee under this Agreement. Except as set forth above, the
Licensed Software is licensed to Licensee "as is". To the maximum extent
permitted by applicable law, The Qt Company on behalf of itself and its
suppliers, disclaims all warranties and conditions, either express or implied,
including, but not limited to, implied warranties of merchantability and
fitness for a particular purpose, title and non-infringement regarding to the
Licensed Software.
-
-
-11. LIMITATION OF LIABILITY
-
-If, The Qt Company's warranty disclaimer notwithstanding, The Qt Company is
held to be liable to Licensee whether in contract, tort, or any other legal
theory, based on the Licensed Software, The Qt Company's entire liability to
Licensee and Licensee's exclusive remedy shall be, at The Qt Company's option,
either (a) return of the price Licensee paid for the Licensed Software, or (b)
repair or replacement of the Licensed Software, provided Licensee returns all
copies of the Licensed Software to The Qt Company as originally delivered to
Licensee. The Qt Company shall not under any circumstances be liable to
Licensee based on failure of the Licensed Software if the failure resulted from
accident, abuse or misapplication, nor shall The Qt Company, under any
circumstances, be liable for special damages, punitive or exemplary damages,
damages for loss of profits or interruption of business or for loss or
corruption of data. Any award of damages from The Qt Company to Licensee shall
not exceed the total amount Licensee has paid to The Qt Company in connection
with this Agreement.
-
-
-12. UPDATES AND ONLINE SERVICES
-
-Licensee will be eligible to receive Updates and to use the Online Services
during the Usage Term, in accordance with The Qt Company's then current
policies and procedures, if any. Such policies and procedures may be changed
from time to time. Following the Usage Term, The Qt Company shall no longer
make the Licensed Software, Updates or Online Services available to Licensee
unless Licensee purchases additional Updates and Online Services according to
this Section 12 below.
-
-Licensee may purchase additional Updates and Online Services following the
Evaluation Term or the currently ongoing Usage Term subject to The Qt Company's
terms and conditions applicable at the time of purchase.
-
-
-13. CONFIDENTIALITY
-
-Each party acknowledges that during the Initial Term of this Agreement it
shall have access to information about the other party's business, business
methods, business plans, customers, business relations, technology, and other
information, including the terms of this Agreement, that is confidential and of
great value to the other party, and the value of which would be significantly
reduced if disclosed to third parties ("Confidential Information").
Accordingly, when a party (the "Receiving Party") receives Confidential
Information from another party (the "Disclosing Party"), the Receiving Party
shall, and shall obligate its employees and agents and employees and agents of
its Affiliates to: (i) maintain the Confidential Information in strict
confidence; (ii) not disclose the Confidential Information to a third party
without the Disclosing Party's prior written approval; and (iii) not, directly
or indirectly, use the Confidential Information for any purpose other than for
exercising its rights and fulfilling its responsibilities pursuant to this
Agreement. Each party shall take reasonable measures to protect the
Confidential Information of the other party, which measures shall not be less
than the measures taken by such party to protect its own confidential and
proprietary information.
-
-"Confidential Information" shall not include information that (a) is or
becomes generally known to the public through no act or omission of the
Receiving Party; (b) was in the Receiving Party's lawful possession prior to
the disclosure hereunder and was not subject to limitations on disclosure or
use; (c) is developed by employees of the Receiving Party or other persons
working for the Receiving Party who have not had access to the Confidential
Information of the Disclosing Party, as proven by the written records of the
Receiving Party or by persons who have not had access to the Confidential
Information of the Disclosing Party as proven by the written records of the
Receiving Party; (d) is lawfully disclosed to the Receiving Party without
restrictions, by a third party not under an obligation of confidentiality; or
(e) the Receiving Party is legally compelled to disclose the information, in
which case the Receiving Party shall assert the privileged and confidential
nature of the information and cooperate fully with the Disclosing Party to
protect against and prevent disclosure of any Confidential Information and to
limit the scope of disclosure and the dissemination of disclosed Confidential
Information by all legally available means.
-
-The obligations of the Receiving Party under this Section shall continue
during the Initial Term and for a period of five (5) years after expiration or
termination of this Agreement. To the extent that the terms of the
Non-Disclosure Agreement between The Qt Company and Licensee conflict with the
terms of this Section 13, this Section 13 shall be controlling over the terms
of the Non-Disclosure Agreement.
-
-
-14. GENERAL PROVISIONS
-
-14.1 Marketing
-
-The Qt Company may include Licensee's company name and logo in a publicly
available list of The Qt Company customers and in its public communications.
The Qt Company may gather usage data from the Licensed Software as well as
Applications created with Licensed Software. The Qt Company may include
advertisements and other promotion of The Qt Company and 3rd party products to
Licensed Software IDE and Online Services.
-
-14.2 No Assignment
-
-Licensee shall not be entitled to assign or transfer all or any of its rights,
benefits and obligations under this Agreement without the prior written consent
of The Qt Company, which shall not be unreasonably withheld. The Qt Company
shall be entitled to assign or transfer any of its rights, benefits or
obligations under this Agreement on an unrestricted basis.
-
-14.3 Termination This
-
-Agreement shall remain effective until terminated by You or The Qt Company
subject to this Section
-
-You may terminate this Agreement at any time by cancelling your subscription.
You will not receive any refunds if your account is cancelled.
-
-The Qt Company shall always have the right to terminate this Agreement with
immediate effect, in the event that You (i) do not remit payment outstanding
within thirty (30) days of a written reminder of payment due, or (ii) otherwise
breaches this Agreement or other instructions applicable to Licensed Software,
as such instructions are given by The Qt Company.
-
-Upon termination of this Agreement, Licensee has no longer the rights to
design, develop, compile or test Application(s) by using the Licensed Software.
In addition, Licensee shall cease using the Licensed Software and erase or
destroy all copies of Licensed Software of Licensed Software in the possession
or control of Licensee. Upon request by The Qt Company, You must promptly
deliver to The Qt Company a written confirmation that this has occurred.
-
-Upon termination of this Agreement and Your right to use Licensed Software,
also the Subscription and all Your rights thereto shall be simultaneously
terminated as a whole.
-
-Licensee may distribute Applications after termination of this Agreement.
-
-14.4 Surviving Sections
-
-Any terms and conditions that by their nature or otherwise reasonably should
survive a cancellation or termination of this Agreement shall also be deemed to
survive. Such surviving terms and conditions include, but are not limited to
the Section 13.
-
-14.5 Entire Agreement
-
-This Agreement constitutes the complete agreement between the parties and
supersedes all prior or contemporaneous discussions, representations, and
proposals, written or oral, with respect to the subject matters discussed
herein, with the exception of the non-disclosure agreement executed by the
parties in connection with this Agreement ("Non-Disclosure Agreement"), if any,
shall be subject to Section 13. No modification of this Agreement shall be
effective unless contained in a writing executed by an authorized
representative of each party. No term or condition contained in Licensee's
purchase order shall apply unless expressly accepted by The Qt Company in
writing. If any provision of the Agreement is found void or unenforceable, the
remainder shall remain valid and enforceable according to its terms. If any
remedy provided is determined to have failed for its essential purpose, all
limitations of liability and exclusions of damages set forth in this Agreement
shall remain in effect.
-
-14.6 Payment and Taxes
-
-For all Licensed Software under this Agreement, The Qt Company will charge
Licensee´s credit card on a monthly basis or at the interval indicated in fees
and payment policies, if different. If credit has been extended to Licensee by
The Qt Company, all payments under this Agreement are due within thirty (30)
days of the date The Qt Company mails its invoice to Licensee. If The Qt
Company has not extended credit to Licensee, Licensee shall be required to make
payment concurrent with the delivery of the Licensed Software by The Qt
Company. All amounts payable are gross amounts but exclusive of any value added
tax, use tax, sales tax or similar tax. Licensee shall be entitled to withhold
from payments any applicable withholding taxes and comply with all applicable
tax and employment legislation. Each party shall pay all taxes (including, but
not limited to, taxes based upon its income) or levies imposed on it under
applicable laws, regulations and tax treaties as a result of this Agreement and
any payments made hereunder (including those required to be withheld or
deducted from payments). Each party shall furnish evidence of such paid taxes
as is sufficient to enable the other party to obtain any credits available to
it, including original withholding tax certificates.
-
-14.7 Force Majeure
-
-Neither party shall be liable to the other for any delay or non-performance of
its obligations hereunder other than the obligation of paying the license fees
in the event and to the extent that such delay or non- performance is due to an
event of Force Majeure (as defined below). If any event of Force Majeure
results in a delay or non-performance of a party for a period of three (3)
months or longer, then either party shall have the right to terminate this
Agreement with immediate effect without any liability (except for the
obligations of payment arising prior to the event of Force Majeure) towards the
other party. A "Force Majeure" event shall mean an act of God, terrorist attack
or other catastrophic event of nature that prevents either party for fulfilling
its obligations under this Agreement.
-
-14.8 Notices
-
-Any notice given by one party to the other shall be deemed properly given and
deemed received if specifically acknowledged by the receiving party in writing
or when successfully delivered to the recipient by hand, fax, or special
courier during normal business hours on a business day to the addresses
specified below. Each communication and document made or delivered by one party
to the other party pursuant to this Agreement shall be in the English language
or accompanied by a translation thereof.
-
-Notices to The Qt Company shall be given to:
- The Qt Company Ltd
- Attn: Legal
- Valimotie 21
- FI-00380 Helsinki
- Finland
-
-14.9 Export Control
-
-Licensee acknowledges that the Licensed Software may be subject to export
control restrictions of various countries. Licensee shall fully comply with all
applicable export license restrictions and requirements as well as with all
laws and regulations relating to the importation of the Licensed Software
and/or Modified Software and/or Applications and shall procure all necessary
governmental authorizations, including without limitation, all necessary
licenses, approvals, permissions or consents, where necessary for the re-
exportation of the Licensed Software, Modified Software or Applications.
-
-14.10 Governing Law and Legal Venue
-
-This Agreement shall be construed and interpreted in accordance with the laws
of Finland, excluding its choice of law provisions. Any disputes, controversy
or claim arising out of or relating to this Agreement, or the breach,
termination or validity thereof shall be shall be finally settled by
arbitration in accordance with the Arbitration Rules of the Central Chamber of
Commerce of Finland. The arbitration tribunal shall consist of one (1), or if
either Party so requires, of three (3), arbitrators. The award shall be final
and binding and enforceable in any court of competent jurisdiction. The
arbitration shall be held in Helsinki, Finland and the process shall be
conducted in the English language.
-
-14.11 No Implied License
-
-There are no implied licenses or other implied rights granted under this
Agreement, and all rights, save for those expressly granted hereunder, shall
remain with The Qt Company and its licensors. In addition, no licenses or
immunities are granted to the combination of the Licensed Software and/or
Modified Software, as applicable, with any other software or hardware not
delivered by The Qt Company under this Agreement.
-
-14.12 Changes to the Agreement
-
-The Qt Company may change the terms of this Agreement by informing You of such
updates or changes. None of such updates or changes shall have any effect on
Your on-going subscription period. Should You not accept the updates or changes
made by The Qt Company, You shall have the right at Your own discretion to
terminate this Agreement with immediate effect by notifying The Qt Company in
writing, e.g. email. For clarity, in case of your termination, none of the
already paid subscription fees shall be returned or reimbursed by The Qt
Company.
-
-
-APPENDIX 1
-
-1. Parts of the Licensed Software that are permitted for distribution
("Redistributables")
- • The Licensed Software's essential and add-on libraries as listed in the
License Certificate in object code form
- • The Licensed Software's help tool in object code/executable form ("Qt
Assistant")
- • The Licensed Software's internationalization tools in object
code/executable form ("Qt Linguist", "lupdate", "lrelease")
- • The Licensed Software's QML ("Qt Quick") launcher tool ("qmlscene" and
"qmlviewer") in object code/executable form
-
-2. Parts of the Licensed Software that are not permitted for distribution
include, but are not limited to
- • The Licensed Software's source code and header files
- • The Licensed Software's documentation
- • The Licensed Software's documentation generation tool ("qdoc")
- • The Licensed Software's tool for writing makefiles ("qmake")
- • The Licensed Software's Meta Object Compiler ("moc")
- • The Licensed Software's User Interface Compiler ("uic")
- • The Licensed Software's Resource Compiler ("rcc")
- • The Licensed Software's tools which are not specifically allowed to be
redistributed, including but not limited to IDE tool ("Qt Creator"), design
("Qt Designer" and "Qt Quick Designer") and build tools
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-everywhere-src-5.11.1/.QT-PROFESSIONAL-LICENSE-AGREEMENT
new/qtwebsockets-everywhere-src-5.11.2/.QT-PROFESSIONAL-LICENSE-AGREEMENT
--- old/qtwebsockets-everywhere-src-5.11.1/.QT-PROFESSIONAL-LICENSE-AGREEMENT
2018-06-18 09:47:03.000000000 +0200
+++ new/qtwebsockets-everywhere-src-5.11.2/.QT-PROFESSIONAL-LICENSE-AGREEMENT
1970-01-01 01:00:00.000000000 +0100
@@ -1,247 +0,0 @@
-Qt PROFESSIONAL LICENSE AGREEMENT
-Agreement version 2.3
-
-This Qt Professional License Agreement ("Agreement") is a legal agreement
between The Qt Company Ltd ("The Qt Company") with its registered office at
Valimotie 21, FI-00380 Helsinki, Finland, and you (either an individual or a
legal entity) ("You" or "Licensee" as applicable) for the Licensed Software (as
defined below).
-
-Please, read these license terms through carefully. By selecting "I accept the
Agreement ", You are deemed to accept these license terms and to commit
Yourself to observing them. When representing a legal entity, You should ensure
Your due authorization to approve these terms before You select "I accept the
Agreement". Otherwise, we regard You as personally responsible for compliance
with this Agreement.
-
-
-1. DEFINITIONS
-
-"Affiliate" of a Party shall mean an entity (i) which is directly or
indirectly controlling such Party; (ii) which is under the same direct or
indirect ownership or control as such Party; or (iii) which is directly or
indirectly owned or controlled by such Party. For these purposes, an entity
shall be treated as being controlled by another if that other entity has fifty
percent (50 %) or more of the votes in such entity, is able to direct its
affairs and/or to control the composition of its board of directors or
equivalent body.
-
-"Applications" shall mean Licensee's software products created using the
Licensed Software which may include portions of the Licensed Software.
-
-"Deployment Platforms" shall mean those operating systems in which the
Licensed Software can be distributed on according to the terms and conditions
of this Agreement, especially Section 5.2.
-
-"Development Platforms" shall mean those operating systems in which the
Licensed Software can be used only for designing, developing and testing
Applications, but not distributed in any form or used for any other purpose.
-
-"Designated User(s)" shall mean the employee(s) of Licensee acting within the
scope of their employment or Licensee's consultant(s) or contractor(s) acting
within the scope of their services for Licensee and on behalf of Licensee.
-
-"Evaluation Term" shall mean the period of thirty (30) days from the later of
(a) the Effective Date; or (b) the date the Licensed Software was initially
delivered to Licensee by The Qt Company. If no specific Effective Date is set
forth in the Agreement, the Effective Date shall be deemed to be the date the
Licensed Software was initially delivered to Licensee. "Usage Term" shall mean
a time period that You have selected and paid for the usage of the Licensed
Software, calculated from either (i) the end of the Evaluation Term, or (ii)
from the purchase of the Usage Term, or (iii) from end of the previous Usage
Term, as applicable.
-
-"License Certificate" shall mean the document accompanying the Licensed
Software which specifies the modules which are licensed under the Agreement,
Development Platforms, Deployment Platforms and Designated Users.
-
-"Licensed Software" shall mean the computer software, "online" or electronic
documentation, associated media and printed materials, including the source
code, example programs and the documentation delivered by The Qt Company to
Licensee in conjunction with this Agreement. Licensed Software does not include
Third Party Software (as defined in Section 7).
-
-"Modified Software" shall mean modifications made to the Licensed Software by
Licensee. "Nokia" shall mean Nokia Corporation, a corporation incorporated
under the laws of Finland, having its registered office at PO box 226, 00045
Nokia Group, Finland (visiting address Keilalahdentie 4, 02150 Espoo, Finland)
and registered with the Finnish Trade Register under business ID 0112038-9 and
acting on behalf of its respective Affiliates.
-
-"Online Services" shall mean any services or access to systems provided by The
Qt Company to the Licensee over Internet in conjunction with the Licensed
Software or for the purpose of use by the Licensee of the Licensed Software or
Support. Using some of the Online Services may be subject to additional fees.
-
-"Party or Parties" shall mean Licensee and/or The Qt Company.
-
-"Redistributables" shall mean the portions of the Licensed Software set forth
in Appendix 1, Section 1 that may be distributed with or as part of
Applications in object code form.
-
-"Subscription" shall mean all the software and services that You have ordered
and paid as a bundled subscription package from The Qt Company via qt.io.
-
-"Support" shall mean standard developer support that is provided by The Qt
Company to assist eligible Designated Users in using the Licensed Software in
accordance with its established standard support procedures.
-
-"Updates" shall mean a release or version of the Licensed Software containing
enhancements, new features, bug fixes, error corrections and other changes that
are generally made available to users of the Licensed Software that have
contracted for maintenance and support.
-
-
-2. OWNERSHIP
-
-The Licensed Software is protected by copyright laws and international
copyright treaties, as well as other intellectual property laws and treaties.
The Licensed Software is licensed, not sold.
-
-To the extent Licensee submits bug fixes or error corrections, including
information related thereto, Licensee hereby grants The Qt Company a
sublicensable, irrevocable, perpetual, worldwide, non-exclusive, royalty-free
and fully paid-up copyright and trade secret license to reproduce, adapt,
translate, modify, and prepare derivative works of, publicly display, publicly
perform, sublicense, make available and distribute error corrections and bug
fixes, including derivative works thereof. All The Qt Company's and/or its
licensors' trademarks, service marks, trade names, logos or other words or
symbols are and shall remain the exclusive property of The Qt Company or its
licensors respectively.
-
-
-3. MODULES
-
-Some of the files in the Licensed Software have been grouped into modules.
These files contain specific notices defining the module of which they are a
part. The modules licensed to Licensee are specified in the License Certificate
accompanying the Licensed Software. The terms of the License Certificate are
considered part of the Agreement. In the event of inconsistency or conflict
between the language of this Agreement and the License Certificate, the
provisions of this Agreement shall govern.
-
-
-4. VALIDITY OF THE AGREEMENT
-
-By installing, copying, or otherwise using the Licensed Software, Licensee
agrees to be bound by the terms of this Agreement. If Licensee does not agree
to the terms of this Agreement, Licensee should not install, copy, or otherwise
use the Licensed Software. In addition, by installing, copying, or otherwise
using any Updates or other components of the Licensed Software that Licensee
receives separately as part of the Licensed Software, Licensee agrees to be
bound by any additional license terms that accompany such Updates, if any. If
Licensee does not agree to the additional license terms that accompany such
Updates, Licensee should not install, copy, or otherwise use such Updates.
-
-Upon Licensee's acceptance of the terms and conditions of this Agreement, The
Qt Company grants Licensee the right to use the Licensed Software in the manner
provided below.
-
-
-5. LICENSES FOR (I) EVALUATION TERM AND (II) USAGE TERM
-
-GENERAL:
-
-Licensee is hereby granted a free of charge limited thirty (30) days
evaluation license for the Evaluation Term as described in Section 5.1 below.
After Evaluation Term, Licensee may purchase additional license(s) for Usage
Term, as described in Section 5.2 below, subject to The Qt Company's payment
terms and conditions applicable at the time of purchase. In addition, Licensee
may purchase license(s) for the Usage Term without such an Evaluation Term.
-
-(I) LICENSE FOR EVALUATION TERM
-
-5.1 Evaluation license granted during the Evaluation Term
-
-5.1.1 Using and Copying
-
-The Qt Company grants to Licensee a non-exclusive, non-transferable,
time-limited license to use and copy the Licensed Software for sole purpose of
evaluating the Licensed Software during the Evaluation Term.
-
-Licensee may install copies of the Licensed Software on an unlimited number of
computers provided that (a) if an individual, only such individual; or (b) if a
legal entity only its employees; use the Licensed Software for the authorized
purposes.
-
-5.1.2 No Distribution or Modifications
-
-Licensee may not disclose, modify, sell, market, commercialize, distribute,
loan, rent, lease, or license the Licensed Software or any copy of it or use
the Licensed Software for any purpose that is not expressly granted in this
Section 5.1. Licensee may not alter or remove any details of ownership,
copyright, trademark or other property right connected with the Licensed
Software. Licensee may not distribute any software statically or dynamically
linked with the Licensed Software.
-
-5.1.3 No Technical Support
-
-The Qt Company has no obligation to furnish Licensee with any technical
support whatsoever. Any such support is subject to separate agreement between
the Parties.
-
-5.1.4 Further Requirements
-
-It is expressly acknowledged and understood by Licensee, that Licensee is
strictly prohibited from using or licensing Licensed Software for creation of
mobile phones or tablet computers targeted for consumer end users. However,
creation of Applications for mobile phones or tablet computers is allowed under
this Agreement.
-
-Notwithstanding anything contrary to this Agreement, it is expressly
acknowledged and understood by Licensee, that Nokia shall hereby be named as a
third party beneficiary under this Agreement with respect to this Section
5.1.4. Therefore, Nokia shall have the same rights as The Qt Company under this
Agreement with respect to this Section 5.1.4, and shall be entitled to exercise
such rights independent from The Qt Company.
-
-
-(II) LICENSE FOR USAGE TERM
-
-5.2 Licenses granted during the Usage Term
-
-5.2.1 Using, Modifying and Copying
-
-The Qt Company grants to Licensee a non-exclusive, non-transferable, limited
term license to use, modify and copy the Licensed Software for Designated Users
specified in the License Certificate for the sole purposes of:
-(i) designing, developing, and testing Application(s);
-(ii) modifying the Licensed Software as limited by section 8 below; and
-(iii) compiling the Licensed Software and/or Modified Software source code
into object code.
-
-Licensee may install copies of the Licensed Software on an unlimited number of
computers provided that only the Designated Users use the Licensed Software.
Licensee may at any time designate another Designated User to replace a
then-current Designated User by notifying The Qt Company, provided that a) the
then-current Designated User has not been designated as a replacement during
the last six (6) months; and b) there is no more than the specified number of
Designated Users at any given time.
-
-5.2.2 Limited Redistribution
-
-a) The Qt Company grants Licensee a non-exclusive, royalty-free right to
reproduce and distribute the object code form of Redistributables (listed in
Appendix 1, Section 1) for execution on the specified Deployment Platforms as
defined in License Certificate, excluding the Joint Hardware and Software
Distribution as defined in b) below. Copies of Redistributables may only be
distributed with and for the sole purpose of executing Applications permitted
under this Agreement that Licensee has created using the Licensed Software.
Under no circumstances may any copies of Redistributables be distributed
separately. This Agreement does not give Licensee any rights to distribute any
of the parts of the Licensed Software listed in Appendix 1, Section 2, neither
as a whole nor as parts or snippets of code.
-
-b) Licensee may not distribute, transfer, assign or otherwise dispose of
Applications and/or Redistributables, in binary/compiled form, or in any other
form, if such action is part of a Joint Software and Hardware Distribution. A
Joint Hardware and Software Distribution shall be defined as either:
-(i) distribution of a hardware device where, in its final end user
configuration, the main user interface or substantial functionality of the
device is provided by Application(s) created by Licensee or others, using
Licensed Software or Licensed Software based software product, and depends on
the Licensed Software or an open source version of Qt or any Qt based software
product; or
-(ii) distribution of the Licensed Software with a device designed to
facilitate the installation of the Licensed Software onto the same device where
the main user interface or substantial functionality of such device is provided
by Application(s) created by Licensee or others, using the Licensed Software,
and depends on the Licensed Software.
-
-5.2.3 Further Requirements
-
-It is expressly acknowledged and understood by Licensee, that Licensee is
strictly prohibited from using or licensing Licensed Software for creation of
mobile phones or tablet computers targeted for consumer end users.
-
-The aforementioned shall not prohibit Licensee from using Licensed Software
for the purpose of creating Applications for any devices, including mobile
phones and tablet computers.
-
-Notwithstanding anything contrary to this Agreement, it is expressly
acknowledged and understood by Licensee, that Nokia shall hereby be named as a
third party beneficiary under this Agreement with respect to this Section
5.2.3. Therefore, Nokia shall have the same rights as The Qt Company under this
Agreement with respect to this Section 5.2.3, and shall be entitled to exercise
such rights independent from The Qt Company.
-
-The licenses granted in this Section 5.2 by The Qt Company to Licensee are
subject to Licensee's compliance with Section 8 of this Agreement.
-
-
-6. VERIFICATION
-
-The Qt Company or a certified auditor on The Qt Company's behalf, may, upon
its reasonable request and at its expense, audit Licensee with respect to the
use of the Licensed Software. Such audit may be conducted by mail, electronic
means or through an in-person visit to Licensee's place of business. Any such
in-person audit shall be conducted during regular business hours at Licensee's
facilities and shall not unreasonably interfere with Licensee's business
activities. The Qt Company will not remove, copy, or redistribute any
electronic material during the course of an audit. If an audit reveals that
Licensee is using the Licensed Software in a way that is in material violation
of the terms of the Agreement, then Licensee shall pay The Qt Company's
reasonable costs of conducting the audit. In the case of a material violation,
Licensee agrees to pay The Qt Company any amounts owing that are attributable
to the unauthorized use. Alternatively, The Qt Company reserves the right, at
The Qt Company's sole option, to terminate the licenses for the Licensed
Software.
-
-
-7. THIRD PARTY SOFTWARE
-
-The Licensed Software may provide links to third party libraries or code
(collectively "Third Party Software") to implement various functions. Third
Party Software does not comprise part of the Licensed Software. In some cases,
access to Third Party Software may be included along with the Licensed Software
delivery as a convenience for development and testing only. Such source code
and libraries may be listed in the ".../src/3rdparty" source tree delivered
with the Licensed Software or documented in the Licensed Software where the
Third Party Software is used, as may be amended from time to time, do not
comprise the Licensed Software. Licensee acknowledges (i) that some part of
Third Party Software may require additional licensing of copyright and patents
from the owners of such, and (ii) that distribution of any of the Licensed
Software referencing any portion of a Third Party Software may require
appropriate licensing from such third parties.
-
-
-8. CONDITIONS FOR CREATING APPLICATIONS
-
-The licenses granted in this Agreement for Licensee to create, modify and
distribute Applications is subject to all of the following conditions: (i) all
copies of the Applications Licensee creates must bear a valid copyright notice
either Licensee's own or the copyright notice that appears on the Licensed
Software; (ii) Licensee may not remove or alter any copyright, trademark or
other proprietary rights notice contained in any portion of the Licensed
Software including but not limited to the About Boxes; (iii) Licensee will
indemnify and hold The Qt Company, its Affiliates, contractors, and its
suppliers, harmless from and against any claims or liabilities arising out of
the use, reproduction or distribution of Applications; (iv) Applications must
be developed using a licensed, registered copy of the Licensed Software; (v)
Applications must add primary and substantial functionality to the Licensed
Software; (vi) Applications may not pass on functionality which in any way
makes it possible for others to create software with the Licensed Software;
however Licensee may use the Licensed Software's scripting and QML ("Qt Quick")
functionality solely in order to enable scripting, themes and styles that
augment the functionality and appearance of the Application(s) without adding
primary and substantial functionality to the Application(s); (vii) Licensee may
create Modified Software that breaks the source or binary compatibility with
the Licensed Software. This includes, but is not limited to, changing the
application programming interfaces ("API") by adding, changing or deleting any
variable, method, or class signature in the Licensed Software, the
inter-process QCop specification, and/or any inter-process protocols, services
or standards in the Licensed Software libraries. To the extent that Licensee
breaks source or binary compatibility with the Licensed Software, Licensee
acknowledges that The Qt Company's ability to provide Support may be prevented
or limited and Licensee's ability to make use of Updates may be restricted;
(viii) Applications may not compete with the Licensed Software; (ix) Licensee
may not use The Qt Company's or any of its suppliers' names, logos, or
trademarks to market Applications, except to state that Licensee's
Application(s) was developed using the Licensed Software; (x) each Designated
User creating the Application(s) needs to have a separate license for the
Licensed Software.
-
-
-9. PRE-RELEASE CODE
-
-The Licensed Software may contain pre-release code and functionality marked or
otherwise stated as "Technology Preview", "Alpha", "Beta" or similar. Such
pre-release code may be present in order to provide experimental support for
new platforms or preliminary version of new functionality. The pre-release code
is not at the level of performance and compatibility of a final, generally
available, product offering. The pre- release parts of the Licensed Software
may not operate correctly and may be substantially modified prior to the first
commercial product release, if any. The Qt Company is under no obligation to
make pre-release code commercially available, or provide any Support or Updates
relating thereto. The pre-release code must not be used for commercial purposes
or in a live operating environment where it may be relied upon to perform in
the same manner as a commercially released product or with data that has not
been sufficiently backed up.
-
-
-10. LIMITED WARRANTY AND WARRANTY DISCLAIMER
-
-The Qt Company hereby represents and warrants with respect to the Licensed
Software that it has the power and authority to grant the rights and licenses
granted to Licensee under this Agreement. Except as set forth above, the
Licensed Software is licensed to Licensee "as is". To the maximum extent
permitted by applicable law, The Qt Company on behalf of itself and its
suppliers, disclaims all warranties and conditions, either express or implied,
including, but not limited to, implied warranties of merchantability and
fitness for a particular purpose, title and non-infringement regarding to the
Licensed Software.
-
-
-11. LIMITATION OF LIABILITY
-
-If, The Qt Company's warranty disclaimer notwithstanding, The Qt Company is
held to be liable to Licensee whether in contract, tort, or any other legal
theory, based on the Licensed Software, The Qt Company's entire liability to
Licensee and Licensee's exclusive remedy shall be, at The Qt Company's option,
either (a) return of the price Licensee paid for the Licensed Software, or (b)
repair or replacement of the Licensed Software, provided Licensee returns all
copies of the Licensed Software to The Qt Company as originally delivered to
Licensee. The Qt Company shall not under any circumstances be liable to
Licensee based on failure of the Licensed Software if the failure resulted from
accident, abuse or misapplication, nor shall The Qt Company, under any
circumstances, be liable for special damages, punitive or exemplary damages,
damages for loss of profits or interruption of business or for loss or
corruption of data. Any award of damages from The Qt Company to Licensee shall
not exceed the total amount Licensee has paid to The Qt Company in connection
with this Agreement.
-
-
-12. SUPPORT, UPDATES AND ONLINE SERVICES
-
-Licensee will be eligible to receive Support and Updates and to use the Online
Services during the Usage Term, in accordance with The Qt Company's then
current policies and procedures, if any. Such policies and procedures may be
changed from time to time. Following the Usage Term, The Qt Company shall no
longer make the Licensed Software, Support, Updates or Online Services
available to Licensee unless Licensee purchases additional Support, Updates and
Online Services according to this Section 12 below. Licensee may purchase
additional Support, Updates and Online Services following the Evaluation Term
or the currently ongoing Usage Term subject to The Qt Company's terms and
conditions applicable at the time of purchase.
-
-
-13. CONFIDENTIALITY
-
-Each party acknowledges that during the Initial Term of this Agreement it
shall have access to information about the other party's business, business
methods, business plans, customers, business relations, technology, and other
information, including the terms of this Agreement, that is confidential and of
great value to the other party, and the value of which would be significantly
reduced if disclosed to third parties ("Confidential Information").
Accordingly, when a party (the "Receiving Party") receives Confidential
Information from another party (the "Disclosing Party"), the Receiving Party
shall, and shall obligate its employees and agents and employees and agents of
its Affiliates to: (i) maintain the Confidential Information in strict
confidence; (ii) not disclose the Confidential Information to a third party
without the Disclosing Party's prior written approval; and (iii) not, directly
or indirectly, use the Confidential Information for any purpose other than for
exercising its rights and fulfilling its responsibilities pursuant to this
Agreement. Each party shall take reasonable measures to protect the
Confidential Information of the other party, which measures shall not be less
than the measures taken by such party to protect its own confidential and
proprietary information.
-
-"Confidential Information" shall not include information that (a) is or
becomes generally known to the public through no act or omission of the
Receiving Party; (b) was in the Receiving Party's lawful possession prior to
the disclosure hereunder and was not subject to limitations on disclosure or
use; (c) is developed by employees of the Receiving Party or other persons
working for the Receiving Party who have not had access to the Confidential
Information of the Disclosing Party, as proven by the written records of the
Receiving Party or by persons who have not had access to the Confidential
Information of the Disclosing Party as proven by the written records of the
Receiving Party; (d) is lawfully disclosed to the Receiving Party without
restrictions, by a third party not under an obligation of confidentiality; or
(e) the Receiving Party is legally compelled to disclose the information, in
which case the Receiving Party shall assert the privileged and confidential
nature of the information and cooperate fully with the Disclosing Party to
protect against and prevent disclosure of any Confidential Information and to
limit the scope of disclosure and the dissemination of disclosed Confidential
Information by all legally available means.
-
-The obligations of the Receiving Party under this Section shall continue
during the Initial Term and for a period of five (5) years after expiration or
termination of this Agreement. To the extent that the terms of the
Non-Disclosure Agreement between The Qt Company and Licensee conflict with the
terms of this Section 13, this Section 13 shall be controlling over the terms
of the Non-Disclosure Agreement.
-
-
-14. GENERAL PROVISIONS
-
-14.1 Marketing
-
-The Qt Company may include Licensee's company name and logo in a publicly
available list of The Qt Company customers and in its public communications.
-
-14.2 No Assignment
-
-Licensee shall not be entitled to assign or transfer all or any of its rights,
benefits and obligations under this Agreement without the prior written consent
of The Qt Company, which shall not be unreasonably withheld. The Qt Company
shall be entitled to assign or transfer any of its rights, benefits or
obligations under this Agreement on an unrestricted basis.
-
-14.3 Termination
-
-This Agreement shall remain effective until terminated by You or The Qt
Company subject to this Section 14.3. You may terminate this Agreement at any
time by cancelling your subscription. You will not receive any refunds if your
account is cancelled.
-
-The Qt Company shall always have the right to terminate this Agreement with
immediate effect, in the event that You (i) do not remit payment outstanding
within thirty (30) days of a written reminder of payment due, or (ii) otherwise
breaches this Agreement or other instructions applicable to Licensed Software,
as such instructions are given by The Qt Company.
-
-Upon termination of this Agreement, Licensee has no longer the rights to
design, develop, compile or test Application(s) by using the Licensed Software.
In addition, Licensee shall cease using the Licensed Software and erase or
destroy all copies of Licensed Software of Licensed Software in the possession
or control of Licensee. Upon request by The Qt Company, You must promptly
deliver to The Qt Company a written confirmation that this has occurred.
-
-Upon termination of this Agreement and Your right to use Licensed Software,
also the Subscription and all Your rights thereto shall be simultaneously
terminated as a whole. Licensee may distribute Applications after termination
of this Agreement.
-
-14.4 Surviving Sections
-
-Any terms and conditions that by their nature or otherwise reasonably should
survive a cancellation or termination of this Agreement shall also be deemed to
survive. Such surviving terms and conditions include, but are not limited to
the Section 13.
-
-14.5 Entire Agreement
-
-This Agreement constitutes the complete agreement between the parties and
supersedes all prior or contemporaneous discussions, representations, and
proposals, written or oral, with respect to the subject matters discussed
herein, with the exception of the non-disclosure agreement executed by the
parties in connection with this Agreement ("Non-Disclosure Agreement"), if any,
shall be subject to Section 13. No modification of this Agreement shall be
effective unless contained in a writing executed by an authorized
representative of each party. No term or condition contained in Licensee's
purchase order shall apply unless expressly accepted by The Qt Company in
writing. If any provision of the Agreement is found void or unenforceable, the
remainder shall remain valid and enforceable according to its terms. If any
remedy provided is determined to have failed for its essential purpose, all
limitations of liability and exclusions of damages set forth in this Agreement
shall remain in effect.
-
-14.6 Payment and Taxes
-
-For all Licensed Software under this Agreement, The Qt Company will charge
Licensee´s credit card on a monthly basis or at the interval indicated in fees
and payment policies, if different. If credit has been extended to Licensee by
The Qt Company, all payments under this Agreement are due within thirty (30)
days of the date The Qt Company mails its invoice to Licensee. If The Qt
Company has not extended credit to Licensee, Licensee shall be required to make
payment concurrent with the delivery of the Licensed Software by The Qt
Company. All amounts payable are gross amounts but exclusive of any value added
tax, use tax, sales tax or similar tax. Licensee shall be entitled to withhold
from payments any applicable withholding taxes and comply with all applicable
tax and employment legislation. Each party shall pay all taxes (including, but
not limited to, taxes based upon its income) or levies imposed on it under
applicable laws, regulations and tax treaties as a result of this Agreement and
any payments made hereunder (including those required to be withheld or
deducted from payments). Each party shall furnish evidence of such paid taxes
as is sufficient to enable the other party to obtain any credits available to
it, including original withholding tax certificates.
-
-14.7 Force Majeure
-
-Neither party shall be liable to the other for any delay or non-performance of
its obligations hereunder other than the obligation of paying the license fees
in the event and to the extent that such delay or non- performance is due to an
event of Force Majeure (as defined below). If any event of Force Majeure
results in a delay or non-performance of a party for a period of three (3)
months or longer, then either party shall have the right to terminate this
Agreement with immediate effect without any liability (except for the
obligations of payment arising prior to the event of Force Majeure) towards the
other party. A "Force Majeure" event shall mean an act of God, terrorist attack
or other catastrophic event of nature that prevents either party for fulfilling
its obligations under this Agreement.
-
-14.8 Notices
-
-Any notice given by one party to the other shall be deemed properly given and
deemed received if specifically acknowledged by the receiving party in writing
or when successfully delivered to the recipient by hand, fax, or special
courier during normal business hours on a business day to the addresses
specified below. Each communication and document made or delivered by one party
to the other party pursuant to this Agreement shall be in the English language
or accompanied by a translation thereof. Notices to The Qt Company shall be
given to:
-The Qt Company Ltd
-Attn: Legal
-Valimotie 21
-FI-00380 Helsinki
-Finland
-
-14.9 Export Control
-
-Licensee acknowledges that the Licensed Software may be subject to export
control restrictions of various countries. Licensee shall fully comply with all
applicable export license restrictions and requirements as well as with all
laws and regulations relating to the importation of the Licensed Software
and/or Modified Software and/or Applications and shall procure all necessary
governmental authorizations, including without limitation, all necessary
licenses, approvals, permissions or consents, where necessary for the re-
exportation of the Licensed Software, Modified Software or Applications.
-
-14.10 Governing Law and Legal Venue
-
-This Agreement shall be construed and interpreted in accordance with the laws
of Finland, excluding its choice of law provisions. Any disputes, controversy
or claim arising out of or relating to this Agreement, or the breach,
termination or validity thereof shall be shall be finally settled by
arbitration in accordance with the Arbitration Rules of the Central Chamber of
Commerce of Finland. The arbitration tribunal shall consist of one (1), or if
either Party so requires, of three (3), arbitrators. The award shall be final
and binding and enforceable in any court of competent jurisdiction. The
arbitration shall be held in Helsinki, Finland and the process shall be
conducted in the English language.
-
-14.11 No Implied License
-
-There are no implied licenses or other implied rights granted under this
Agreement, and all rights, save for those expressly granted hereunder, shall
remain with The Qt Company and its licensors. In addition, no licenses or
immunities are granted to the combination of the Licensed Software and/or
Modified Software, as applicable, with any other software or hardware not
delivered by The Qt Company under this Agreement.
-
-14.12 Changes to the Agreement
-
-The Qt Company may change the terms of this Agreement by informing You of such
updates or changes. None of such updates or changes shall have any effect on
Your on-going subscription period. Should You not accept the updates or changes
made by The Qt Company, You shall have the right at Your own discretion to
terminate this Agreement with immediate effect by notifying The Qt Company in
writing, e.g. email. For clarity, in case of your termination, none of the
already paid subscription fees shall be returned or reimbursed by The Qt
Company.
-
-
-APPENDIX 1
-
-1. Parts of the Licensed Software that are permitted for distribution
("Redistributables")
-• The Licensed Software's essential and add-on libraries as listed in the
License Certificate in object code form
-• The Licensed Software's help tool in object code/executable form ("Qt
Assistant") • The Licensed Software's internationalization tools in object
code/executable form ("Qt Linguist", "lupdate", "lrelease")
-• The Licensed Software's QML ("Qt Quick") launcher tool ("qmlscene" and
"qmlviewer") in object code/executable form
-
-2. Parts of the Licensed Software that are not permitted for distribution
-include, but are not limited to
-• The Licensed Software's source code and header files
-• The Licensed Software's documentation
-• The Licensed Software's documentation generation tool ("qdoc")
-• The Licensed Software's tool for writing makefiles ("qmake")
-• The Licensed Software's Meta Object Compiler ("moc")
-• The Licensed Software's User Interface Compiler ("uic" or in the case of Qt
Jambi: "juic")
-• The Licensed Software's Resource Compiler ("rcc")
-• The Licensed Software's tools which are not specifically allowed to be
redistributed, including but not limited to IDE tool ("Qt Creator"), design
("Qt Designer" and "Qt Quick Designer") and build tools
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtwebsockets-everywhere-src-5.11.1/.qmake.conf
new/qtwebsockets-everywhere-src-5.11.2/.qmake.conf
--- old/qtwebsockets-everywhere-src-5.11.1/.qmake.conf 2018-06-09
13:08:57.000000000 +0200
+++ new/qtwebsockets-everywhere-src-5.11.2/.qmake.conf 2018-08-29
14:01:21.000000000 +0200
@@ -3,4 +3,4 @@
CONFIG += warning_clean
DEFINES += QT_NO_FOREACH
-MODULE_VERSION = 5.11.1
+MODULE_VERSION = 5.11.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtwebsockets-everywhere-src-5.11.1/.tag
new/qtwebsockets-everywhere-src-5.11.2/.tag
--- old/qtwebsockets-everywhere-src-5.11.1/.tag 2018-06-09 13:08:57.000000000
+0200
+++ new/qtwebsockets-everywhere-src-5.11.2/.tag 2018-08-29 14:01:21.000000000
+0200
@@ -1 +1 @@
-d99ae2d542515cf53faa5998c1a8e6b9204a6470
+10ce467a825f2de5a5cb934c4ef21e76f8840a07
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-everywhere-src-5.11.1/dist/changes-5.11.2
new/qtwebsockets-everywhere-src-5.11.2/dist/changes-5.11.2
--- old/qtwebsockets-everywhere-src-5.11.1/dist/changes-5.11.2 1970-01-01
01:00:00.000000000 +0100
+++ new/qtwebsockets-everywhere-src-5.11.2/dist/changes-5.11.2 2018-08-29
14:01:21.000000000 +0200
@@ -0,0 +1,24 @@
+Qt 5.11.2 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.11.0 through 5.11.1.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+http://doc.qt.io/qt-5/index.html
+
+The Qt version 5.11 series is binary compatible with the 5.10.x series.
+Applications compiled for 5.10 will continue to run with 5.11.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+* Qt 5.11.2 Changes *
+****************************************************************************
+
+ - This release contains only minor code improvements.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-everywhere-src-5.11.1/include/QtWebSockets/5.11.1/QtWebSockets/private/qdefaultmaskgenerator_p.h
new/qtwebsockets-everywhere-src-5.11.2/include/QtWebSockets/5.11.1/QtWebSockets/private/qdefaultmaskgenerator_p.h
---
old/qtwebsockets-everywhere-src-5.11.1/include/QtWebSockets/5.11.1/QtWebSockets/private/qdefaultmaskgenerator_p.h
2018-06-09 13:08:57.000000000 +0200
+++
new/qtwebsockets-everywhere-src-5.11.2/include/QtWebSockets/5.11.1/QtWebSockets/private/qdefaultmaskgenerator_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/websockets/qdefaultmaskgenerator_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-everywhere-src-5.11.1/include/QtWebSockets/5.11.1/QtWebSockets/private/qsslserver_p.h
new/qtwebsockets-everywhere-src-5.11.2/include/QtWebSockets/5.11.1/QtWebSockets/private/qsslserver_p.h
---
old/qtwebsockets-everywhere-src-5.11.1/include/QtWebSockets/5.11.1/QtWebSockets/private/qsslserver_p.h
2018-06-09 13:08:57.000000000 +0200
+++
new/qtwebsockets-everywhere-src-5.11.2/include/QtWebSockets/5.11.1/QtWebSockets/private/qsslserver_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/websockets/qsslserver_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-everywhere-src-5.11.1/include/QtWebSockets/5.11.1/QtWebSockets/private/qwebsocket_p.h
new/qtwebsockets-everywhere-src-5.11.2/include/QtWebSockets/5.11.1/QtWebSockets/private/qwebsocket_p.h
---
old/qtwebsockets-everywhere-src-5.11.1/include/QtWebSockets/5.11.1/QtWebSockets/private/qwebsocket_p.h
2018-06-09 13:08:57.000000000 +0200
+++
new/qtwebsockets-everywhere-src-5.11.2/include/QtWebSockets/5.11.1/QtWebSockets/private/qwebsocket_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/websockets/qwebsocket_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-everywhere-src-5.11.1/include/QtWebSockets/5.11.1/QtWebSockets/private/qwebsocketcorsauthenticator_p.h
new/qtwebsockets-everywhere-src-5.11.2/include/QtWebSockets/5.11.1/QtWebSockets/private/qwebsocketcorsauthenticator_p.h
---
old/qtwebsockets-everywhere-src-5.11.1/include/QtWebSockets/5.11.1/QtWebSockets/private/qwebsocketcorsauthenticator_p.h
2018-06-09 13:08:57.000000000 +0200
+++
new/qtwebsockets-everywhere-src-5.11.2/include/QtWebSockets/5.11.1/QtWebSockets/private/qwebsocketcorsauthenticator_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/websockets/qwebsocketcorsauthenticator_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-everywhere-src-5.11.1/include/QtWebSockets/5.11.1/QtWebSockets/private/qwebsocketdataprocessor_p.h
new/qtwebsockets-everywhere-src-5.11.2/include/QtWebSockets/5.11.1/QtWebSockets/private/qwebsocketdataprocessor_p.h
---
old/qtwebsockets-everywhere-src-5.11.1/include/QtWebSockets/5.11.1/QtWebSockets/private/qwebsocketdataprocessor_p.h
2018-06-09 13:08:57.000000000 +0200
+++
new/qtwebsockets-everywhere-src-5.11.2/include/QtWebSockets/5.11.1/QtWebSockets/private/qwebsocketdataprocessor_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/websockets/qwebsocketdataprocessor_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-everywhere-src-5.11.1/include/QtWebSockets/5.11.1/QtWebSockets/private/qwebsocketframe_p.h
new/qtwebsockets-everywhere-src-5.11.2/include/QtWebSockets/5.11.1/QtWebSockets/private/qwebsocketframe_p.h
---
old/qtwebsockets-everywhere-src-5.11.1/include/QtWebSockets/5.11.1/QtWebSockets/private/qwebsocketframe_p.h
2018-06-09 13:08:57.000000000 +0200
+++
new/qtwebsockets-everywhere-src-5.11.2/include/QtWebSockets/5.11.1/QtWebSockets/private/qwebsocketframe_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/websockets/qwebsocketframe_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-everywhere-src-5.11.1/include/QtWebSockets/5.11.1/QtWebSockets/private/qwebsockethandshakerequest_p.h
new/qtwebsockets-everywhere-src-5.11.2/include/QtWebSockets/5.11.1/QtWebSockets/private/qwebsockethandshakerequest_p.h
---
old/qtwebsockets-everywhere-src-5.11.1/include/QtWebSockets/5.11.1/QtWebSockets/private/qwebsockethandshakerequest_p.h
2018-06-09 13:08:57.000000000 +0200
+++
new/qtwebsockets-everywhere-src-5.11.2/include/QtWebSockets/5.11.1/QtWebSockets/private/qwebsockethandshakerequest_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/websockets/qwebsockethandshakerequest_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-everywhere-src-5.11.1/include/QtWebSockets/5.11.1/QtWebSockets/private/qwebsockethandshakeresponse_p.h
new/qtwebsockets-everywhere-src-5.11.2/include/QtWebSockets/5.11.1/QtWebSockets/private/qwebsockethandshakeresponse_p.h
---
old/qtwebsockets-everywhere-src-5.11.1/include/QtWebSockets/5.11.1/QtWebSockets/private/qwebsockethandshakeresponse_p.h
2018-06-09 13:08:57.000000000 +0200
+++
new/qtwebsockets-everywhere-src-5.11.2/include/QtWebSockets/5.11.1/QtWebSockets/private/qwebsockethandshakeresponse_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/websockets/qwebsockethandshakeresponse_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-everywhere-src-5.11.1/include/QtWebSockets/5.11.1/QtWebSockets/private/qwebsocketprotocol_p.h
new/qtwebsockets-everywhere-src-5.11.2/include/QtWebSockets/5.11.1/QtWebSockets/private/qwebsocketprotocol_p.h
---
old/qtwebsockets-everywhere-src-5.11.1/include/QtWebSockets/5.11.1/QtWebSockets/private/qwebsocketprotocol_p.h
2018-06-09 13:08:57.000000000 +0200
+++
new/qtwebsockets-everywhere-src-5.11.2/include/QtWebSockets/5.11.1/QtWebSockets/private/qwebsocketprotocol_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/websockets/qwebsocketprotocol_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-everywhere-src-5.11.1/include/QtWebSockets/5.11.1/QtWebSockets/private/qwebsocketserver_p.h
new/qtwebsockets-everywhere-src-5.11.2/include/QtWebSockets/5.11.1/QtWebSockets/private/qwebsocketserver_p.h
---
old/qtwebsockets-everywhere-src-5.11.1/include/QtWebSockets/5.11.1/QtWebSockets/private/qwebsocketserver_p.h
2018-06-09 13:08:57.000000000 +0200
+++
new/qtwebsockets-everywhere-src-5.11.2/include/QtWebSockets/5.11.1/QtWebSockets/private/qwebsocketserver_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/websockets/qwebsocketserver_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-everywhere-src-5.11.1/include/QtWebSockets/5.11.2/QtWebSockets/private/qdefaultmaskgenerator_p.h
new/qtwebsockets-everywhere-src-5.11.2/include/QtWebSockets/5.11.2/QtWebSockets/private/qdefaultmaskgenerator_p.h
---
old/qtwebsockets-everywhere-src-5.11.1/include/QtWebSockets/5.11.2/QtWebSockets/private/qdefaultmaskgenerator_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtwebsockets-everywhere-src-5.11.2/include/QtWebSockets/5.11.2/QtWebSockets/private/qdefaultmaskgenerator_p.h
2018-08-29 14:01:21.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/websockets/qdefaultmaskgenerator_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-everywhere-src-5.11.1/include/QtWebSockets/5.11.2/QtWebSockets/private/qsslserver_p.h
new/qtwebsockets-everywhere-src-5.11.2/include/QtWebSockets/5.11.2/QtWebSockets/private/qsslserver_p.h
---
old/qtwebsockets-everywhere-src-5.11.1/include/QtWebSockets/5.11.2/QtWebSockets/private/qsslserver_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtwebsockets-everywhere-src-5.11.2/include/QtWebSockets/5.11.2/QtWebSockets/private/qsslserver_p.h
2018-08-29 14:01:21.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/websockets/qsslserver_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-everywhere-src-5.11.1/include/QtWebSockets/5.11.2/QtWebSockets/private/qwebsocket_p.h
new/qtwebsockets-everywhere-src-5.11.2/include/QtWebSockets/5.11.2/QtWebSockets/private/qwebsocket_p.h
---
old/qtwebsockets-everywhere-src-5.11.1/include/QtWebSockets/5.11.2/QtWebSockets/private/qwebsocket_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtwebsockets-everywhere-src-5.11.2/include/QtWebSockets/5.11.2/QtWebSockets/private/qwebsocket_p.h
2018-08-29 14:01:21.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/websockets/qwebsocket_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-everywhere-src-5.11.1/include/QtWebSockets/5.11.2/QtWebSockets/private/qwebsocketcorsauthenticator_p.h
new/qtwebsockets-everywhere-src-5.11.2/include/QtWebSockets/5.11.2/QtWebSockets/private/qwebsocketcorsauthenticator_p.h
---
old/qtwebsockets-everywhere-src-5.11.1/include/QtWebSockets/5.11.2/QtWebSockets/private/qwebsocketcorsauthenticator_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtwebsockets-everywhere-src-5.11.2/include/QtWebSockets/5.11.2/QtWebSockets/private/qwebsocketcorsauthenticator_p.h
2018-08-29 14:01:21.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/websockets/qwebsocketcorsauthenticator_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-everywhere-src-5.11.1/include/QtWebSockets/5.11.2/QtWebSockets/private/qwebsocketdataprocessor_p.h
new/qtwebsockets-everywhere-src-5.11.2/include/QtWebSockets/5.11.2/QtWebSockets/private/qwebsocketdataprocessor_p.h
---
old/qtwebsockets-everywhere-src-5.11.1/include/QtWebSockets/5.11.2/QtWebSockets/private/qwebsocketdataprocessor_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtwebsockets-everywhere-src-5.11.2/include/QtWebSockets/5.11.2/QtWebSockets/private/qwebsocketdataprocessor_p.h
2018-08-29 14:01:21.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/websockets/qwebsocketdataprocessor_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-everywhere-src-5.11.1/include/QtWebSockets/5.11.2/QtWebSockets/private/qwebsocketframe_p.h
new/qtwebsockets-everywhere-src-5.11.2/include/QtWebSockets/5.11.2/QtWebSockets/private/qwebsocketframe_p.h
---
old/qtwebsockets-everywhere-src-5.11.1/include/QtWebSockets/5.11.2/QtWebSockets/private/qwebsocketframe_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtwebsockets-everywhere-src-5.11.2/include/QtWebSockets/5.11.2/QtWebSockets/private/qwebsocketframe_p.h
2018-08-29 14:01:21.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/websockets/qwebsocketframe_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-everywhere-src-5.11.1/include/QtWebSockets/5.11.2/QtWebSockets/private/qwebsockethandshakerequest_p.h
new/qtwebsockets-everywhere-src-5.11.2/include/QtWebSockets/5.11.2/QtWebSockets/private/qwebsockethandshakerequest_p.h
---
old/qtwebsockets-everywhere-src-5.11.1/include/QtWebSockets/5.11.2/QtWebSockets/private/qwebsockethandshakerequest_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtwebsockets-everywhere-src-5.11.2/include/QtWebSockets/5.11.2/QtWebSockets/private/qwebsockethandshakerequest_p.h
2018-08-29 14:01:21.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/websockets/qwebsockethandshakerequest_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-everywhere-src-5.11.1/include/QtWebSockets/5.11.2/QtWebSockets/private/qwebsockethandshakeresponse_p.h
new/qtwebsockets-everywhere-src-5.11.2/include/QtWebSockets/5.11.2/QtWebSockets/private/qwebsockethandshakeresponse_p.h
---
old/qtwebsockets-everywhere-src-5.11.1/include/QtWebSockets/5.11.2/QtWebSockets/private/qwebsockethandshakeresponse_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtwebsockets-everywhere-src-5.11.2/include/QtWebSockets/5.11.2/QtWebSockets/private/qwebsockethandshakeresponse_p.h
2018-08-29 14:01:21.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/websockets/qwebsockethandshakeresponse_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-everywhere-src-5.11.1/include/QtWebSockets/5.11.2/QtWebSockets/private/qwebsocketprotocol_p.h
new/qtwebsockets-everywhere-src-5.11.2/include/QtWebSockets/5.11.2/QtWebSockets/private/qwebsocketprotocol_p.h
---
old/qtwebsockets-everywhere-src-5.11.1/include/QtWebSockets/5.11.2/QtWebSockets/private/qwebsocketprotocol_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtwebsockets-everywhere-src-5.11.2/include/QtWebSockets/5.11.2/QtWebSockets/private/qwebsocketprotocol_p.h
2018-08-29 14:01:21.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/websockets/qwebsocketprotocol_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-everywhere-src-5.11.1/include/QtWebSockets/5.11.2/QtWebSockets/private/qwebsocketserver_p.h
new/qtwebsockets-everywhere-src-5.11.2/include/QtWebSockets/5.11.2/QtWebSockets/private/qwebsocketserver_p.h
---
old/qtwebsockets-everywhere-src-5.11.1/include/QtWebSockets/5.11.2/QtWebSockets/private/qwebsocketserver_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtwebsockets-everywhere-src-5.11.2/include/QtWebSockets/5.11.2/QtWebSockets/private/qwebsocketserver_p.h
2018-08-29 14:01:21.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/websockets/qwebsocketserver_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-everywhere-src-5.11.1/include/QtWebSockets/qtwebsocketsversion.h
new/qtwebsockets-everywhere-src-5.11.2/include/QtWebSockets/qtwebsocketsversion.h
---
old/qtwebsockets-everywhere-src-5.11.1/include/QtWebSockets/qtwebsocketsversion.h
2018-06-18 09:47:03.000000000 +0200
+++
new/qtwebsockets-everywhere-src-5.11.2/include/QtWebSockets/qtwebsocketsversion.h
2018-09-14 18:37:31.000000000 +0200
@@ -2,8 +2,8 @@
#ifndef QT_QTWEBSOCKETS_VERSION_H
#define QT_QTWEBSOCKETS_VERSION_H
-#define QTWEBSOCKETS_VERSION_STR "5.11.1"
+#define QTWEBSOCKETS_VERSION_STR "5.11.2"
-#define QTWEBSOCKETS_VERSION 0x050B01
+#define QTWEBSOCKETS_VERSION 0x050B02
#endif // QT_QTWEBSOCKETS_VERSION_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-everywhere-src-5.11.1/src/websockets/qwebsocket.cpp
new/qtwebsockets-everywhere-src-5.11.2/src/websockets/qwebsocket.cpp
--- old/qtwebsockets-everywhere-src-5.11.1/src/websockets/qwebsocket.cpp
2018-06-09 13:08:57.000000000 +0200
+++ new/qtwebsockets-everywhere-src-5.11.2/src/websockets/qwebsocket.cpp
2018-08-29 14:01:21.000000000 +0200
@@ -402,7 +402,10 @@
Any data in the write buffer is flushed before the socket is closed.
The \a closeCode is a QWebSocketProtocol::CloseCode indicating the reason
to close, and
- \a reason describes the reason of the closure more in detail
+ \a reason describes the reason of the closure more in detail. All control
+ frames, including the Close frame, are limited to 125 bytes. Since two of
+ these are used for \a closeCode the maximum length of \a reason is 123! If
+ \a reason exceeds this limit it will be truncated.
*/
void QWebSocket::close(QWebSocketProtocol::CloseCode closeCode, const QString
&reason)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-everywhere-src-5.11.1/src/websockets/qwebsocket_p.cpp
new/qtwebsockets-everywhere-src-5.11.2/src/websockets/qwebsocket_p.cpp
--- old/qtwebsockets-everywhere-src-5.11.1/src/websockets/qwebsocket_p.cpp
2018-06-09 13:08:57.000000000 +0200
+++ new/qtwebsockets-everywhere-src-5.11.2/src/websockets/qwebsocket_p.cpp
2018-08-29 14:01:21.000000000 +0200
@@ -334,12 +334,14 @@
if (!m_isClosingHandshakeSent) {
Q_Q(QWebSocket);
m_closeCode = closeCode;
- m_closeReason = reason;
+ // 125 is the maximum length of a control frame, and 2 bytes are used
for the close code:
+ const QByteArray reasonUtf8 = reason.toUtf8().left(123);
+ m_closeReason = QString::fromUtf8(reasonUtf8);
const quint16 code = qToBigEndian<quint16>(closeCode);
QByteArray payload;
payload.append(static_cast<const char *>(static_cast<const void
*>(&code)), 2);
- if (!reason.isEmpty())
- payload.append(reason.toUtf8());
+ if (!reasonUtf8.isEmpty())
+ payload.append(reasonUtf8);
quint32 maskingKey = 0;
if (m_mustMask) {
maskingKey = generateMaskingKey();
@@ -347,6 +349,8 @@
}
QByteArray frame = getFrameHeader(QWebSocketProtocol::OpCodeClose,
payload.size(), maskingKey, true);
+
+ Q_ASSERT(payload.length() <= 125);
frame.append(payload);
m_pSocket->write(frame);
m_pSocket->flush();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-everywhere-src-5.11.1/tests/auto/websockets/handshakeresponse/tst_handshakeresponse.cpp
new/qtwebsockets-everywhere-src-5.11.2/tests/auto/websockets/handshakeresponse/tst_handshakeresponse.cpp
---
old/qtwebsockets-everywhere-src-5.11.1/tests/auto/websockets/handshakeresponse/tst_handshakeresponse.cpp
2018-06-09 13:08:57.000000000 +0200
+++
new/qtwebsockets-everywhere-src-5.11.2/tests/auto/websockets/handshakeresponse/tst_handshakeresponse.cpp
2018-08-29 14:01:21.000000000 +0200
@@ -29,6 +29,7 @@
#include <QtTest/qtestcase.h>
#include <QtCore/QDebug>
#include <QtCore/QByteArray>
+#include <QtCore/QRegularExpression>
#include <QtCore/QtEndian>
#include "private/qwebsockethandshakerequest_p.h"
@@ -97,7 +98,7 @@
output << response;
QStringList list = data.split("\r\n");
- int index = list.indexOf(QRegExp("Date:.*"));
+ int index = list.indexOf(QRegularExpression("Date:.*"));
QVERIFY(index > -1);
QVERIFY(QLocale::c().toDateTime(list[index], "'Date:' ddd, dd MMM yyyy
hh:mm:ss 'GMT'").isValid());
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-everywhere-src-5.11.1/tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp
new/qtwebsockets-everywhere-src-5.11.2/tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp
---
old/qtwebsockets-everywhere-src-5.11.1/tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp
2018-06-09 13:08:57.000000000 +0200
+++
new/qtwebsockets-everywhere-src-5.11.2/tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp
2018-08-29 14:01:21.000000000 +0200
@@ -143,6 +143,7 @@
#ifndef QT_NO_NETWORKPROXY
void tst_setProxy();
#endif
+ void overlongCloseReason();
};
tst_QWebSocket::tst_QWebSocket()
@@ -724,6 +725,34 @@
socket.setProxy(proxy);
QCOMPARE(socket.proxy(), proxy);
}
+
+void tst_QWebSocket::overlongCloseReason()
+{
+ EchoServer echoServer;
+
+ QWebSocket socket;
+
+ //should return 0 because socket is not open yet
+ QCOMPARE(socket.sendTextMessage(QStringLiteral("1234")), 0);
+
+ QSignalSpy socketConnectedSpy(&socket, SIGNAL(connected()));
+ QSignalSpy socketDisconnectedSpy(&socket, SIGNAL(disconnected()));
+ QSignalSpy serverConnectedSpy(&echoServer, SIGNAL(newConnection(QUrl)));
+
+ QUrl url = QUrl(QStringLiteral("ws://") +
echoServer.hostAddress().toString() +
+ QStringLiteral(":") + QString::number(echoServer.port()));
+ socket.open(url);
+ QTRY_COMPARE(socketConnectedSpy.count(), 1);
+ QTRY_COMPARE(serverConnectedSpy.count(), 1);
+
+ const QString reason(200, QChar::fromLatin1('a'));
+ socket.close(QWebSocketProtocol::CloseCodeGoingAway, reason);
+ QCOMPARE(socket.closeCode(), QWebSocketProtocol::CloseCodeGoingAway);
+ // Max length of a control frame is 125, but 2 bytes are used for the
close code:
+ QCOMPARE(socket.closeReason().length(), 123);
+ QCOMPARE(socket.closeReason(), reason.leftRef(123));
+ QTRY_COMPARE(socketDisconnectedSpy.count(), 1);
+}
#endif // QT_NO_NETWORKPROXY
QTEST_MAIN(tst_QWebSocket)
