diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-06-07 12:06:26 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-06-07 12:38:39 +0200 |
| commit | e70bc6d3f052d3f0343f38964a33f6805bc354a8 (patch) | |
| tree | 55f9a340248352336f2b510036118609af6d9d28 | |
| parent | e4b6b3c1c053a830396f05a30a2bc34049756bb0 (diff) | |
| parent | dc80adfa2de83ba5b76363c9c0d5a25eed703250 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
Change-Id: I4af526cb59e7c32bc21ca20fc839b4515299477b
25 files changed, 1121 insertions, 1520 deletions
diff --git a/LGPL_EXCEPTION.txt b/LGPL_EXCEPTION.txt deleted file mode 100644 index 5cdacb9a4..000000000 --- a/LGPL_EXCEPTION.txt +++ /dev/null @@ -1,22 +0,0 @@ -The Qt Company Qt 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.GPLv3 b/LICENSE.GPLv3 deleted file mode 100644 index 71c4ad49c..000000000 --- a/LICENSE.GPLv3 +++ /dev/null @@ -1,686 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - - The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd. - Contact: http://www.qt.io/licensing/ - - You may use, distribute and copy the Qt Toolkit under the terms of - GNU Lesser General Public License version 3. That license references - the General Public License version 3, that is displayed below. Other - portions of the Qt Toolkit may be licensed directly under this license. - -------------------------------------------------------------------------- - - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 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. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - 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, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public 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. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - <program> Copyright (C) <year> <name of author> - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -<http://www.gnu.org/licenses/>. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -<http://www.gnu.org/philosophy/why-not-lgpl.html>. diff --git a/LICENSE.LGPLv21 b/LICENSE.LGPLv21 deleted file mode 100644 index dfcab5e29..000000000 --- a/LICENSE.LGPLv21 +++ /dev/null @@ -1,514 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - - The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd. - Contact: http://www.qt.io/licensing/ - - You may use, distribute and copy the Qt Toolkit under the terms of - GNU Lesser General Public License version 2.1, which is displayed below. - -------------------------------------------------------------------------- - - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public 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. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - <one line to give the library's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - <signature of Ty Coon>, 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - - diff --git a/LICENSE.LGPLv3 b/LICENSE.LGPLv3 deleted file mode 100644 index 6bf924cd1..000000000 --- a/LICENSE.LGPLv3 +++ /dev/null @@ -1,175 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - - The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd. - Contact: http://www.qt.io/licensing/ - - You may use, distribute and copy the Qt Toolkit under the terms of - GNU Lesser General Public License version 3, which is displayed below. - This license makes reference to the version 3 of the GNU General - Public License, which you can find in the LICENSE.GPLv3 file. - -------------------------------------------------------------------------- - - GNU LESSER GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright © 2007 Free Software Foundation, Inc. <http://fsf.org/> -Everyone is permitted to copy and distribute verbatim copies of this -licensedocument, but changing it is not allowed. - -This version of the GNU Lesser General Public License incorporates -the terms and conditions of version 3 of the GNU General Public -License, supplemented by the additional permissions listed below. - -0. Additional Definitions. - - As used herein, “this License” refers to version 3 of the GNU Lesser -General Public License, and the “GNU GPL” refers to version 3 of the -GNU General Public License. - - “The Library” refers to a covered work governed by this License, -other than an Application or a Combined Work as defined below. - - An “Application” is any work that makes use of an interface provided -by the Library, but which is not otherwise based on the Library. -Defining a subclass of a class defined by the Library is deemed a mode -of using an interface provided by the Library. - - A “Combined Work” is a work produced by combining or linking an -Application with the Library. The particular version of the Library -with which the Combined Work was made is also called the “Linked -Version”. - - The “Minimal Corresponding Source” for a Combined Work means the -Corresponding Source for the Combined Work, excluding any source code -for portions of the Combined Work that, considered in isolation, are -based on the Application, and not on the Linked Version. - - The “Corresponding Application Code” for a Combined Work means the -object code and/or source code for the Application, including any data -and utility programs needed for reproducing the Combined Work from the -Application, but excluding the System Libraries of the Combined Work. - -1. Exception to Section 3 of the GNU GPL. - - You may convey a covered work under sections 3 and 4 of this License -without being bound by section 3 of the GNU GPL. - -2. Conveying Modified Versions. - - If you modify a copy of the Library, and, in your modifications, a -facility refers to a function or data to be supplied by an Application -that uses the facility (other than as an argument passed when the -facility is invoked), then you may convey a copy of the modified -version: - - a) under this License, provided that you make a good faith effort - to ensure that, in the event an Application does not supply the - function or data, the facility still operates, and performs - whatever part of its purpose remains meaningful, or - - b) under the GNU GPL, with none of the additional permissions of - this License applicable to that copy. - -3. Object Code Incorporating Material from Library Header Files. - - The object code form of an Application may incorporate material from -a header file that is part of the Library. You may convey such object -code under terms of your choice, provided that, if the incorporated -material is not limited to numerical parameters, data structure -layouts and accessors, or small macros, inline functions and templates -(ten or fewer lines in length), you do both of the following: - - a) Give prominent notice with each copy of the object code that - the Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the object code with a copy of the GNU GPL and this - license document. - -4. Combined Works. - - You may convey a Combined Work under terms of your choice that, taken -together, effectively do not restrict modification of the portions of -the Library contained in the Combined Work and reverse engineering for -debugging such modifications, if you also do each of the following: - - a) Give prominent notice with each copy of the Combined Work that - the Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the Combined Work with a copy of the GNU GPL and this - license document. - - c) For a Combined Work that displays copyright notices during - execution, include the copyright notice for the Library among - these notices, as well as a reference directing the user to the - copies of the GNU GPL and this license document. - - d) Do one of the following: - - 0) Convey the Minimal Corresponding Source under the terms of - this License, and the Corresponding Application Code in a form - suitable for, and under terms that permit, the user to - recombine or relink the Application with a modified version of - the Linked Version to produce a modified Combined Work, in the - manner specified by section 6 of the GNU GPL for conveying - Corresponding Source. - - 1) Use a suitable shared library mechanism for linking with - the Library. A suitable mechanism is one that (a) uses at run - time a copy of the Library already present on the user's - computer system, and (b) will operate properly with a modified - version of the Library that is interface-compatible with the - Linked Version. - - e) Provide Installation Information, but only if you would - otherwise be required to provide such information under section 6 - of the GNU GPL, and only to the extent that such information is - necessary to install and execute a modified version of the - Combined Work produced by recombining or relinking the Application - with a modified version of the Linked Version. (If you use option - 4d0, the Installation Information must accompany the Minimal - Corresponding Source and Corresponding Application Code. If you - use option 4d1, you must provide the Installation Information in - the manner specified by section 6 of the GNU GPL for conveying - Corresponding Source.) - -5. Combined Libraries. - - You may place library facilities that are a work based on the Library -side by side in a single library together with other library -facilities that are not Applications and are not covered by this -License, and convey such a combined library under terms of your -choice, if you do both of the following: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities, conveyed under the terms of this License. - - b) Give prominent notice with the combined library that part of - it is a work based on the Library, and explaining where to find - the accompanying uncombined form of the same work. - -6. Revised Versions of the GNU Lesser General Public License. - - The Free Software Foundation may publish revised and/or new versions -of the GNU Lesser General Public 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. - -Each version is given a distinguishing version number. If the Library -as you received it specifies that a certain numbered version of the -GNU Lesser General Public License “or any later version” applies to -it, you have the option of following the terms and conditions either -of that published version or of any later version published by the -Free Software Foundation. If the Library as you received it does not -specify a version number of the GNU Lesser General Public License, -you may choose any version of the GNU Lesser General Public License -ever published by the Free Software Foundation. - -If the Library as you received it specifies that a proxy can decide -whether future versions of the GNU Lesser General Public License shall -apply, that proxy's public statement of acceptance of any version is -permanent authorization for you to choose that version for the Library. - diff --git a/dist/changes-5.9.0 b/dist/changes-5.9.0 new file mode 100644 index 000000000..e48a9b2a1 --- /dev/null +++ b/dist/changes-5.9.0 @@ -0,0 +1,30 @@ +Qt 5.9 introduces many new features and improvements as well as bugfixes +over the 5.8.x series. For more details, refer to the documentation +included in this distribution. The documentation is also available online: + +https://doc.qt.io/qt-5/ + +The Qt version 5.9 series is binary compatible with the 5.8.x series. +Applications compiled for 5.8 will continue to run with 5.9. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +**************************************************************************** +* General * +**************************************************************************** + + - Updated information on supported platforms. + - Updated Qt Platform Abstraction (QPA) documentation. + - Updated Qt for embedded Linux documentation. + - Updated Windows deployment tool (windeployqt) documentation. + - Fixed the information on ANGLE libraries in 'Qt for Windows + Requirements'. + - Updated the example code for connecting overloaded signals/slots. + - Raised the recommended version of CMake to use with Qt to 3.1.0. + - Fixed several instances of missing, incorrect, or obsolete information. diff --git a/doc/src/development/cmake-manual.qdoc b/doc/src/development/cmake-manual.qdoc index f88f4bfa0..9c74baa68 100644 --- a/doc/src/development/cmake-manual.qdoc +++ b/doc/src/development/cmake-manual.qdoc @@ -38,7 +38,7 @@ \c{CMake} is a 3rd party tool with its own \l{CMake Documentation}{documentation}. The rest of this manual details the specifics of how to use Qt 5 with \c{CMake}. - The minimum version required to use Qt5 is \c{CMake} 2.8.3, but 2.8.11 is recommended. + The minimum version required to use Qt5 is \c{CMake} 2.8.3, but 3.1.0 is recommended. \section1 Getting Started diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc index b5f7932e8..962935e72 100644 --- a/doc/src/external-resources.qdoc +++ b/doc/src/external-resources.qdoc @@ -318,3 +318,7 @@ \title macOS \internal */ +/*! + \externalpage https://wiki.openssl.org/images/7/70/Setenv-android.sh + \title OpenSSL: Build Setup Script +*/ diff --git a/doc/src/images/kernel-settings.png b/doc/src/images/kernel-settings.png Binary files differnew file mode 100644 index 000000000..36cb747ff --- /dev/null +++ b/doc/src/images/kernel-settings.png diff --git a/doc/src/images/open-project.PNG b/doc/src/images/open-project.PNG Binary files differnew file mode 100644 index 000000000..18a1af52b --- /dev/null +++ b/doc/src/images/open-project.PNG diff --git a/doc/src/images/project-view-2.png b/doc/src/images/project-view-2.png Binary files differnew file mode 100644 index 000000000..2f68420e3 --- /dev/null +++ b/doc/src/images/project-view-2.png diff --git a/doc/src/images/project-view.png b/doc/src/images/project-view.png Binary files differnew file mode 100644 index 000000000..cf5402265 --- /dev/null +++ b/doc/src/images/project-view.png diff --git a/doc/src/images/project-wizard.PNG b/doc/src/images/project-wizard.PNG Binary files differnew file mode 100644 index 000000000..fec0ea45e --- /dev/null +++ b/doc/src/images/project-wizard.PNG diff --git a/doc/src/images/select-item-to-add.png b/doc/src/images/select-item-to-add.png Binary files differnew file mode 100644 index 000000000..9dcdd83b8 --- /dev/null +++ b/doc/src/images/select-item-to-add.png diff --git a/doc/src/images/vas-galcore.PNG b/doc/src/images/vas-galcore.PNG Binary files differnew file mode 100644 index 000000000..d635809a7 --- /dev/null +++ b/doc/src/images/vas-galcore.PNG diff --git a/doc/src/platforms/android.qdoc b/doc/src/platforms/android.qdoc index 06d8f53ad..ce1c4abbd 100644 --- a/doc/src/platforms/android.qdoc +++ b/doc/src/platforms/android.qdoc @@ -140,40 +140,71 @@ The following topics provide more details about how to use Qt for Android: \title Getting Started with Qt for Android \brief Provides instructions to install and configure your development environment. -\section1 Requirements +\section1 Installing the Prerequisites + In order to use \l{Qt for Android}, you need the following: \list \li \l{http://developer.android.com/sdk/index.html}{The Android SDK Tools} + \note If your Qt version is earlier than v5.9, use the SDK tools package + v25.2.5 or earlier. \li \l{http://developer.android.com/tools/sdk/ndk/index.html}{The Android NDK} + (recommended version 10e) \li \l{http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html}{Java SE Development Kit} (JDK) v6 or later. You can also use \l{http://openjdk.java.net}{OpenJDK} on Linux. -\li On Windows, you need the following additional installations: - \list - \li \l{http://ant.apache.org/bindownload.cgi}{Apache Ant} v1.8 or later - \li Android Debug Bridge (ADB) driver on the Windows platform to enable USB - debugging. The default USB driver on Windows does not allow debugging. - For details about how to get the USB driver, see - \l{http://developer.android.com/sdk/win-usb.html}. - - After installing the driver, try running a few basic - \l{http://developer.android.com/tools/help/adb.html}{adb} commands and - check whether your device responds to it. - \endlist +\li \l{http://ant.apache.org/bindownload.cgi}{Apache Ant} v1.8 or later \endlist -After installing these tools, update the Android SDK to get the API -and tools packages required for development. You can update the SDK using the -\l{http://developer.android.com/tools/help/android.html}{android} tool that -comes with the SDK Tools package. For example, on Ubuntu the following command -starts the \l{http://developer.android.com/sdk/installing/adding-packages.html} -{Android SDK Manager}, which enables you to select the packages you want -to install: +After installing these tools, update the Android SDK by installing the API +and build tools packages required for development. You can install these packages +either through Android Studio or using the command line tools package you installed +earlier. For more details, refer to the +\l{https://developer.android.com/studio/intro/update.html}{Android Studio} +documentation. + +\section2 Updating the Android SDK + +The command line tools provided by the Android SDK Tools package also enables updating +the SDK, but without a GUI. For example, the following command on Ubuntu updates the SDK +by installing the latest \c build-tools, \c platform-tools, \c emulator, and \c patcher +packages: \badcode ./android update sdk \endcode -\note If you're developing on a 64-bit Linux machine, you must install the +To install a specific package, use \c sdkmanager from +\c{<ANDROID_SDK_ROOT>/tools/bin}. For example, the following command installs the +\c android-10 platforms package on Ubuntu: + +\badcode +./sdkmanager "platforms;android-10" +\endcode + +For more details, refer to the +\l{https://developer.android.com/studio/command-line/sdkmanager.html}{sdkmanager} +documentation. + +\section1 Configuring Your Development Host + +\section2 Windows + +The default USB driver on Windows does not allow debugging using +Android Debug Bridge (ADB) tool. You must install the additional USB driver +provided by the \e extras Android SDK package. Use the following command from +the Windows command prompt to install the extras package: + +\badcode +sdkmanager.bat "extras;google;usb_driver" +\endcode + +After the package installation is complete, install the driver from +\c{<ANDROID_SDK_ROOT>/extras/google/usb_driver}. Try running a few basic +\l{http://developer.android.com/tools/help/adb.html}{adb} commands now +and check whether your Android device responds to it. + +\section2 64-bit Linux + +If you're developing on a 64-bit Linux machine, you must install the following dependencies in order to run 32-bit executables like \c adb, which allows Qt Creator to find devices to deploy to: @@ -187,26 +218,18 @@ To run the emulator, the following dependencies are also necessary: sudo apt-get install libsdl1.2debian:i386 \endcode -\section1 Installing Qt for Android +\section2 Qt Creator IDE -The Qt 5 installers for different platforms are available from the \l Downloads -page. Choose the one that is appropriate. +The Qt Creator IDE that came with the Qt 5 installation on your development +host, must be configured to enable developing applications for Android. Launch +Qt Creator and select \uicontrol Tools > \uicontrol Options > +\uicontrol Devices > \uicontrol Android to add the Android NDK and SDK paths. +For more details, refer to \l{Qt Creator: Connecting Android Devices}{Qt Creator Manual}. -Once you have the installer, follow these steps: - -\list 1 - \li Run the installer to begin installing Qt 5 on your development platform. - \li Select the components you need in the \uicontrol{Select Components} - screen and click \uicontrol Next. - \li After the installation is complete, the installer lets you open Qt Creator - and the README. Select to open Qt Creator and click \uicontrol Finish. - \li Select \uicontrol{Tools > Options > Android} in Qt Creator to add - the Android NDK and SDK paths. For more details, see - \l{Qt Creator: Connecting Android Devices}{Qt Creator Manual}. -\endlist +\section1 Testing Your Setup Now you can test your development setup by running the examples that came -with the Qt 5 package installed earlier. You can browse the examples in +with the Qt 5 installation. You can browse these examples in Qt Creator \uicontrol Welcome mode. Use the \c android filter in the search field to list all the examples tested on Android. @@ -288,28 +311,83 @@ support on the target. The following instructions guide you to build and add the OpenSSL libraries to the APK: \list 1 - \li Download the latest OpenSSL sources from - \l{http://www.openssl.org/source}. + \li Download the \l{OpenSSL: Build Setup Script}{setup script} to configure + the build environment. + + \note Ensure that you save the script with Unix line-endings if your + build host is Unix or Linux. + + \li Make the following changes in the setup script: + \list + \li Set appropriate values to the \c _ANDROID_EABI and + \c _ANDROID_ARCH variables. For example, to build for 64-bit ARM + architecture using toolchain version v4.9, set + \c aarch64-linux-android-4.9 and \c arch-arm64 values to + \c _ANDROID_EABI and \c _ANDROID_ARCH respectively. + \li Add the \c windows-x86 or \c windows-x86_64 to the \c hosts list on + line \c 107, if your build host is Windows. + \li Add the following after line \c 128 to build for 64-bit ARM + architecture: + + \badcode + arch-arm64) + ANDROID_TOOLS="aarch64-linux-android-gcc aarch64-linux-android-ranlib aarch64-linux-android-ld" + ;; + \endcode + \li Add the following after line \c 213 if \c _ANDROID_ARCH is set + to \c arch-arm64: + + \badcode + if [ "$_ANDROID_ARCH" == "arch-arm64" ]; then + export MACHINE=armv8 + export RELEASE=2.6.37 + export SYSTEM=android64 + export ARCH=arm + export CROSS_COMPILE="aarch64-linux-android-" + fi + \endcode + \li Comment out the \c FIPS section if it is not used or define the + \c FIPS_SIG environment variable with the FIPS signature + location. + \endlist + + \li Define \c ANDROID_NDK_ROOT environment variable with the NDK + location. + + \li Provide executable rights for the setup script and run it: + + \badcode + chmod a+x Setenv-android.sh + . ./Setenv-android.sh + \endcode + + The script prints the following configuration details to the prompt when it + completes: + + \badcode + ANDROID_NDK_ROOT: /home/user1/android-ndk-r10d + ANDROID_ARCH: arch-arm64 + ANDROID_EABI: aarch64-linux-android-4.9 + ANDROID_API: android-21 + ANDROID_SYSROOT: /home/user1/android-ndk-r10d/platforms/android-21/arch-arm64 + ANDROID_TOOLCHAIN: /home/user1/android-ndk-r10d/toolchains/aarch64-linux-android-4.9/prebuilt/linux-x86_64/bin + FIPS_SIG: + CROSS_COMPILE: aarch64-linux-androideabi- + ANDROID_DEV: /home/user1/android-ndk-r10d/platforms/android-21/arch-arm64/usr + \endcode + + \li Download the latest OpenSSL sources from \l{http://www.openssl.org/source}. \li Extract the sources to a folder and navigate to that folder using the CLI. \note If your development platform is Windows, you need \c msys with \c perl v5.14 or later to build OpenSSL. - \li Set the following environment variables to point to the ARM compiler - toolchain and sysroot you want to use: - \badcode - CC=<ANDROID_NDK_PATH>/toolchains/arm-linux-androideabi-<VER>/prebuilt/<NDK_HOST>/bin/arm-linux-androideabi-gcc - AR=<ANDROID_NDK_PATH>/toolchains/arm-linux-androideabi-<VER>/prebuilt/<NDK_HOST>/bin/arm-linux-androideabi-ar - RANLIB=<ANDROID_NDK_PATH>/toolchains/arm-linux-androideabi-<VER>/prebuilt/<NDK_HOST>/bin/arm-linux-androideabi-ranlib - ANDROID_DEV=<ANDROID_NDK_PATH>/platforms/<ANDROID-PLATFORM>/arch-arm/usr - \endcode - - \li Configure the OpenSSL sources to build for Android (ARMv5 or ARMv7) using + \li Configure the OpenSSL sources to build for Android using the following command: \badcode - ./Configure shared android or android-armv7 + ./Configure shared android \endcode \note You must consider enabling/disabling the SSL features based on the @@ -317,29 +395,10 @@ the APK: See the \l{OpenSSL Configure Options}{SSL configure options} for details about the configurable features. - \li Edit the \e Makefile created by \e Configure to avoid having shared - library names with the version number. Android does not load a library - with version number in the \c .so file name. - - \list a - \li Open the \e Makefile using an editor. - \li Replace the following two lines that appear under "\e{link-shared}" - and "\e{do_$(SHLIB_TARGET)}" make targets: - \badcode -LIBNAME=$$i LIBVERSION=$(SHLIB_MAJOR).$(SHLIB_MINOR) \ -LIBCOMPATVERSIONS=";$(SHLIB_VERSION_HISTORY)" \ - \endcode - - with - - \badcode -LIBNAME=$$i \ - \endcode - \li Save changes to the \e Makefile and close it. - \endlist + \li Run \c{make CALC_VERSIONS="SHLIB_COMPAT=; SHLIB_SOVER=" build_libs} to + build the \c libcrypto and \c libssl shared libraries that are not versioned. - \li Run \c{make build_libs} to build the \c libcrypto and \c libssl shared - libraries. + \note Android does not load versioned libraries. \li Open your Qt project using Qt Creator and update the "Build Android APK" settings to add \e libcrypto and \e libssl as additional libraries for @@ -349,8 +408,8 @@ LIBNAME=$$i \ \endlist Qt Creator builds your application and creates an application package (APK) -with the OpenSSL libraries bundled in it. Once the APK is ready, it uses adb to -deploy the APK on the target you chose and launch the application. +with the OpenSSL libraries bundled in it. Once the APK is ready, it uses \c adb +to deploy the APK on the target you chose and launch the application. */ diff --git a/doc/src/platforms/integrity-build-monolith-app-tutorial.qdoc b/doc/src/platforms/integrity-build-monolith-app-tutorial.qdoc new file mode 100644 index 000000000..b7d5a9ece --- /dev/null +++ b/doc/src/platforms/integrity-build-monolith-app-tutorial.qdoc @@ -0,0 +1,243 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage +** Licensees holding valid commercial Qt 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 +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + + +/*! + \page integrity-monolith-project-tutorial.html + \title Qt for INTEGRITY: Monolith Project Tutorial + \previouspage platform-notes-integrity.html + \nextpage integrity-installing-dependencies.html + + The INTEGRITY applications can be monolith application projects, + dynamic download application projects, or kernelspace projects. The monolith + application is a stand-alone executable that you can run directly on a + target device. + + In this tutorial, we build an INTEGRITY monolith project of + the Qt application. We also create a bootable SD card, so you can run + your application in the i.MX6 Quad board. After following the steps in this + tutorial, you will have the Qt for INTEGRITY development environment up and running. + + The tutorial assumes you have the + \l {https://boundarydevices.com/product/sabre-lite-imx6-sbc/} + {i.MX6 Quad board} with a micro SD card. + + Tutorial content: + \list 1 + \li \l {Installing Platform Dependencies} + \li \l {Preparing BSP for i.MX6 Quad Board} + \li \l {Building Qt for i.MX6 Quad Board} + \li \l {Building Monolith Project} + \li \l {Building U-Boot Image} + \li \l {Creating Bootable SD card} + \li \l {Preparing U-Boot} + \endlist + +*/ + +/*! + \page integrity-installing-dependencies.html + \title Installing Platform Dependencies + \previouspage integrity-monolith-project-tutorial.html + \nextpage integrity-preparing-bsp-for-imx6quad-board.html + + Before you can build the applications with Qt for INTEGRITY, + you must have the correct build tools and other dependencies installed + in the 64-bit Linux development host: + + \table 80% + \header \li Requirement \li Description + \row \li An INTEGRITY 11.4.4 installation + \li Installation must contain the patches for C++11 support. + Contact \l {https://support.ghs.com/contact/request-support/} + {Green Hills Software}. + \row \li MULTI IDE and Green Hills Software Compiler (version 2016.5.4 or newer) + \li The Green Hills Software development tools. See + \l {http://www.ghs.com/products/MULTI_IDE.html} {MULTI IDE}. + For licenses, contact \l {https://support.ghs.com/licensing/request-license/} + {Green Hills Software}. + \note You need to get an additional patch from Green Hills Software. + \row + \li An ELF (Executable and Linkable Format) loader compatible with a device tree + \li Part of the Green Hills Software development tools. + \row + \li The U-Boot tools + \li Universal Boot Loader (U-Boot) is used in the embedded devices to + package the instructions to boot the device's operating system kernel. + \note Especially \c mkimage is required. + \row + \li Perl programming language + \li Required if you are getting the Qt 5 sources via the Git version control system. + See \l {https://www.perl.org/get.html}. + \note Perl is not required if you download the Qt sources via + your Qt Account. + \endtable +*/ + +/*! + \page integrity-preparing-bsp-for-imx6quad-board.html + \title Preparing BSP for i.MX6 Quad Board + \previouspage integrity-installing-dependencies.html + \nextpage integrity-building-qt-for-imx6quad-board.html + + With MULTI Launcher, you can prepare the board support package (BSP) + for i.MX6 Quad board: + + \list 1 + \li Start MULTI Launcher. + \li Start Project Manager by selecting \uicontrol {Components} > + \uicontrol {Open Project Manager}. + \li In your INTEGRITY installation, select the project file \e {default.gpj} + under the \e {platform-cortex-a9} folder: + + \image open-project + + \li Select \uicontrol {Open}. + \endlist + + In the MULTI Project Manager view, you see a tree structure of the opened + project. + + Clean \e {default.gpj} and build the projects: + + \list 1 + \li Select \uicontrol {Build} > \uicontrol {Clean default.gpj}. + \li Select the files \e {system_libs.gpj}, \e {bsp_libs.gpj}, and + \e {kernel.gpj} one by one, and select \uicontrol {Build} > + \uicontrol {Build Project <file name>} for each selected file. + \endlist + + Preparation for the board support package is now done. +*/ + +/*! + \page integrity-building-qt-for-imx6quad-board.html + \title Building Qt for i.MX6 Quad Board + \previouspage integrity-preparing-bsp-for-imx6quad-board.html + \nextpage integrity-building-monolith.html + + \include integrity-building-qt-imx6.qdocinc building qt for imx6quad +*/ + +/*! + \page integrity-building-monolith.html + \title Building Monolith Project + \previouspage integrity-building-qt-for-imx6quad-board.html + \nextpage integrity-building-u-boot-image.html + + \include integrity-building-monolith.qdocinc building monolith +*/ + +/*! + \page integrity-building-u-boot-image.html + \title Building U-Boot Image + \previouspage integrity-building-monolith.html + \nextpage integrity-creating-bootable-sd-card.html + + To build a U-Boot image, open a terminal and navigate to the project + directory created in \l {Building Monolith Project}. In our example the + project directory is \e {mymonolith}. + + Under the project directory, you will find an executable with the same name + you gave to your monolith in \l {Project Manager Settings}. + In our example the executable name is \e {myproject}. + + Run the \c elfloader command for the executable. You will find the \c elfloader + command under your compiler directory: + + \badcode + john@doe: /usr/ghs/comp_201654/elfloader -l /usr/ghs/int1144/util/elfloader/cortexa9_elfloader.bin -o myproject.elf myproject + \endcode + + The example \c elfloader command above assumes your Green Hills Software (GHS) + compiler is version 2016.5.4, and your INTEGRITY and GHS compiler + installations are found from their default locations. However, you can + modify the paths in the example according to your configuration. + + Finally, build the U-Boot image with the \c mkimage tool. + The last argument in the \c mkimage command specifies the U-Boot image name. + In the example below, we use the name \e {demo.image}. + To invoke \c mkimage, run the following command in a terminal: + + \badcode + john@doe: mkimage -A arm -O linux -T kernel -C none -a 20000000 -e 20000000 -n INTEGRITY+Qt -d myproject.elf demo.image + \endcode +*/ + +/*! + \page integrity-creating-bootable-sd-card.html + \title Creating Bootable SD Card + \previouspage integrity-building-u-boot-image.html + \nextpage integrity-preparing-u-boot.html + + With a bootable micro SD card your i.MX6 Quad board can run the INTEGRITY + monolith application on the board. To create the bootable SD card: + + \list 1 + \li Format the SD card with a FAT32 filesystem. + \li Save the \e {demo.image} file (built with \c mkimage in + \l {Building U-Boot Image}) and the device tree blob file + \e {imx6q-sabrelite.dtb} for the i.MX6 Quad board under your SD card root. + \note You will find the device tree blob file in your INTEGRITY installation, + under the path + /usr/ghs/int1144/platform-cortex-a9/imx6-sabrelite/imx6q-sabrelite.dtb. + \li Set the SD card into your i.MX6 Quad board. + \endlist + +*/ + +/*! + \page integrity-preparing-u-boot.html + \title Preparing U-Boot + \previouspage integrity-creating-bootable-sd-card.html + \nextpage integrity-monolith-project-tutorial.html + + Finally, prepare the i.MX6 Quad board for U-Boot: + + \list 1 + \li Connect to your i.MX6 Quad board with a serial connection at a baud rate of + 115200. + \li Set the following environment variables in the U-Boot terminal: + + \badcode + setenv bootcmd_demo_dt 'mmc dev 1; + fatload mmc 1:1 20000000 demo.image; + fatload mmc 1:1 4FFE0000 imx6q-sabrelite.dtb; + bootm 20000000 - 4FFE0000' + + setenv bootcmd 'run bootcmd_demo_dt' + saveenv + \endcode + + \note The file \e {demo.image} was built with the mkimage tool in + \l {Building U-Boot Image}. + + \li Reset the i.MX6 Quad board. + \endlist + + Now your i.MX6 Quad board is ready to run your application. +*/ diff --git a/doc/src/platforms/integrity-building-monolith.qdocinc b/doc/src/platforms/integrity-building-monolith.qdocinc new file mode 100644 index 000000000..c89a05b58 --- /dev/null +++ b/doc/src/platforms/integrity-building-monolith.qdocinc @@ -0,0 +1,360 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage +** Licensees holding valid commercial Qt 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 +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ +/*! +//! [building monolith] + + In this tutorial, we build a monolith INTEGRITY project for a Qt example + application. You can select any Qt example application that uses the + \l {Supported Qt Modules} {supported Qt modules}. + + Before you can build a monolith INTEGRITY project, you need to prepare your + build environment for the \c qmake build tool. You can do this by running + the script \e {~/setEnvironment.sh} that you created in + \l {Creating Script for Running Exports}. + + Run the following commands in a terminal: + + \badcode + source ~/setEnvironment.sh + <Qt installation path>/qtbase/bin/qmake <Qt example application path>/<projectname>.pro + make + \endcode + + The \c qmake tool must be called under the Qt installation path + (<Qt installation path>), where you installed the Qt sources in + \l {Getting Qt Source Code}. + + <Qt example application path>/<projectname>.pro is the installation path of + the Qt example application project file that the monolith INTEGRITY project + will be built for. + + \section1 Building Monolith Project + + To build a monolith INTEGRITY project, create an empty directory for your + project in your home folder. In the steps below, we use the directory name + \e {mymonolith}. + + \section2 Defining Project with Project Wizard + + Launch MULTI Launcher and select \uicontrol {File} > \uicontrol + {Create New Project}. Define your monolith project with Project Wizard: + + \list 1 + \li In the \uicontrol {Project name} tab, fill in the \uicontrol {Directory} + field with the directory you just created. + \li Select \uicontrol {Next}. + \li In the \uicontrol {Operating System} tab, select \e {INTEGRITY} + from the \uicontrol {Operating System} list. + \note The \uicontrol {OS Distribution Directory} field must contain your + INTEGRITY installation directory (in our example, \e{mymonolith}). + \li Select \uicontrol {Next}. + \li In the \uicontrol {Processor Family} tab, select \uicontrol {ARM}. + \li Select \uicontrol {Next}. + \li In the \uicontrol {Target Board} tab, select \uicontrol {ARM Cortex-A9 Platform } + from the target board list. + \li Select \uicontrol {Finish}. + \endlist + + \image project-wizard + + After selecting \uicontrol {Finish} in Project Wizard, Project Manager is + opened. + + \section2 Project Manager Settings + + With Project Manager you can define the settings for the monolith project: + + \list 1 + \li In the \uicontrol {Select Item to Add} dialog page, select \uicontrol + {Monolith} from the \uicontrol {Create New} list. + + \image select-item-to-add + + \li Select \uicontrol {Next}. + \li In the \uicontrol {Settings for Monolith} dialog, define the settings: + \list + \li \uicontrol {Source Code Directory} is your project directory + (in our example, \e {mymonolith}). + \li \uicontrol {Project Name} is the name of your project. In our + example, we use the name \e{myproject}. + \li \uicontrol {Language} must be \uicontrol {C}. The Qt projects are + C++ projects, but this will be configured later. + \li Select \uicontrol {Next}. + \li \uicontrol {Use Shared Libraries} should not be selected. + \li Select \uicontrol {Next}. + \endlist + \li In the \uicontrol {Configure number of Virtual AddressSpaces} dialog + page, select the checkbox \uicontrol {Names of Virtual Address Spaces} and + type \e{galcore}. + \li Select \uicontrol {Next}. + \li In the \uicontrol {Settings for Kernel} dialog page, type the name of + your kernel. + \li Select \uicontrol {Debugging}, \uicontrol {Dynamic Load} and + \uicontrol {ResourceManager} from the \uicontrol {Kernel Libraries} list. + + \image kernel-settings + + \li Select \uicontrol {Next}. + \li In the \uicontrol {Settings for OS Module Selection} dialog page, + select \uicontrol {File System (User Configured)} and \uicontrol + {GHnet IPv4 Stack (Virtual)} from the \uicontrol {OS Module} list. + \li Select \uicontrol {Next}. + \li In the \uicontrol {Settings for File System (User Configured)} dialog + page, select a filesystem that your monolith project supports. + + In our example, we have selected \uicontrol {MSDOS FAT} from the + \uicontrol {Libraries} list. + \li Select \uicontrol {Finish}. + \li In the \uicontrol {Settings for Add File System Clients} dialog page, + select \uicontrol {Finish}. + \endlist + + \section2 Adding File System Mount Point + + You need to configure the file system to use the first partition of the + micro SD card. In the MULTI Project Manager view, you see a tree structure + of your monolith project: + + \list 1 + \li Right-click the file \e {mounttable.c} to open the context menu. + \li Select \uicontrol {Modify Project} > + \uicontrol {Add INTEGRITY File System Mount Point}. + \li In the \uicontrol {Settings for FS MountPoint} dialog, define + the settings: + \list + \li Type \e {/} to \uicontrol {Mount Directory}. + \li Select \uicontrol {Next}. + \li \uicontrol {File System Type} is \e {MSDOS FAT}. + \li Select \uicontrol {Next}. + \li Select the \uicontrol {Use Physical Device} radio button. + \li Type \e {SDCardDev1} to the \uicontrol {Device} field. + \li \uicontrol {Slice} is \e {a}. + \li Select \uicontrol {Finish}. + \endlist + \endlist + + \section2 Galcore VAS Settings + + Next, define the virtual address space (VAS) settings for your project. + + In the MULTI Project Manager view, you see a tree structure of your monolith + project: + + \list 1 + \li Double-click the .int file in your project (1) (in the steps below, + \e {myproject.int}). + \li In the opened window, double-click the galcore virtual address + space (VAS) area (2). + + \image project-view + + \li \uicontrol {VirtualAddressSpace Options} dialog is opened. + \li In the \uicontrol {Attributes} tab, select the values defined in + \l {Values in Attributes Tab}. + \li Select \uicontrol {OK}. + \li In the galcore virtual address space area, double-click the + \uicontrol {Task Initial} area (3). + + \image project-view-2 + + \li Select the \uicontrol {Start Automatically} check box. + \li Select \uicontrol {OK}. + \endlist + + \section3 Values in Attributes Tab + + Add the following attribute values for the virtual address space: + + \table 80% + \header \li Attribute \li Value + \row + \li Maximum Priority + \li 255 + \row + \li Maximum Weight + \li 255 + \row + \li Memory Pool Size + \li 2000P + \row + \li Heap Size + \li 0X2000000 + \row + \li Heap Extension Reserved Size + \li 0x20000 + \row + \li Arguments + \li Leave blank. + \header \li Checkbox \li Value + \row + \li Create Extra Virtual Memory Regions + \li Select the checkbox. + \endtable + + \section2 Editing Galcore Project + + You need to edit a number of files in the monolith project. + + \section3 File galcore.c + + \list 1 + \li Select \e{galcore.c} from the tree structure in the MULTI Project + Manager view. + \li Double-click the file to open it for editing. + \li Add the following code to \e{galcore.c}: + + \badcode + #include <INTEGRITY.h> + #include <stdlib.h> + #include <stdio.h> + extern Error GalCore_TaskInit(void); + int main(void) { + Error E; + E = GalCore_TaskInit(); + if (E != Success) { + printf("Failed to start GalCore tasks\n"); + } + Exit(0); + } + \endcode + \endlist + + \section3 File galcore.gpj + + \list 1 + \li Select \e{galcore.gpj} from the tree structure in the MULTI Project + Manager view. + \li Right-click the file to open the context menu. + \li Select \uicontrol{Edit}. + \li Add the file \e{libgalcore.a} to \e{galcore.gpj}. + \endlist + + Contents of \e{galcore.gpj} should be as follows: + + \badcode + #!gbuild + #component integrity_virtual_address_space + [Program] + -lgalcore + tgt/INTEGRITY.ld + galcore.c + \endcode + + \section3 File kernel.gpj + + \list 1 + \li Select \e{kernel.gpj} from the tree structure in the MULTI Project + Manager view. + \li Right-click the file to open the context menu. + \li Select \uicontrol{Edit}. + \li Add the file \e{libgalcore-iod.a} to \e{kernel.gpj}. + \endlist + + Contents of \e{kernel.gpj} should be as follows: + + \badcode + #!gbuild + #component integrity_kernel_monolith + [Program] + -kernel + -ldebug + -lload + -lres + -lgalcore-iod + tgt/default.ld + myproject_kernel.c + global_table.c + \endcode + + \section3 File monolith.gpj + + \list 1 + \li Select \e{monolith.gpj} from the tree structure in the MULTI Project + Manager view. + \li Righ-click the file to open the context menu. + \li Select \uicontrol{Edit}. + \li Add the additional library directory \e {$(__LIBS_DIR_BASE)/Vivante}. + \endlist + + Contents of \e{monolith.gpj} should be as follows: + + \badcode + #!gbuild + #component integrity_monolith + [INTEGRITY Application] + -non_shared + -I$__OS_DIR/modules/ghs/ghnet2/source/kernel/integrity/ip4server :sourceDir=$__OS_DIR/modules/ghs/ghnet2/source/kernel/integrity/ip4server + -L$(__LIBS_DIR_BASE)/Vivante + tgt/default.bsp + myproject.int + galcore.gpj [Program] + myproject_kernel.gpj [Program] + my_ivfsserver_module.gpj [Program] + ip4server_module.gpj [Program] + \endcode + + \section3 .int File + + \list 1 + \li Select the \e {.int} file of your project from the tree structure in the MULTI Project + Manager view. + \li Right-click the file to open the context menu. + \li Select \uicontrol{Edit}. + \li Add the following lines at the end of the file. + + \note Replace </path/to/your/app/executable> with a path to your application executable. + + \badcode + AddressSpace + Name myappname + Filename /path/to/your/app/executable + MemoryPoolSize 0x2000000 + Language C++ + HeapSize 0x6000000 + + Task Initial + StackSize 0x30000 + StartIt true + EndTask + HeapExtensionReservedSize 0x2000000 + EndAddressSpace + \endcode + \endlist + + \section2 Building monolith.gpj + + Open \e{monolith.gpj} from the tree structure in the MULTI Project Manager + view. To build the project: + + \list 1 + \li Right-click \e{monolith.gpj} to open the context menu. + \li Select \uicontrol{Build}. + \endlist + + Your monolith project is now ready to be packaged for U-Boot. +//! [building monolith] +*/ diff --git a/doc/src/platforms/integrity-building-qt-imx6.qdocinc b/doc/src/platforms/integrity-building-qt-imx6.qdocinc new file mode 100644 index 000000000..37a203284 --- /dev/null +++ b/doc/src/platforms/integrity-building-qt-imx6.qdocinc @@ -0,0 +1,141 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage +** Licensees holding valid commercial Qt 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 +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + + +/*! +//! [building qt for imx6quad] + To set up the development environment for Qt for INTEGRITY, you need to + build Qt from the sources for the i.MX6 Quad board. Before building Qt, + create a shell script that will run the exports for your environment. + + \section1 Creating Script for Running Exports + + Create a new shell script \e{setEnvironment.sh}, and save it under + your home folder. Add the following export commands to the script: + + \badcode + export PATH=$PATH:/usr/ghs/comp_201654 + export INTEGRITY_DIR=/usr/ghs/int1144 + export INTEGRITY_BSP=platform-cortex-a9 + export GL_INC_DIR=/usr/ghs/int1144/INTEGRITY-include/Vivante/sdk/inc + export GL_LIB_DIR=/usr/ghs/int1144/libs/Vivante + \endcode + + These exports assume you have used the default installation directories + while installing MULTI IDE and INTEGRITY (see + \l {Installing Platform Dependencies}). If you have not used the default + directories, you need to adjust the exported paths accordingly. + + To initialize your build environment, run the following command in a terminal: + + \badcode + source ~/setEnvironment.sh + \endcode + + \note You need to run this command in your terminal every time you build Qt, + or use the \c qmake build system. + + \section1 Getting Qt Source Code + + You can download the Qt source code via your + \l {https://login.qt.io/login} {Qt Account}. + + You can also get the Qt sources via the Git version control system. Qt Wiki has + instructions for getting Qt sources via Git, see + \l {https://wiki.qt.io/Building_Qt_5_from_Git#Getting_the_source_code}. + You find the step by step instructions also from \l {Getting Qt Sources via Git}. + + \section2 Getting Qt Sources via Git + + Clone the top-level Qt 5 repository by running the following command in + a terminal: + + \badcode + git clone git://code.qt.io/qt/qt5.git + \endcode + + \note If you are behind a firewall and want to use the HTTPS protocol, + you can clone the top-level Qt 5 repository with the following command: + + \badcode + git clone https://code.qt.io/qt/qt5.git + \endcode + + Check out the target branch and the Qt sources with the following commands: + + \badcode + cd qt5 + git checkout <Qt version> + perl init-repository + \endcode + + For example, the \c {git checkout} command for Qt 5.9.0 is \c {git checkout 5.9.0}. + + The init-repository script initializes the Qt 5 repository and clones various + Qt 5 sub-modules (see + \l {https://wiki.qt.io/Building_Qt_5_from_Git#Getting_the_submodule_source_code}). + Qt modules supported by Qt for INTEGRITY are listed in \l {Supported Qt Modules}. + + \section1 Configuring Qt + + Configure Qt for the i.MX6 Quad board with the following command: + + \badcode + cd <Qt installation directory> + ./configure -developer-build -xplatform integrity-armv7-imx6 -confirm-license + -opensource -nomake examples -nomake tests -no-dbus -silent -opengl es2 -static + \endcode + + \note INTEGRITY supports only static Qt builds. + + \section1 Building Qt + + Build Qt with the \c make command in the terminal. You can run \c make with as + many cores on your host machine as you desire. In our example we use six cores: + + \badcode + make -j6 + \endcode + + \section1 Installing Qt + + If you have not used the configure options + \c {-developer-build} or \c {-prefix $PWD/qtbase} in \l {Configuring Qt}, + run the following command in a terminal: + + \badcode + cd <Qt installation directory> + make install + \endcode + + If you have used the configure options \c {-developer-build} or + \c {-prefix $PWD/qtbase}, you can use Qt from the build + directory, without running the \c {make install} command. + + Qt is now configured and built for the i.MX6 Quad board. +//! [building qt for imx6quad] +*/ diff --git a/doc/src/platforms/platform-notes-integrity.qdoc b/doc/src/platforms/platform-notes-integrity.qdoc new file mode 100644 index 000000000..0432f683d --- /dev/null +++ b/doc/src/platforms/platform-notes-integrity.qdoc @@ -0,0 +1,78 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage +** Licensees holding valid commercial Qt 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 +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + + +/*! + \page platform-notes-integrity.html + \title Platform Notes - INTEGRITY + \contentspage Platform Notes + \keyword INTEGRITY + + From Qt 5.9 onwards, the Green Hills Software + \l {http://www.ghs.com/products/rtos/integrity.html} {INTEGRITY} + Real-Time Operating System (RTOS) is a supported platform. + + The INTEGRITY RTOS is widely used in safety- and security-critical systems. + Especially in the automotive industry, both Qt and the INTEGRITY RTOS can be + used in conjunction with instrument clusters and infotainment systems. + + With Qt for INTEGRITY you can build and develop applications for the + INTEGRITY RTOS. Qt for INTEGRITY supports most \l {Supported Qt Modules} {Qt Modules}. + The development environment includes your target device and Qt sources + that you need to build for your target device. + See \l {Supported Development Hosts and Boards} for detailed information + about the supported development environment. + + Qt for INTEGRITY has a tutorial that helps you learn how to: + \list + \li Set up a development environment for the i.MX6 Quad board + \li Build an INTEGRITY application + \li Prepare the i.MX6 Quad board to run your application + \endlist + + See \l {Qt for INTEGRITY: Monolith Project Tutorial}. + + \section1 Supported Qt Modules + + Qt for INTEGRITY has been tested to support the following Qt modules: Qt Core, + Qt Network, Qt GUI, Qt Quick, Qt QML, Qt Quick Controls 2, Qt 3D, Qt Widgets, + Qt Image Formats, Qt XML Patterns, Qt SVG. + + Other Qt modules may work with Qt for INTEGRITY, but we cannot guarantee that. + + \section1 Supported Development Hosts and Boards + + Qt for INTEGRITY can be built on 64-bit Linux distributions. + + Qt for INTEGRITY supports building and developing applications for the + following development boards: + \list + \li \l {https://boundarydevices.com/product/sabre-lite-imx6-sbc/} + {Boundary Devices BD-SL-i.MX6} + \li \l {http://www.nvidia.com/object/tegra-x1-processor.html} {NVIDIA Tegra X1} + \endlist +*/ diff --git a/doc/src/platforms/platform-notes-rtos.qdoc b/doc/src/platforms/platform-notes-rtos.qdoc index c1ef19f8c..2ca9d651a 100644 --- a/doc/src/platforms/platform-notes-rtos.qdoc +++ b/doc/src/platforms/platform-notes-rtos.qdoc @@ -326,15 +326,3 @@ \l{Installing Files} in the \l {QMake} documentation for more details. */ - -/*! - \page platform-notes-integrity.html - \title Platform Notes - INTEGRITY - \contentspage Platform Notes - \keyword INTEGRITY - - \note \l {http://www.ghs.com/products/rtos/integrity.html}{INTEGRITY} is a community supported platform - - \sa {http://blog.qt.io/blog/2012/06/01/developing-with-qt-commercial-for-integrity-on-windows-a-step-by-step-guide-to-configure-and-compile-qt-commercial-on-integrity-2/}{Developing with Qt Commercial for INTEGRITY on Windows} - \sa {http://qt.gitorious.org/qt/qt-integrity}{the git repository} -*/ diff --git a/doc/src/platforms/supported-platforms.qdocinc b/doc/src/platforms/supported-platforms.qdocinc index dd1b62001..83947b6e8 100644 --- a/doc/src/platforms/supported-platforms.qdocinc +++ b/doc/src/platforms/supported-platforms.qdocinc @@ -40,7 +40,7 @@ Mobile Platforms: \l {Qt for Android}{Android}, //! [all] \section1 Qt 5.9 -\b {Supported until one year after release} +\b {Long-term support (LTS)}: Supported until three years after release //! [5.9] //! [latest] @@ -76,9 +76,6 @@ Mobile Platforms: \l {Qt for Android}{Android}, \row \li Red Hat Enterprise Linux 7.2 (64-bit) \li \b {GCC 5.3.1} \li devtoolset-4 - \row \li Ubuntu 14.04 (64-bit) - \li GCC 4.8.2 - \li Ubuntu 4.8.2-19ubuntu1 \row \li Ubuntu 16.04 (64-bit) \li \b {GCC as provided by Canonical} \li @@ -92,22 +89,26 @@ Mobile Platforms: \l {Qt for Android}{Android}, \li \row \li {3,1} \header \li {3,1} - Embedded Platforms: \l {Qt for Embedded Linux}{Embedded Linux}, \l {QNX} + Embedded Platforms: \l {Qt for Embedded Linux}{Embedded Linux}, \l {QNX}, \l {INTEGRITY} \row \li \l {Qt for Embedded Linux}{Embedded Linux} \li GCC \li ARM Cortex-A, Intel boards with GCC-based toolchains \row \li QNX 6.6.0, 7.0 (armv7le and x86) - \li \b {QCC as provided by QNX) - \li Hosts: \b {RHEL 6.6 (64-bit)}, \b {RHEL 7.2 (64-bit)}, Windows + \li \b {GCC as provided by QNX} + \li Hosts: \b {RHEL 6.6 (64-bit)}, \b {RHEL 7.2 (64-bit)}, + \b {Windows 10 (64-bit)}, \b {Windows 7 (32-bit)} + \row \li \l {INTEGRITY} {INTEGRITY 11.4.x} + \li As provided by Green Hills INTEGRITY + \li Hosts: 64-bit Linux \row \li {3,1} \header \li {3,1} Mobile Platforms: \l {Qt for Android}{Android}, \l {Qt for iOS}{iOS}, - Ubuntu Touch, Universal Windows Platform (UWP) + Universal Windows Platform (UWP) \row \li Universal Windows Platform (UWP) (x86, \b x86_64, armv7) - \li \b {MSVC 2017}, \b {MSVC 2015} + \li MSVC 2017, \b {MSVC 2015} \li Hosts: \b {Windows 10} \row \li iOS 8, 9, 10 (armv7, arm64) \li \b {Clang as provided by Apple} - \li \b {\macos 10.12 host} + \li \b {\macos 10.10 host} \row \li Android (API Level: 16) \li \b {GCC as provided by Google}, \b {MinGW 5.3} \li Hosts: \b {RHEL 7.2 (64-bit)}, \b{\macos 10.12}, \b {Windows 7 (64-bit)} @@ -275,7 +276,7 @@ Mobile Platforms: \l {Qt for Android}{Android}, \section1 Qt 5.6 //! [5.6] - \b {Supported until Mar. 16, 2019} + \b {Long-term support (LTS)}: Supported until Mar. 16, 2019 \table 80% \header \li Platform \li Compiler \li Notes diff --git a/doc/src/qmlapp/deployment.qdoc b/doc/src/qmlapp/deployment.qdoc index 7d5608915..df2bb22c0 100644 --- a/doc/src/qmlapp/deployment.qdoc +++ b/doc/src/qmlapp/deployment.qdoc @@ -61,6 +61,87 @@ the \c QT_INSTALL_QML environment points to the location of the libraries. The \l{Downloads}{Qt Installers} install the QML libraries in \e{<version>}\c{/}\e{<compiler>}\c{/qml} directory. +\section1 QML Caching + +The QML runtime loads QML documents by parsing them and generating native code. +Most of the time the document hasn't changed since the last time it was loaded. +In order to speed up this loading process, the QML runtime maintains a cache +file for each qml document. This cache file contains the native code and a +binary representation of the QML document structure. In addition, when multiple +applications use the same QML document, the memory needed for the code is +shared between application processes. The cache files are loaded via the \c +mmap() system call on POSIX compliant operating systems or \c +CreateFileMapping() on Windows, resulting in significant memory savings. + +Each time you load a changed QML document, the cache is automatically +re-created. Cache files are located in the same directory as the source code, +if the directory is writable. Otherwise they will be placed in a sub-directory +of QStandardPaths::CacheLocation with the name "qmlcache". The file extension +is \c .qmlc for QML documents and \c .jsc for imported JavaScript modules. + +\section1 QML Caching for Deployment (Preview) + +The automatic caching of QML documents into cache files result in significantly +faster load times of applications. However, the initial creation of cache files +can still take time, especially when the application starts first. To avoid +that initial step and provide faster start-up times from the very beginning, +Qt's build system allows you to create these cache files in advance. + +If you would like to deploy your application with cache files generated ahead +of time, you must satisfy four conditions in your \c .pro file: + +\list +\li All QML documents (including JavaScript files) must be added to the +\c QML_FILES variable. +\li Your .pro file must use the \c load(qml_module) or \c load(qml_plugin) +directive at the end, to activate the processing of \c QML_FILES and generation +of install rules. +\li The \c TARGETPATH variable must contain the import name of your QML +module with forward slashes as separators. +\li You must enable Ahead-of-Time caching using the \c CONFIG+=qmlcache directive. +\endlist + +For example if you are developing the module \c MyCompany.CommonComponents, +then your \c .pro file could look like this: + +\code +TARGETPATH = MyCompany/CommonComponents +QML_FILES = BlueButton.qml RedSlider.qml qmldir +CONFIG += qmlcache +load(qml_module) +\endcode + +Similarly, if your module contains a C++ plugin then you use \c qml_plugin: + +\code +TARGETPATH = MyCompany/CommonComponents +QML_FILES = BlueButton.qml RedSlider.qml qmldir +CONFIG += qmlcache +SOURCES = plugin.cpp +QT += quick +load(qml_plugin) +\endcode + +In these examples the QML module consisting of the QML documents, the \c qmldir +file, and optionally the C++ plugin, will be installed into the +MyCompany/CommonComponents sub-directory of \c $$[QT_INSTALL_QML]. By enabling +the \c qmlcache configuration, the cache files will be created at build time +and also installed into the same directory for deployment. + +\section2 Limitations + +Currently this feature has some limitations: + +\list +\li Only QML and JavaScript documents that are part of a QML module can be +compiled ahead of time. +\li For cross-compilation, only the ARMv7 and ARMv8 target architectures are +supported. +\li For native compilation, Ahead-of-Time caching is limited to architectures +where the QML runtime supports Just-in-Time compilation. This includes x86, x86-64, +ARMv7, ARMv8 and MIPS32. +\endlist + \section1 Prototyping with QML Scene The Declarative UI package includes a QML runtime tool, diff --git a/doc/src/qmlapp/performance.qdoc b/doc/src/qmlapp/performance.qdoc index 7e10b1239..87ea8d220 100644 --- a/doc/src/qmlapp/performance.qdoc +++ b/doc/src/qmlapp/performance.qdoc @@ -582,6 +582,16 @@ Also remember that you can avoid doing composition work at run-time by providing pre-composed image resource with your application (for example, providing elements with shadow effects). +\section3 Avoid Smoothing Images + +Enable \c{image.smooth} only if required. It is slower on some hardware, and it has no visual +effect if the image is displayed in its natural size. + +\section3 Painting + +Avoid painting the same area several times. Use Item as root element rather than Rectangle +to avoid painting the background several times. + \section2 Position Elements With Anchors It is more efficient to use anchors rather than bindings to position items @@ -731,8 +741,7 @@ buffering of delegates outside of the visible area. Utilizing a \c cacheBuffer i recommended for view delegates that are non-trivial and unlikely to be created within a single frame. -Be mindful that a \c cacheBuffer keeps additional delegates in-memory and therefore the -value derived from utilizing the \c cacheBuffer must be balanced against additional memory +Bear in mind that a \c cacheBuffer keeps additional delegates in-memory. Therefore, the value derived from utilizing the \c cacheBuffer must be balanced against additional memory usage. Developers should use benchmarking to find the best value for their use-case, since the increased memory pressure caused by utilizing a \c cacheBuffer can, in some rare cases, cause reduced frame rate when scrolling. @@ -760,7 +769,7 @@ thread (and therefore can cause frames to be skipped if they take too long to co \section2 Particles The \l {QtQuick.Particles}{Qt Quick Particles} module allows beautiful particle effects to be integrated -seamlessly into user interfaces. However every platform has different graphics hardware +seamlessly into user interfaces. However, every platform has different graphics hardware capabilities, and the Particles module is unable to limit parameters to what your hardware can gracefully support. The more particles you attempt to render (and the larger they are), the faster your graphics hardware will need to be in order to render at 60 FPS. Affecting @@ -881,8 +890,8 @@ memory will be allocated are very important considerations. Aside from the obvio concerns about out-of-memory conditions on memory-constrained devices, allocating memory on the heap is a fairly computationally expensive operation, and certain allocation strategies can result in increased fragmentation of data across pages. JavaScript uses -a managed memory heap which is automatically garbage collected, and this provides some -advantages but also has some important implications. +a managed memory heap which is automatically garbage collected, and this has some +advantages, but also some important implications. An application written in QML uses memory from both the C++ heap and an automatically managed JavaScript heap. The application developer needs to be aware of the subtleties @@ -903,8 +912,8 @@ on \l{Lazy Initialization} for more information. \section3 Destroy unused objects -If you lazily instantiate components, or dynamically create objects during a JavaScript -expression, it is often better to manually \c{destroy()} them rather than waiting for +If you lazy load components, or create objects dynamically during a JavaScript +expression, it is often better to \c{destroy()} them manually rather than wait for automatic garbage collection to do so. See the prior section on \l{Controlling Element Lifetime} for more information. @@ -939,7 +948,7 @@ can improve the modularity and maintainability of a component. In those cases, u custom properties is encouraged. However, the new type should, if it is used more than once, be split into its own component (.qml file) in order to conserve memory. -\section3 Re-use existing components +\section3 Reuse existing components If you are considering defining a new component, it's worth double checking that such a component doesn't already exist in the component set for your platform. Otherwise, you @@ -962,40 +971,40 @@ dependent upon decisions made by the application developer. The C++ heap will contain: \list \li the fixed and unavoidable overhead of the QML engine (implementation data - structures, context information, and so on) + structures, context information, and so on); \li per-component compiled data and type information, including per-type property - metadata, which is generated by the QML engine depending on which modules are - imported by the application and which components the application loads + metadata, which is generated by the QML engine depending on which modules and + which components are loaded by the application; \li per-object C++ data (including property values) plus a per-element metaobject - hierarchy, depending on which components the application instantiates - \li any data which is allocated specifically by QML imports (libraries) + hierarchy, depending on which components the application instantiates; + \li any data which is allocated specifically by QML imports (libraries). \endlist The JavaScript heap will contain: \list \li the fixed and unavoidable overhead of the JavaScript engine itself (including - built-in JavaScript types) + built-in JavaScript types); \li the fixed and unavoidable overhead of our JavaScript integration (constructor - functions for loaded types, function templates, and so on) + functions for loaded types, function templates, and so on); \li per-type layout information and other internal type-data generated by the JavaScript - engine at runtime, for each type (see note below, regarding types) + engine at runtime, for each type (see note below, regarding types); \li per-object JavaScript data ("var" properties, JavaScript functions and signal - handlers, and non-optimized binding expressions) - \li variables allocated during expression evaluation + handlers, and non-optimized binding expressions); + \li variables allocated during expression evaluation. \endlist Furthermore, there will be one JavaScript heap allocated for use in the main thread, and optionally one other JavaScript heap allocated for use in the WorkerScript thread. If an application does not use a WorkerScript element, that overhead will not be incurred. The JavaScript heap can be several megabytes in size, and so applications written for -memory-constrained devices may be best served to avoid using the WorkerScript element +memory-constrained devices may be best served by avoiding the WorkerScript element despite its usefulness in populating list models asynchronously. Note that both the QML engine and the JavaScript engine will automatically generate their own caches of type-data about observed types. Every component loaded by an application -is a distinct (explicit) type, and every element (component instance) which defines its +is a distinct (explicit) type, and every element (component instance) that defines its own custom properties in QML is an implicit type. Any element (instance of a component) -which does not define any custom properties is considered by the JavaScript and QML engines +that does not define any custom property is considered by the JavaScript and QML engines to be of the type explicitly defined by the component, rather than its own implicit type. Consider the following example: @@ -1037,13 +1046,13 @@ In the previous example, the rectangles \c r0 and \c r1 do not have any custom p and thus the JavaScript and QML engines consider them both to be of the same type. That is, \c r0 and \c r1 are both considered to be of the explicitly defined \c Rectangle type. The rectangles \c r2, \c r3 and \c r4 each have custom properties and are each considered -to be different (implicit) types. Note that \c r3 and \c r4 are each considered to be of +to be of different (implicit) types. Note that \c r3 and \c r4 are each considered to be of different types, even though they have identical property information, simply because the custom property was not declared in the component which they are instances of. If \c r3 and \c r4 were both instances of a \c RectangleWithString component, and that component definition included the declaration of a string property named \c customProperty, -then \c r3 and \c r4 would be considered to be the same type (that is, they would be +then \c r3 and \c r4 would be considered to be of the same type (that is, they would be instances of the \c RectangleWithString type, rather than defining their own implicit type). \section2 In-Depth Memory Allocation Considerations @@ -1065,12 +1074,12 @@ Fragmentation is a C++ development issue. If the application developer is not de any C++ types or plugins, they may safely ignore this section. Over time, an application will allocate large portions of memory, write data to that -memory, and subsequently free some portions of that memory once it has finished using +memory, and subsequently free some portions of it once it has finished using some of the data. This can result in "free" memory being located in non-contiguous chunks, which cannot be returned to the operating system for other applications to use. It also has an impact on the caching and access characteristics of the application, as the "living" data may be spread across many different pages of physical memory. This -in turn could force the operating system to swap which can cause filesystem I/O - which +in turn could force the operating system to swap, which can cause filesystem I/O - which is, comparatively speaking, an extremely slow operation. Fragmentation can be avoided by utilizing pool allocators (and other contiguous memory diff --git a/doc/src/whatsnew/whatsnew56.qdoc b/doc/src/whatsnew/whatsnew56.qdoc index ed176b392..494539416 100644 --- a/doc/src/whatsnew/whatsnew56.qdoc +++ b/doc/src/whatsnew/whatsnew56.qdoc @@ -30,6 +30,8 @@ \title What's New in Qt 5.6 \brief Lists the new features in Qt 5.6. + Qt 5.6 is a long-term support (LTS) release. + \section1 New Modules \list diff --git a/doc/src/whatsnew/whatsnew59.qdoc b/doc/src/whatsnew/whatsnew59.qdoc index a54cc7051..29ccad60f 100644 --- a/doc/src/whatsnew/whatsnew59.qdoc +++ b/doc/src/whatsnew/whatsnew59.qdoc @@ -30,6 +30,8 @@ \title What's New in Qt 5.9 \brief Lists the new features in Qt 5.9. + Qt 5.9 is a long-term support (LTS) release. + \section1 New Features in Qt 5.9 \section2 Qt Core Module |
