diff options
79 files changed, 1080 insertions, 585 deletions
diff --git a/LGPL_EXCEPTION.txt b/LGPL_EXCEPTION.txt deleted file mode 100644 index 7364304..0000000 --- a/LGPL_EXCEPTION.txt +++ /dev/null @@ -1,22 +0,0 @@ -Pelagicore LGPL Exception version 1.1 - -As an additional permission to the GNU Lesser General Public License version -2.1, the object code form of a "work that uses the Library" may incorporate -material from a header file that is part of the Library. You may distribute -such object code under terms of your choice, provided that: - (i) the header files of the Library have not been modified; and - (ii) the incorporated material is limited to numerical parameters, data - structure layouts, accessors, macros, inline functions and - templates; and - (iii) you comply with the terms of Section 6 of the GNU Lesser General - Public License version 2.1. - -Moreover, you may apply this exception to a modified version of the Library, -provided that such modification does not involve copying material from the -Library into the modified Library's header files unless such material is -limited to (i) numerical parameters; (ii) data structure layouts; -(iii) accessors; and (iv) small macros, templates and inline functions of -five lines or less in length. - -Furthermore, you are not required to apply this additional permission to a -modified version of the Library. diff --git a/LICENSE.FDL b/LICENSE.FDL new file mode 100644 index 0000000..938bb8d --- /dev/null +++ b/LICENSE.FDL @@ -0,0 +1,450 @@ + GNU Free Documentation License + Version 1.3, 3 November 2008 + + + Copyright (C) 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc. + <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +0. PREAMBLE + +The purpose of this License is to make a manual, textbook, or other +functional and useful document "free" in the sense of freedom: to +assure everyone the effective freedom to copy and redistribute it, +with or without modifying it, either commercially or noncommercially. +Secondarily, this License preserves for the author and publisher a way +to get credit for their work, while not being considered responsible +for modifications made by others. + +This License is a kind of "copyleft", which means that derivative +works of the document must themselves be free in the same sense. It +complements the GNU General Public License, which is a copyleft +license designed for free software. + +We have designed this License in order to use it for manuals for free +software, because free software needs free documentation: a free +program should come with manuals providing the same freedoms that the +software does. But this License is not limited to software manuals; +it can be used for any textual work, regardless of subject matter or +whether it is published as a printed book. We recommend this License +principally for works whose purpose is instruction or reference. + + +1. APPLICABILITY AND DEFINITIONS + +This License applies to any manual or other work, in any medium, that +contains a notice placed by the copyright holder saying it can be +distributed under the terms of this License. Such a notice grants a +world-wide, royalty-free license, unlimited in duration, to use that +work under the conditions stated herein. The "Document", below, +refers to any such manual or work. Any member of the public is a +licensee, and is addressed as "you". You accept the license if you +copy, modify or distribute the work in a way requiring permission +under copyright law. + +A "Modified Version" of the Document means any work containing the +Document or a portion of it, either copied verbatim, or with +modifications and/or translated into another language. + +A "Secondary Section" is a named appendix or a front-matter section of +the Document that deals exclusively with the relationship of the +publishers or authors of the Document to the Document's overall +subject (or to related matters) and contains nothing that could fall +directly within that overall subject. (Thus, if the Document is in +part a textbook of mathematics, a Secondary Section may not explain +any mathematics.) The relationship could be a matter of historical +connection with the subject or with related matters, or of legal, +commercial, philosophical, ethical or political position regarding +them. + +The "Invariant Sections" are certain Secondary Sections whose titles +are designated, as being those of Invariant Sections, in the notice +that says that the Document is released under this License. If a +section does not fit the above definition of Secondary then it is not +allowed to be designated as Invariant. The Document may contain zero +Invariant Sections. If the Document does not identify any Invariant +Sections then there are none. + +The "Cover Texts" are certain short passages of text that are listed, +as Front-Cover Texts or Back-Cover Texts, in the notice that says that +the Document is released under this License. A Front-Cover Text may +be at most 5 words, and a Back-Cover Text may be at most 25 words. + +A "Transparent" copy of the Document means a machine-readable copy, +represented in a format whose specification is available to the +general public, that is suitable for revising the document +straightforwardly with generic text editors or (for images composed of +pixels) generic paint programs or (for drawings) some widely available +drawing editor, and that is suitable for input to text formatters or +for automatic translation to a variety of formats suitable for input +to text formatters. A copy made in an otherwise Transparent file +format whose markup, or absence of markup, has been arranged to thwart +or discourage subsequent modification by readers is not Transparent. +An image format is not Transparent if used for any substantial amount +of text. A copy that is not "Transparent" is called "Opaque". + +Examples of suitable formats for Transparent copies include plain +ASCII without markup, Texinfo input format, LaTeX input format, SGML +or XML using a publicly available DTD, and standard-conforming simple +HTML, PostScript or PDF designed for human modification. Examples of +transparent image formats include PNG, XCF and JPG. Opaque formats +include proprietary formats that can be read and edited only by +proprietary word processors, SGML or XML for which the DTD and/or +processing tools are not generally available, and the +machine-generated HTML, PostScript or PDF produced by some word +processors for output purposes only. + +The "Title Page" means, for a printed book, the title page itself, +plus such following pages as are needed to hold, legibly, the material +this License requires to appear in the title page. For works in +formats which do not have any title page as such, "Title Page" means +the text near the most prominent appearance of the work's title, +preceding the beginning of the body of the text. + +The "publisher" means any person or entity that distributes copies of +the Document to the public. + +A section "Entitled XYZ" means a named subunit of the Document whose +title either is precisely XYZ or contains XYZ in parentheses following +text that translates XYZ in another language. (Here XYZ stands for a +specific section name mentioned below, such as "Acknowledgements", +"Dedications", "Endorsements", or "History".) To "Preserve the Title" +of such a section when you modify the Document means that it remains a +section "Entitled XYZ" according to this definition. + +The Document may include Warranty Disclaimers next to the notice which +states that this License applies to the Document. These Warranty +Disclaimers are considered to be included by reference in this +License, but only as regards disclaiming warranties: any other +implication that these Warranty Disclaimers may have is void and has +no effect on the meaning of this License. + +2. VERBATIM COPYING + +You may copy and distribute the Document in any medium, either +commercially or noncommercially, provided that this License, the +copyright notices, and the license notice saying this License applies +to the Document are reproduced in all copies, and that you add no +other conditions whatsoever to those of this License. You may not use +technical measures to obstruct or control the reading or further +copying of the copies you make or distribute. However, you may accept +compensation in exchange for copies. If you distribute a large enough +number of copies you must also follow the conditions in section 3. + +You may also lend copies, under the same conditions stated above, and +you may publicly display copies. + + +3. COPYING IN QUANTITY + +If you publish printed copies (or copies in media that commonly have +printed covers) of the Document, numbering more than 100, and the +Document's license notice requires Cover Texts, you must enclose the +copies in covers that carry, clearly and legibly, all these Cover +Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on +the back cover. Both covers must also clearly and legibly identify +you as the publisher of these copies. The front cover must present +the full title with all words of the title equally prominent and +visible. You may add other material on the covers in addition. +Copying with changes limited to the covers, as long as they preserve +the title of the Document and satisfy these conditions, can be treated +as verbatim copying in other respects. + +If the required texts for either cover are too voluminous to fit +legibly, you should put the first ones listed (as many as fit +reasonably) on the actual cover, and continue the rest onto adjacent +pages. + +If you publish or distribute Opaque copies of the Document numbering +more than 100, you must either include a machine-readable Transparent +copy along with each Opaque copy, or state in or with each Opaque copy +a computer-network location from which the general network-using +public has access to download using public-standard network protocols +a complete Transparent copy of the Document, free of added material. +If you use the latter option, you must take reasonably prudent steps, +when you begin distribution of Opaque copies in quantity, to ensure +that this Transparent copy will remain thus accessible at the stated +location until at least one year after the last time you distribute an +Opaque copy (directly or through your agents or retailers) of that +edition to the public. + +It is requested, but not required, that you contact the authors of the +Document well before redistributing any large number of copies, to +give them a chance to provide you with an updated version of the +Document. + + +4. MODIFICATIONS + +You may copy and distribute a Modified Version of the Document under +the conditions of sections 2 and 3 above, provided that you release +the Modified Version under precisely this License, with the Modified +Version filling the role of the Document, thus licensing distribution +and modification of the Modified Version to whoever possesses a copy +of it. In addition, you must do these things in the Modified Version: + +A. Use in the Title Page (and on the covers, if any) a title distinct + from that of the Document, and from those of previous versions + (which should, if there were any, be listed in the History section + of the Document). You may use the same title as a previous version + if the original publisher of that version gives permission. +B. List on the Title Page, as authors, one or more persons or entities + responsible for authorship of the modifications in the Modified + Version, together with at least five of the principal authors of the + Document (all of its principal authors, if it has fewer than five), + unless they release you from this requirement. +C. State on the Title page the name of the publisher of the + Modified Version, as the publisher. +D. Preserve all the copyright notices of the Document. +E. Add an appropriate copyright notice for your modifications + adjacent to the other copyright notices. +F. Include, immediately after the copyright notices, a license notice + giving the public permission to use the Modified Version under the + terms of this License, in the form shown in the Addendum below. +G. Preserve in that license notice the full lists of Invariant Sections + and required Cover Texts given in the Document's license notice. +H. Include an unaltered copy of this License. +I. Preserve the section Entitled "History", Preserve its Title, and add + to it an item stating at least the title, year, new authors, and + publisher of the Modified Version as given on the Title Page. If + there is no section Entitled "History" in the Document, create one + stating the title, year, authors, and publisher of the Document as + given on its Title Page, then add an item describing the Modified + Version as stated in the previous sentence. +J. Preserve the network location, if any, given in the Document for + public access to a Transparent copy of the Document, and likewise + the network locations given in the Document for previous versions + it was based on. These may be placed in the "History" section. + You may omit a network location for a work that was published at + least four years before the Document itself, or if the original + publisher of the version it refers to gives permission. +K. For any section Entitled "Acknowledgements" or "Dedications", + Preserve the Title of the section, and preserve in the section all + the substance and tone of each of the contributor acknowledgements + and/or dedications given therein. +L. Preserve all the Invariant Sections of the Document, + unaltered in their text and in their titles. Section numbers + or the equivalent are not considered part of the section titles. +M. Delete any section Entitled "Endorsements". Such a section + may not be included in the Modified Version. +N. Do not retitle any existing section to be Entitled "Endorsements" + or to conflict in title with any Invariant Section. +O. Preserve any Warranty Disclaimers. + +If the Modified Version includes new front-matter sections or +appendices that qualify as Secondary Sections and contain no material +copied from the Document, you may at your option designate some or all +of these sections as invariant. To do this, add their titles to the +list of Invariant Sections in the Modified Version's license notice. +These titles must be distinct from any other section titles. + +You may add a section Entitled "Endorsements", provided it contains +nothing but endorsements of your Modified Version by various +parties--for example, statements of peer review or that the text has +been approved by an organization as the authoritative definition of a +standard. + +You may add a passage of up to five words as a Front-Cover Text, and a +passage of up to 25 words as a Back-Cover Text, to the end of the list +of Cover Texts in the Modified Version. Only one passage of +Front-Cover Text and one of Back-Cover Text may be added by (or +through arrangements made by) any one entity. If the Document already +includes a cover text for the same cover, previously added by you or +by arrangement made by the same entity you are acting on behalf of, +you may not add another; but you may replace the old one, on explicit +permission from the previous publisher that added the old one. + +The author(s) and publisher(s) of the Document do not by this License +give permission to use their names for publicity for or to assert or +imply endorsement of any Modified Version. + + +5. COMBINING DOCUMENTS + +You may combine the Document with other documents released under this +License, under the terms defined in section 4 above for modified +versions, provided that you include in the combination all of the +Invariant Sections of all of the original documents, unmodified, and +list them all as Invariant Sections of your combined work in its +license notice, and that you preserve all their Warranty Disclaimers. + +The combined work need only contain one copy of this License, and +multiple identical Invariant Sections may be replaced with a single +copy. If there are multiple Invariant Sections with the same name but +different contents, make the title of each such section unique by +adding at the end of it, in parentheses, the name of the original +author or publisher of that section if known, or else a unique number. +Make the same adjustment to the section titles in the list of +Invariant Sections in the license notice of the combined work. + +In the combination, you must combine any sections Entitled "History" +in the various original documents, forming one section Entitled +"History"; likewise combine any sections Entitled "Acknowledgements", +and any sections Entitled "Dedications". You must delete all sections +Entitled "Endorsements". + + +6. COLLECTIONS OF DOCUMENTS + +You may make a collection consisting of the Document and other +documents released under this License, and replace the individual +copies of this License in the various documents with a single copy +that is included in the collection, provided that you follow the rules +of this License for verbatim copying of each of the documents in all +other respects. + +You may extract a single document from such a collection, and +distribute it individually under this License, provided you insert a +copy of this License into the extracted document, and follow this +License in all other respects regarding verbatim copying of that +document. + + +7. AGGREGATION WITH INDEPENDENT WORKS + +A compilation of the Document or its derivatives with other separate +and independent documents or works, in or on a volume of a storage or +distribution medium, is called an "aggregate" if the copyright +resulting from the compilation is not used to limit the legal rights +of the compilation's users beyond what the individual works permit. +When the Document is included in an aggregate, this License does not +apply to the other works in the aggregate which are not themselves +derivative works of the Document. + +If the Cover Text requirement of section 3 is applicable to these +copies of the Document, then if the Document is less than one half of +the entire aggregate, the Document's Cover Texts may be placed on +covers that bracket the Document within the aggregate, or the +electronic equivalent of covers if the Document is in electronic form. +Otherwise they must appear on printed covers that bracket the whole +aggregate. + + +8. TRANSLATION + +Translation is considered a kind of modification, so you may +distribute translations of the Document under the terms of section 4. +Replacing Invariant Sections with translations requires special +permission from their copyright holders, but you may include +translations of some or all Invariant Sections in addition to the +original versions of these Invariant Sections. You may include a +translation of this License, and all the license notices in the +Document, and any Warranty Disclaimers, provided that you also include +the original English version of this License and the original versions +of those notices and disclaimers. In case of a disagreement between +the translation and the original version of this License or a notice +or disclaimer, the original version will prevail. + +If a section in the Document is Entitled "Acknowledgements", +"Dedications", or "History", the requirement (section 4) to Preserve +its Title (section 1) will typically require changing the actual +title. + + +9. TERMINATION + +You may not copy, modify, sublicense, or distribute the Document +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense, or distribute it is void, and +will automatically terminate your rights under this License. + +However, if you cease all violation of this License, then your license +from a particular copyright holder is reinstated (a) provisionally, +unless and until the copyright holder explicitly and finally +terminates your license, and (b) permanently, if the copyright holder +fails to notify you of the violation by some reasonable means prior to +60 days after the cessation. + +Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + +Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, receipt of a copy of some or all of the same material does +not give you any rights to use it. + + +10. FUTURE REVISIONS OF THIS LICENSE + +The Free Software Foundation may publish new, revised versions of the +GNU Free Documentation License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in +detail to address new problems or concerns. See +http://www.gnu.org/copyleft/. + +Each version of the License is given a distinguishing version number. +If the Document specifies that a particular numbered version of this +License "or any later version" applies to it, you have the option of +following the terms and conditions either of that specified version or +of any later version that has been published (not as a draft) by the +Free Software Foundation. If the Document does not specify a version +number of this License, you may choose any version ever published (not +as a draft) by the Free Software Foundation. If the Document +specifies that a proxy can decide which future versions of this +License can be used, that proxy's public statement of acceptance of a +version permanently authorizes you to choose that version for the +Document. + +11. RELICENSING + +"Massive Multiauthor Collaboration Site" (or "MMC Site") means any +World Wide Web server that publishes copyrightable works and also +provides prominent facilities for anybody to edit those works. A +public wiki that anybody can edit is an example of such a server. A +"Massive Multiauthor Collaboration" (or "MMC") contained in the site +means any set of copyrightable works thus published on the MMC site. + +"CC-BY-SA" means the Creative Commons Attribution-Share Alike 3.0 +license published by Creative Commons Corporation, a not-for-profit +corporation with a principal place of business in San Francisco, +California, as well as future copyleft versions of that license +published by that same organization. + +"Incorporate" means to publish or republish a Document, in whole or in +part, as part of another Document. + +An MMC is "eligible for relicensing" if it is licensed under this +License, and if all works that were first published under this License +somewhere other than this MMC, and subsequently incorporated in whole or +in part into the MMC, (1) had no cover texts or invariant sections, and +(2) were thus incorporated prior to November 1, 2008. + +The operator of an MMC Site may republish an MMC contained in the site +under CC-BY-SA on the same site at any time before August 1, 2009, +provided the MMC is eligible for relicensing. + + +ADDENDUM: How to use this License for your documents + +To use this License in a document you have written, include a copy of +the License in the document and put the following copyright and +license notices just after the title page: + + Copyright (c) YEAR YOUR NAME. + Permission is granted to copy, distribute and/or modify this document + under the terms of the GNU Free Documentation License, Version 1.3 + or any later version published by the Free Software Foundation; + with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. + A copy of the license is included in the section entitled "GNU + Free Documentation License". + +If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts, +replace the "with...Texts." line with this: + + with the Invariant Sections being LIST THEIR TITLES, with the + Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST. + +If you have Invariant Sections without Cover Texts, or some other +combination of the three, merge those two alternatives to suit the +situation. + +If your document contains nontrivial examples of program code, we +recommend releasing these examples in parallel under your choice of +free software license, such as the GNU General Public License, +to permit their use in free software. diff --git a/config.tests/dlt/main.cpp b/config.tests/dlt/main.cpp index 6e4c626..a54fc1c 100644 --- a/config.tests/dlt/main.cpp +++ b/config.tests/dlt/main.cpp @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3-PELAGICORE$ +** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/geniviextras/qdlt/loggingcategories.cpp b/examples/geniviextras/qdlt/loggingcategories.cpp index bf1bf02..a6fa65d 100644 --- a/examples/geniviextras/qdlt/loggingcategories.cpp +++ b/examples/geniviextras/qdlt/loggingcategories.cpp @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:BSD-PELAGICORE$ +** $QT_BEGIN_LICENSE:BSD-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** BSD License Usage ** Alternatively, you may use this file under the terms of the BSD license @@ -26,7 +27,7 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Pelagicore AG nor the names of its +** * Neither the name of The Qt Company Ltd nor the names of its ** contributors may be used to endorse or promote products derived ** from this software without specific prior written permission. ** @@ -49,7 +50,6 @@ ** ****************************************************************************/ - #include "loggingcategories.h" #include <QtGeniviExtras/QtDlt> diff --git a/examples/geniviextras/qdlt/loggingcategories.h b/examples/geniviextras/qdlt/loggingcategories.h index f158656..c0c17ed 100644 --- a/examples/geniviextras/qdlt/loggingcategories.h +++ b/examples/geniviextras/qdlt/loggingcategories.h @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:BSD-PELAGICORE$ +** $QT_BEGIN_LICENSE:BSD-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** BSD License Usage ** Alternatively, you may use this file under the terms of the BSD license @@ -26,7 +27,7 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Pelagicore AG nor the names of its +** * Neither the name of The Qt Company Ltd nor the names of its ** contributors may be used to endorse or promote products derived ** from this software without specific prior written permission. ** @@ -49,7 +50,6 @@ ** ****************************************************************************/ - #ifndef LOGGINGCATEGORIES_H #define LOGGINGCATEGORIES_H diff --git a/examples/geniviextras/qdlt/main.cpp b/examples/geniviextras/qdlt/main.cpp index 62e7019..55d30b1 100644 --- a/examples/geniviextras/qdlt/main.cpp +++ b/examples/geniviextras/qdlt/main.cpp @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:BSD-PELAGICORE$ +** $QT_BEGIN_LICENSE:BSD-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** BSD License Usage ** Alternatively, you may use this file under the terms of the BSD license @@ -26,7 +27,7 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Pelagicore AG nor the names of its +** * Neither the name of The Qt Company Ltd nor the names of its ** contributors may be used to endorse or promote products derived ** from this software without specific prior written permission. ** @@ -49,7 +50,6 @@ ** ****************************************************************************/ - #include <QCoreApplication> #include <QTimer> #include <QtGeniviExtras/QtDlt> diff --git a/examples/vehiclefunctions/climate_qml/main.cpp b/examples/vehiclefunctions/climate_qml/main.cpp index 6b7d8d1..422d692 100644 --- a/examples/vehiclefunctions/climate_qml/main.cpp +++ b/examples/vehiclefunctions/climate_qml/main.cpp @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:BSD-PELAGICORE$ +** $QT_BEGIN_LICENSE:BSD-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** BSD License Usage ** Alternatively, you may use this file under the terms of the BSD license @@ -26,7 +27,7 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Pelagicore AG nor the names of its +** * Neither the name of The Qt Company Ltd nor the names of its ** contributors may be used to endorse or promote products derived ** from this software without specific prior written permission. ** @@ -49,7 +50,6 @@ ** ****************************************************************************/ - #include <QApplication> #include <QQmlApplicationEngine> diff --git a/examples/vehiclefunctions/climate_qml/main.qml b/examples/vehiclefunctions/climate_qml/main.qml index a43f10f..2ac10f0 100644 --- a/examples/vehiclefunctions/climate_qml/main.qml +++ b/examples/vehiclefunctions/climate_qml/main.qml @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:BSD-PELAGICORE$ +** $QT_BEGIN_LICENSE:BSD-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** BSD License Usage ** Alternatively, you may use this file under the terms of the BSD license @@ -26,7 +27,7 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Pelagicore AG nor the names of its +** * Neither the name of The Qt Company Ltd nor the names of its ** contributors may be used to endorse or promote products derived ** from this software without specific prior written permission. ** @@ -49,7 +50,6 @@ ** ****************************************************************************/ - import QtQuick 2.4 import QtQuick.Controls 1.3 import QtQuick.Window 2.2 diff --git a/examples/vehiclefunctions/climate_widget/main.cpp b/examples/vehiclefunctions/climate_widget/main.cpp index a9b3c74..97dd735 100644 --- a/examples/vehiclefunctions/climate_widget/main.cpp +++ b/examples/vehiclefunctions/climate_widget/main.cpp @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:BSD-PELAGICORE$ +** $QT_BEGIN_LICENSE:BSD-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** BSD License Usage ** Alternatively, you may use this file under the terms of the BSD license @@ -26,7 +27,7 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Pelagicore AG nor the names of its +** * Neither the name of The Qt Company Ltd nor the names of its ** contributors may be used to endorse or promote products derived ** from this software without specific prior written permission. ** @@ -49,7 +50,6 @@ ** ****************************************************************************/ - #include "mainwindow.h" #include <QApplication> diff --git a/examples/vehiclefunctions/climate_widget/mainwindow.cpp b/examples/vehiclefunctions/climate_widget/mainwindow.cpp index 0208a4b..af43331 100644 --- a/examples/vehiclefunctions/climate_widget/mainwindow.cpp +++ b/examples/vehiclefunctions/climate_widget/mainwindow.cpp @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:BSD-PELAGICORE$ +** $QT_BEGIN_LICENSE:BSD-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** BSD License Usage ** Alternatively, you may use this file under the terms of the BSD license @@ -26,7 +27,7 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Pelagicore AG nor the names of its +** * Neither the name of The Qt Company Ltd nor the names of its ** contributors may be used to endorse or promote products derived ** from this software without specific prior written permission. ** @@ -49,7 +50,6 @@ ** ****************************************************************************/ - #include "mainwindow.h" #include "ui_mainwindow.h" diff --git a/examples/vehiclefunctions/climate_widget/mainwindow.h b/examples/vehiclefunctions/climate_widget/mainwindow.h index 8f46a31..af17946 100644 --- a/examples/vehiclefunctions/climate_widget/mainwindow.h +++ b/examples/vehiclefunctions/climate_widget/mainwindow.h @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:BSD-PELAGICORE$ +** $QT_BEGIN_LICENSE:BSD-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** BSD License Usage ** Alternatively, you may use this file under the terms of the BSD license @@ -26,7 +27,7 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Pelagicore AG nor the names of its +** * Neither the name of The Qt Company Ltd nor the names of its ** contributors may be used to endorse or promote products derived ** from this software without specific prior written permission. ** @@ -49,7 +50,6 @@ ** ****************************************************************************/ - #ifndef MAINWINDOW_H #define MAINWINDOW_H diff --git a/header.BSD-PELAGICORE b/header.BSD-QTAS index 4d74ec1..1fcd032 100644 --- a/header.BSD-PELAGICORE +++ b/header.BSD-QTAS @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:BSD-PELAGICORE$ +** $QT_BEGIN_LICENSE:BSD-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** BSD License Usage ** Alternatively, you may use this file under the terms of the BSD license @@ -26,7 +27,7 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Pelagicore AG nor the names of its +** * Neither the name of The Qt Company Ltd nor the names of its ** contributors may be used to endorse or promote products derived ** from this software without specific prior written permission. ** @@ -48,4 +49,3 @@ ** SPDX-License-Identifier: BSD-3-Clause ** ****************************************************************************/ - diff --git a/header.FDL-PELAGICORE b/header.FDL-QTAS index dca12a6..5617df7 100644 --- a/header.FDL-PELAGICORE +++ b/header.FDL-QTAS @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:FDL-PELAGICORE$ +** $QT_BEGIN_LICENSE:FDL-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU Free Documentation License Usage ** Alternatively, this file may be used under the terms of the GNU Free diff --git a/header.GPL-EXCEPT-PELAGICORE b/header.GPL-EXCEPT-QTAS index 2756238..40a3ac9 100644 --- a/header.GPL-EXCEPT-PELAGICORE +++ b/header.GPL-EXCEPT-QTAS @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:GPL-EXCEPT-PELAGICORE$ +** $QT_BEGIN_LICENSE:GPL-EXCEPT-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU General Public License Usage ** Alternatively, this file may be used under the terms of the GNU @@ -24,4 +25,3 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ - diff --git a/header.LGPL3-PELAGICORE b/header.LGPL-QTAS index 72b1759..d7b130f 100644 --- a/header.LGPL3-PELAGICORE +++ b/header.LGPL-QTAS @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3-PELAGICORE$ +** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/doc/src/qtivi-modules.qdoc b/src/doc/src/qtivi-modules.qdoc index 5fe275c..5d839f3 100644 --- a/src/doc/src/qtivi-modules.qdoc +++ b/src/doc/src/qtivi-modules.qdoc @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:FDL-PELAGICORE$ +** $QT_BEGIN_LICENSE:FDL-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU Free Documentation License Usage ** Alternatively, this file may be used under the terms of the GNU Free diff --git a/src/doc/src/qtivi.qdoc b/src/doc/src/qtivi.qdoc index bc1f4ba..95ac2e9 100644 --- a/src/doc/src/qtivi.qdoc +++ b/src/doc/src/qtivi.qdoc @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:FDL-PELAGICORE$ +** $QT_BEGIN_LICENSE:FDL-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU Free Documentation License Usage ** Alternatively, this file may be used under the terms of the GNU Free diff --git a/src/geniviextras/qdlt.h b/src/geniviextras/qdlt.h index 800d775..fd96c4d 100644 --- a/src/geniviextras/qdlt.h +++ b/src/geniviextras/qdlt.h @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3-PELAGICORE$ +** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/geniviextras/qdltregistration.cpp b/src/geniviextras/qdltregistration.cpp index 34f0bdd..ff4a7fe 100644 --- a/src/geniviextras/qdltregistration.cpp +++ b/src/geniviextras/qdltregistration.cpp @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3-PELAGICORE$ +** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/geniviextras/qdltregistration.h b/src/geniviextras/qdltregistration.h index 6d9860d..a1eb1f7 100644 --- a/src/geniviextras/qdltregistration.h +++ b/src/geniviextras/qdltregistration.h @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3-PELAGICORE$ +** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/geniviextras/qdltregistration_p.h b/src/geniviextras/qdltregistration_p.h index b89af6e..ff8bd1a 100644 --- a/src/geniviextras/qdltregistration_p.h +++ b/src/geniviextras/qdltregistration_p.h @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3-PELAGICORE$ +** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/geniviextras/qgeniviextrasglobal.h b/src/geniviextras/qgeniviextrasglobal.h index 22b6101..f3797f1 100644 --- a/src/geniviextras/qgeniviextrasglobal.h +++ b/src/geniviextras/qgeniviextrasglobal.h @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3-PELAGICORE$ +** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/imports/core/plugin.cpp b/src/imports/core/plugin.cpp index e8a7626..3760148 100644 --- a/src/imports/core/plugin.cpp +++ b/src/imports/core/plugin.cpp @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3-PELAGICORE$ +** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/imports/vehiclefunctions/plugin.cpp b/src/imports/vehiclefunctions/plugin.cpp index b0c1b3c..aaf577d 100644 --- a/src/imports/vehiclefunctions/plugin.cpp +++ b/src/imports/vehiclefunctions/plugin.cpp @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3-PELAGICORE$ +** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/ivicore/doc/src/qtivicore.qdoc b/src/ivicore/doc/src/qtivicore.qdoc index 8bef5a8..7f22c49 100644 --- a/src/ivicore/doc/src/qtivicore.qdoc +++ b/src/ivicore/doc/src/qtivicore.qdoc @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:FDL-PELAGICORE$ +** $QT_BEGIN_LICENSE:FDL-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU Free Documentation License Usage ** Alternatively, this file may be used under the terms of the GNU Free diff --git a/src/ivicore/qtiviabstractfeature.cpp b/src/ivicore/qtiviabstractfeature.cpp index 76ee01d..b03ef6b 100644 --- a/src/ivicore/qtiviabstractfeature.cpp +++ b/src/ivicore/qtiviabstractfeature.cpp @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3-PELAGICORE$ +** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/ivicore/qtiviabstractfeature.h b/src/ivicore/qtiviabstractfeature.h index bdebeab..fe5d1a4 100644 --- a/src/ivicore/qtiviabstractfeature.h +++ b/src/ivicore/qtiviabstractfeature.h @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3-PELAGICORE$ +** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/ivicore/qtiviabstractfeature_p.h b/src/ivicore/qtiviabstractfeature_p.h index 92afd98..be1df15 100644 --- a/src/ivicore/qtiviabstractfeature_p.h +++ b/src/ivicore/qtiviabstractfeature_p.h @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3-PELAGICORE$ +** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/ivicore/qtiviabstractzonedfeature.cpp b/src/ivicore/qtiviabstractzonedfeature.cpp index a950dcf..9c2fa4c 100644 --- a/src/ivicore/qtiviabstractzonedfeature.cpp +++ b/src/ivicore/qtiviabstractzonedfeature.cpp @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3-PELAGICORE$ +** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/ivicore/qtiviabstractzonedfeature.h b/src/ivicore/qtiviabstractzonedfeature.h index 9752318..1f2b1c6 100644 --- a/src/ivicore/qtiviabstractzonedfeature.h +++ b/src/ivicore/qtiviabstractzonedfeature.h @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3-PELAGICORE$ +** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/ivicore/qtiviabstractzonedfeature_p.h b/src/ivicore/qtiviabstractzonedfeature_p.h index 340845a..9edfd5b 100644 --- a/src/ivicore/qtiviabstractzonedfeature_p.h +++ b/src/ivicore/qtiviabstractzonedfeature_p.h @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3-PELAGICORE$ +** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/ivicore/qtiviglobal.h b/src/ivicore/qtiviglobal.h index 220d47d..c319bb8 100644 --- a/src/ivicore/qtiviglobal.h +++ b/src/ivicore/qtiviglobal.h @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3-PELAGICORE$ +** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/ivicore/qtiviproperty.cpp b/src/ivicore/qtiviproperty.cpp index faf9758..f2010fa 100644 --- a/src/ivicore/qtiviproperty.cpp +++ b/src/ivicore/qtiviproperty.cpp @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3-PELAGICORE$ +** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/ivicore/qtiviproperty.h b/src/ivicore/qtiviproperty.h index 3d719ac..19f228c 100644 --- a/src/ivicore/qtiviproperty.h +++ b/src/ivicore/qtiviproperty.h @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3-PELAGICORE$ +** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/ivicore/qtiviproperty_p.h b/src/ivicore/qtiviproperty_p.h index 0ba15a4..44157b2 100644 --- a/src/ivicore/qtiviproperty_p.h +++ b/src/ivicore/qtiviproperty_p.h @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3-PELAGICORE$ +** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/ivicore/qtivipropertyattribute.cpp b/src/ivicore/qtivipropertyattribute.cpp index c881ad3..e936a0a 100644 --- a/src/ivicore/qtivipropertyattribute.cpp +++ b/src/ivicore/qtivipropertyattribute.cpp @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3-PELAGICORE$ +** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/ivicore/qtivipropertyattribute.h b/src/ivicore/qtivipropertyattribute.h index d814923..5fb37b3 100644 --- a/src/ivicore/qtivipropertyattribute.h +++ b/src/ivicore/qtivipropertyattribute.h @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3-PELAGICORE$ +** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/ivicore/qtivipropertyfactory.cpp b/src/ivicore/qtivipropertyfactory.cpp index c403f59..8dd1f1c 100644 --- a/src/ivicore/qtivipropertyfactory.cpp +++ b/src/ivicore/qtivipropertyfactory.cpp @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3-PELAGICORE$ +** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/ivicore/qtivipropertyfactory.h b/src/ivicore/qtivipropertyfactory.h index 6f990f8..506ae50 100644 --- a/src/ivicore/qtivipropertyfactory.h +++ b/src/ivicore/qtivipropertyfactory.h @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3-PELAGICORE$ +** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/ivicore/qtiviproxyserviceobject_p.cpp b/src/ivicore/qtiviproxyserviceobject_p.cpp index 4c1db7b..1776459 100644 --- a/src/ivicore/qtiviproxyserviceobject_p.cpp +++ b/src/ivicore/qtiviproxyserviceobject_p.cpp @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3-PELAGICORE$ +** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/ivicore/qtiviproxyserviceobject_p.h b/src/ivicore/qtiviproxyserviceobject_p.h index eeadd6c..9a7fcae 100644 --- a/src/ivicore/qtiviproxyserviceobject_p.h +++ b/src/ivicore/qtiviproxyserviceobject_p.h @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3-PELAGICORE$ +** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/ivicore/qtiviserviceinterface.h b/src/ivicore/qtiviserviceinterface.h index 8c6e500..afac09b 100644 --- a/src/ivicore/qtiviserviceinterface.h +++ b/src/ivicore/qtiviserviceinterface.h @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3-PELAGICORE$ +** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/ivicore/qtiviservicemanager.cpp b/src/ivicore/qtiviservicemanager.cpp index 810298c..680bfc0 100644 --- a/src/ivicore/qtiviservicemanager.cpp +++ b/src/ivicore/qtiviservicemanager.cpp @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3-PELAGICORE$ +** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/ivicore/qtiviservicemanager.h b/src/ivicore/qtiviservicemanager.h index f798741..6e61c16 100644 --- a/src/ivicore/qtiviservicemanager.h +++ b/src/ivicore/qtiviservicemanager.h @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3-PELAGICORE$ +** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/ivicore/qtiviservicemanager_p.h b/src/ivicore/qtiviservicemanager_p.h index af2b306..2bb3c9f 100644 --- a/src/ivicore/qtiviservicemanager_p.h +++ b/src/ivicore/qtiviservicemanager_p.h @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3-PELAGICORE$ +** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/ivicore/qtiviserviceobject.cpp b/src/ivicore/qtiviserviceobject.cpp index b519e9a..1cc1f22 100644 --- a/src/ivicore/qtiviserviceobject.cpp +++ b/src/ivicore/qtiviserviceobject.cpp @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3-PELAGICORE$ +** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/ivicore/qtiviserviceobject.h b/src/ivicore/qtiviserviceobject.h index 55562ce..32e8749 100644 --- a/src/ivicore/qtiviserviceobject.h +++ b/src/ivicore/qtiviserviceobject.h @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3-PELAGICORE$ +** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/ivicore/qtivizonedfeatureinterface.cpp b/src/ivicore/qtivizonedfeatureinterface.cpp index 3996098..ce21552 100644 --- a/src/ivicore/qtivizonedfeatureinterface.cpp +++ b/src/ivicore/qtivizonedfeatureinterface.cpp @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3-PELAGICORE$ +** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/ivicore/qtivizonedfeatureinterface.h b/src/ivicore/qtivizonedfeatureinterface.h index dd3fee2..5fa589d 100644 --- a/src/ivicore/qtivizonedfeatureinterface.h +++ b/src/ivicore/qtivizonedfeatureinterface.h @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3-PELAGICORE$ +** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/ivivehiclefunctions/doc/snippets/doc_src_qmlivivehiclefunctions.cpp b/src/ivivehiclefunctions/doc/snippets/doc_src_qmlivivehiclefunctions.cpp index 4301ca8..621355c 100644 --- a/src/ivivehiclefunctions/doc/snippets/doc_src_qmlivivehiclefunctions.cpp +++ b/src/ivivehiclefunctions/doc/snippets/doc_src_qmlivivehiclefunctions.cpp @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3-PELAGICORE$ +** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/ivivehiclefunctions/doc/snippets/doc_src_qtivivehiclefunctions.cpp b/src/ivivehiclefunctions/doc/snippets/doc_src_qtivivehiclefunctions.cpp index 35f5cbf..0c92274 100644 --- a/src/ivivehiclefunctions/doc/snippets/doc_src_qtivivehiclefunctions.cpp +++ b/src/ivivehiclefunctions/doc/snippets/doc_src_qtivivehiclefunctions.cpp @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3-PELAGICORE$ +** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/ivivehiclefunctions/doc/src/examples-climate_qml.qdoc b/src/ivivehiclefunctions/doc/src/examples-climate_qml.qdoc index 0bb7d4d..4ac2690 100644 --- a/src/ivivehiclefunctions/doc/src/examples-climate_qml.qdoc +++ b/src/ivivehiclefunctions/doc/src/examples-climate_qml.qdoc @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:BSD-PELAGICORE$ +** $QT_BEGIN_LICENSE:BSD-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** BSD License Usage ** Alternatively, you may use this file under the terms of the BSD license @@ -26,7 +27,7 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Pelagicore AG nor the names of its +** * Neither the name of The Qt Company Ltd nor the names of its ** contributors may be used to endorse or promote products derived ** from this software without specific prior written permission. ** @@ -48,6 +49,7 @@ ** SPDX-License-Identifier: BSD-3-Clause ** ****************************************************************************/ + /*! \example climate_qml \title Climate Control QML Example diff --git a/src/ivivehiclefunctions/doc/src/examples-climate_widget.qdoc b/src/ivivehiclefunctions/doc/src/examples-climate_widget.qdoc index 19cf8e5..509451e 100644 --- a/src/ivivehiclefunctions/doc/src/examples-climate_widget.qdoc +++ b/src/ivivehiclefunctions/doc/src/examples-climate_widget.qdoc @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:BSD-PELAGICORE$ +** $QT_BEGIN_LICENSE:BSD-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** BSD License Usage ** Alternatively, you may use this file under the terms of the BSD license @@ -26,7 +27,7 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Pelagicore AG nor the names of its +** * Neither the name of The Qt Company Ltd nor the names of its ** contributors may be used to endorse or promote products derived ** from this software without specific prior written permission. ** @@ -49,7 +50,6 @@ ** ****************************************************************************/ - /*! \example climate_widget \title Climate Control Widget Example diff --git a/src/ivivehiclefunctions/doc/src/qtivivehiclefunctions.qdoc b/src/ivivehiclefunctions/doc/src/qtivivehiclefunctions.qdoc index 2a1630c..4f28bbd 100644 --- a/src/ivivehiclefunctions/doc/src/qtivivehiclefunctions.qdoc +++ b/src/ivivehiclefunctions/doc/src/qtivivehiclefunctions.qdoc @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:FDL-PELAGICORE$ +** $QT_BEGIN_LICENSE:FDL-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU Free Documentation License Usage ** Alternatively, this file may be used under the terms of the GNU Free diff --git a/src/ivivehiclefunctions/qtiviclimatecontrol.cpp b/src/ivivehiclefunctions/qtiviclimatecontrol.cpp index c9dc3c0..822896f 100644 --- a/src/ivivehiclefunctions/qtiviclimatecontrol.cpp +++ b/src/ivivehiclefunctions/qtiviclimatecontrol.cpp @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3-PELAGICORE$ +** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/ivivehiclefunctions/qtiviclimatecontrol.h b/src/ivivehiclefunctions/qtiviclimatecontrol.h index 7152055..2e1e4b6 100644 --- a/src/ivivehiclefunctions/qtiviclimatecontrol.h +++ b/src/ivivehiclefunctions/qtiviclimatecontrol.h @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3-PELAGICORE$ +** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/ivivehiclefunctions/qtiviclimatecontrol_p.h b/src/ivivehiclefunctions/qtiviclimatecontrol_p.h index 28c009c..8680357 100644 --- a/src/ivivehiclefunctions/qtiviclimatecontrol_p.h +++ b/src/ivivehiclefunctions/qtiviclimatecontrol_p.h @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3-PELAGICORE$ +** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/ivivehiclefunctions/qtiviclimatecontrolbackendinterface.cpp b/src/ivivehiclefunctions/qtiviclimatecontrolbackendinterface.cpp index 6c1729d..48eab25 100644 --- a/src/ivivehiclefunctions/qtiviclimatecontrolbackendinterface.cpp +++ b/src/ivivehiclefunctions/qtiviclimatecontrolbackendinterface.cpp @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3-PELAGICORE$ +** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/ivivehiclefunctions/qtiviclimatecontrolbackendinterface.h b/src/ivivehiclefunctions/qtiviclimatecontrolbackendinterface.h index 74090c7..57d05c4 100644 --- a/src/ivivehiclefunctions/qtiviclimatecontrolbackendinterface.h +++ b/src/ivivehiclefunctions/qtiviclimatecontrolbackendinterface.h @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3-PELAGICORE$ +** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/ivivehiclefunctions/qtivivehiclefunctionsglobal.h b/src/ivivehiclefunctions/qtivivehiclefunctionsglobal.h index 17a1c81..df84d81 100644 --- a/src/ivivehiclefunctions/qtivivehiclefunctionsglobal.h +++ b/src/ivivehiclefunctions/qtivivehiclefunctionsglobal.h @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3-PELAGICORE$ +** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/ivivehiclefunctions/climate_simulator/climatecontrolbackend.cpp b/src/plugins/ivivehiclefunctions/climate_simulator/climatecontrolbackend.cpp index 3a3c7f4..e4d4f2c 100644 --- a/src/plugins/ivivehiclefunctions/climate_simulator/climatecontrolbackend.cpp +++ b/src/plugins/ivivehiclefunctions/climate_simulator/climatecontrolbackend.cpp @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3-PELAGICORE$ +** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/ivivehiclefunctions/climate_simulator/climatecontrolbackend.h b/src/plugins/ivivehiclefunctions/climate_simulator/climatecontrolbackend.h index 22658fb..dc6c672 100644 --- a/src/plugins/ivivehiclefunctions/climate_simulator/climatecontrolbackend.h +++ b/src/plugins/ivivehiclefunctions/climate_simulator/climatecontrolbackend.h @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3-PELAGICORE$ +** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/ivivehiclefunctions/climate_simulator/climateplugin.cpp b/src/plugins/ivivehiclefunctions/climate_simulator/climateplugin.cpp index ef95b11..fba907e 100644 --- a/src/plugins/ivivehiclefunctions/climate_simulator/climateplugin.cpp +++ b/src/plugins/ivivehiclefunctions/climate_simulator/climateplugin.cpp @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3-PELAGICORE$ +** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/ivivehiclefunctions/climate_simulator/climateplugin.h b/src/plugins/ivivehiclefunctions/climate_simulator/climateplugin.h index 8c67e2f..1119f93 100644 --- a/src/plugins/ivivehiclefunctions/climate_simulator/climateplugin.h +++ b/src/plugins/ivivehiclefunctions/climate_simulator/climateplugin.h @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3-PELAGICORE$ +** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/core/qtiviabstractfeature/testdata/autodiscovery.qml b/tests/auto/core/qtiviabstractfeature/testdata/autodiscovery.qml index 9028d75..d75fc6a 100644 --- a/tests/auto/core/qtiviabstractfeature/testdata/autodiscovery.qml +++ b/tests/auto/core/qtiviabstractfeature/testdata/autodiscovery.qml @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:GPL-EXCEPT-PELAGICORE$ +** $QT_BEGIN_LICENSE:GPL-EXCEPT-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU General Public License Usage ** Alternatively, this file may be used under the terms of the GNU diff --git a/tests/auto/core/qtiviabstractfeature/tst_qtiviabstractfeature.cpp b/tests/auto/core/qtiviabstractfeature/tst_qtiviabstractfeature.cpp index 6068e83..3259272 100644 --- a/tests/auto/core/qtiviabstractfeature/tst_qtiviabstractfeature.cpp +++ b/tests/auto/core/qtiviabstractfeature/tst_qtiviabstractfeature.cpp @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:GPL-EXCEPT-PELAGICORE$ +** $QT_BEGIN_LICENSE:GPL-EXCEPT-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU General Public License Usage ** Alternatively, this file may be used under the terms of the GNU diff --git a/tests/auto/core/qtiviproperty/testdata/readWrite.qml b/tests/auto/core/qtiviproperty/testdata/readWrite.qml index eca3f67..f885ebe 100644 --- a/tests/auto/core/qtiviproperty/testdata/readWrite.qml +++ b/tests/auto/core/qtiviproperty/testdata/readWrite.qml @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:GPL-EXCEPT-PELAGICORE$ +** $QT_BEGIN_LICENSE:GPL-EXCEPT-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU General Public License Usage ** Alternatively, this file may be used under the terms of the GNU diff --git a/tests/auto/core/qtiviproperty/testdata/writeError.qml b/tests/auto/core/qtiviproperty/testdata/writeError.qml index 8408919..224fc6d 100644 --- a/tests/auto/core/qtiviproperty/testdata/writeError.qml +++ b/tests/auto/core/qtiviproperty/testdata/writeError.qml @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:GPL-EXCEPT-PELAGICORE$ +** $QT_BEGIN_LICENSE:GPL-EXCEPT-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU General Public License Usage ** Alternatively, this file may be used under the terms of the GNU diff --git a/tests/auto/core/qtiviproperty/tst_qtiviproperty.cpp b/tests/auto/core/qtiviproperty/tst_qtiviproperty.cpp index b743f92..69b9b0d 100644 --- a/tests/auto/core/qtiviproperty/tst_qtiviproperty.cpp +++ b/tests/auto/core/qtiviproperty/tst_qtiviproperty.cpp @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:GPL-EXCEPT-PELAGICORE$ +** $QT_BEGIN_LICENSE:GPL-EXCEPT-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU General Public License Usage ** Alternatively, this file may be used under the terms of the GNU @@ -308,7 +309,7 @@ void tst_QtIVIProperty::setValueError_qml() QVERIFY(warningsSpy.at(0).count()); QList<QQmlError> errorList = warningsSpy.at(0).at(0).value<QList<QQmlError>>(); QCOMPARE(errorList.count(), 1); - QCOMPARE(errorList.at(0).toString(), QUrl::fromLocalFile(testData).toString() + ":40: Error: Enum value out of range"); + QCOMPARE(errorList.at(0).toString(), QUrl::fromLocalFile(testData).toString() + ":41: Error: Enum value out of range"); warningsSpy.clear(); QVERIFY(QMetaObject::invokeMethod(obj, "intTest")); @@ -320,7 +321,7 @@ void tst_QtIVIProperty::setValueError_qml() QVERIFY(warningsSpy.at(0).count()); errorList = warningsSpy.at(0).at(0).value<QList<QQmlError>>(); QCOMPARE(errorList.count(), 1); - QCOMPARE(errorList.at(0).toString(), QUrl::fromLocalFile(testData).toString() + ":36: Error: Expected: int but got QString"); + QCOMPARE(errorList.at(0).toString(), QUrl::fromLocalFile(testData).toString() + ":37: Error: Expected: int but got QString"); } void tst_QtIVIProperty::readOnly() diff --git a/tests/auto/core/qtivipropertyattribute/tst_qtivipropertyattribute.cpp b/tests/auto/core/qtivipropertyattribute/tst_qtivipropertyattribute.cpp index 0ba6560..ff78514 100644 --- a/tests/auto/core/qtivipropertyattribute/tst_qtivipropertyattribute.cpp +++ b/tests/auto/core/qtivipropertyattribute/tst_qtivipropertyattribute.cpp @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:GPL-EXCEPT-PELAGICORE$ +** $QT_BEGIN_LICENSE:GPL-EXCEPT-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU General Public License Usage ** Alternatively, this file may be used under the terms of the GNU diff --git a/tests/auto/core/servicemanagertest/simple_plugin/simpleplugin.cpp b/tests/auto/core/servicemanagertest/simple_plugin/simpleplugin.cpp index cf04ae4..00bf6ff 100644 --- a/tests/auto/core/servicemanagertest/simple_plugin/simpleplugin.cpp +++ b/tests/auto/core/servicemanagertest/simple_plugin/simpleplugin.cpp @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:GPL-EXCEPT-PELAGICORE$ +** $QT_BEGIN_LICENSE:GPL-EXCEPT-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU General Public License Usage ** Alternatively, this file may be used under the terms of the GNU diff --git a/tests/auto/core/servicemanagertest/simple_plugin/simpleplugin.h b/tests/auto/core/servicemanagertest/simple_plugin/simpleplugin.h index d4d49ee..81dc4b9 100644 --- a/tests/auto/core/servicemanagertest/simple_plugin/simpleplugin.h +++ b/tests/auto/core/servicemanagertest/simple_plugin/simpleplugin.h @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:GPL-EXCEPT-PELAGICORE$ +** $QT_BEGIN_LICENSE:GPL-EXCEPT-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU General Public License Usage ** Alternatively, this file may be used under the terms of the GNU diff --git a/tests/auto/core/servicemanagertest/tst_servicemanagertest.cpp b/tests/auto/core/servicemanagertest/tst_servicemanagertest.cpp index 63a3df0..e942db4 100644 --- a/tests/auto/core/servicemanagertest/tst_servicemanagertest.cpp +++ b/tests/auto/core/servicemanagertest/tst_servicemanagertest.cpp @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:GPL-EXCEPT-PELAGICORE$ +** $QT_BEGIN_LICENSE:GPL-EXCEPT-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU General Public License Usage ** Alternatively, this file may be used under the terms of the GNU diff --git a/tests/auto/core/servicemanagertest/wrong_plugin/wrongplugin.cpp b/tests/auto/core/servicemanagertest/wrong_plugin/wrongplugin.cpp index 112d5e2..c7c2c4b 100644 --- a/tests/auto/core/servicemanagertest/wrong_plugin/wrongplugin.cpp +++ b/tests/auto/core/servicemanagertest/wrong_plugin/wrongplugin.cpp @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:GPL-EXCEPT-PELAGICORE$ +** $QT_BEGIN_LICENSE:GPL-EXCEPT-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU General Public License Usage ** Alternatively, this file may be used under the terms of the GNU diff --git a/tests/auto/core/servicemanagertest/wrong_plugin/wrongplugin.h b/tests/auto/core/servicemanagertest/wrong_plugin/wrongplugin.h index 6fc2c36..63b67af 100644 --- a/tests/auto/core/servicemanagertest/wrong_plugin/wrongplugin.h +++ b/tests/auto/core/servicemanagertest/wrong_plugin/wrongplugin.h @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:GPL-EXCEPT-PELAGICORE$ +** $QT_BEGIN_LICENSE:GPL-EXCEPT-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU General Public License Usage ** Alternatively, this file may be used under the terms of the GNU diff --git a/tests/auto/core/servicemanagertest/wrongmetadata_plugin/wrongmetadataplugin.cpp b/tests/auto/core/servicemanagertest/wrongmetadata_plugin/wrongmetadataplugin.cpp index 23c55f1..0998412 100644 --- a/tests/auto/core/servicemanagertest/wrongmetadata_plugin/wrongmetadataplugin.cpp +++ b/tests/auto/core/servicemanagertest/wrongmetadata_plugin/wrongmetadataplugin.cpp @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:GPL-EXCEPT-PELAGICORE$ +** $QT_BEGIN_LICENSE:GPL-EXCEPT-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU General Public License Usage ** Alternatively, this file may be used under the terms of the GNU diff --git a/tests/auto/core/servicemanagertest/wrongmetadata_plugin/wrongmetadataplugin.h b/tests/auto/core/servicemanagertest/wrongmetadata_plugin/wrongmetadataplugin.h index 7e4a3e4..3dc722e 100644 --- a/tests/auto/core/servicemanagertest/wrongmetadata_plugin/wrongmetadataplugin.h +++ b/tests/auto/core/servicemanagertest/wrongmetadata_plugin/wrongmetadataplugin.h @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:GPL-EXCEPT-PELAGICORE$ +** $QT_BEGIN_LICENSE:GPL-EXCEPT-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU General Public License Usage ** Alternatively, this file may be used under the terms of the GNU diff --git a/tests/auto/dlt/tst_dlt.cpp b/tests/auto/dlt/tst_dlt.cpp index 1690853..1ba3b9a 100644 --- a/tests/auto/dlt/tst_dlt.cpp +++ b/tests/auto/dlt/tst_dlt.cpp @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:GPL-EXCEPT-PELAGICORE$ +** $QT_BEGIN_LICENSE:GPL-EXCEPT-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU General Public License Usage ** Alternatively, this file may be used under the terms of the GNU diff --git a/tests/auto/vehiclefunctions/climatecontroltest/tst_climatecontroltest.cpp b/tests/auto/vehiclefunctions/climatecontroltest/tst_climatecontroltest.cpp index 0c511ec..954bdc0 100644 --- a/tests/auto/vehiclefunctions/climatecontroltest/tst_climatecontroltest.cpp +++ b/tests/auto/vehiclefunctions/climatecontroltest/tst_climatecontroltest.cpp @@ -1,17 +1,18 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:GPL-EXCEPT-PELAGICORE$ +** $QT_BEGIN_LICENSE:GPL-EXCEPT-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Qt IVI licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Pelagicore. For licensing terms -** and conditions, contact us at http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite licenses may use +** this file in accordance with the commercial license agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and The Qt Company. For +** licensing terms and conditions see https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU General Public License Usage ** Alternatively, this file may be used under the terms of the GNU |