diff options
author | Thomas Hartmann <Thomas.Hartmann@theqtcompany.com> | 2016-01-21 14:53:16 +0100 |
---|---|---|
committer | Thomas Hartmann <Thomas.Hartmann@theqtcompany.com> | 2016-02-02 12:20:17 +0000 |
commit | 51661d4da9e7574fa9dc69438a91be5dd30f1a8c (patch) | |
tree | 5063e30feed6e4ea665ad5ad310cad81706e427a | |
parent | cc1ed420c21f192be159a42878645e395db140bb (diff) |
Remove QmlDump source
QmlDump was replaced by qmlplugindump.
Change-Id: I553864756356f5cf591195b6b3f50f467ba53f59
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
-rw-r--r-- | share/qtcreator/qml/qmldump/Info.plist.in | 28 | ||||
-rw-r--r-- | share/qtcreator/qml/qmldump/LICENSE.GPL3-EXCEPT | 704 | ||||
-rw-r--r-- | share/qtcreator/qml/qmldump/main.cpp | 675 | ||||
-rw-r--r-- | share/qtcreator/qml/qmldump/qmldump.pro | 21 | ||||
-rw-r--r-- | share/qtcreator/qml/qmldump/qmlstreamwriter.cpp | 170 | ||||
-rw-r--r-- | share/qtcreator/qml/qmldump/qmlstreamwriter.h | 66 | ||||
-rw-r--r-- | share/qtcreator/static.pro | 8 |
7 files changed, 0 insertions, 1672 deletions
diff --git a/share/qtcreator/qml/qmldump/Info.plist.in b/share/qtcreator/qml/qmldump/Info.plist.in deleted file mode 100644 index f663cf0a1d..0000000000 --- a/share/qtcreator/qml/qmldump/Info.plist.in +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version=\"1.0\" encoding=\"UTF-8\"?> -<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\"> -<plist version=\"1.0\"> -<dict> - <key>NSHumanReadableCopyright</key> - <string>(C) 2016 The Qt Company Ltd -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 General Public License Usage -Alternatively, this file may be used under the terms of the GNU General Public License version 3 as published by the Free Software Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT included in the packaging of this file. Please review the following information to ensure the GNU General Public License requirements will be met: https://www.gnu.org/licenses/gpl-3.0.html.</string> - <key>CFBundlePackageType</key> - <string>APPL</string> - <key>CFBundleSignature</key> - <string>@TYPEINFO@</string> - <key>CFBundleExecutable</key> - <string>@EXECUTABLE@</string> - <key>CFBundleIdentifier</key> - <string>org.qt-project.qtcreator.qmldump</string> - <key>CFBundleVersion</key> - <string>$$QTCREATOR_VERSION</string> - <key>CFBundleShortVersionString</key> - <string>$$QTCREATOR_VERSION</string> - <key>LSUIElement</key> - <string>1</string> -</dict> -</plist> diff --git a/share/qtcreator/qml/qmldump/LICENSE.GPL3-EXCEPT b/share/qtcreator/qml/qmldump/LICENSE.GPL3-EXCEPT deleted file mode 100644 index b1cb1bec78..0000000000 --- a/share/qtcreator/qml/qmldump/LICENSE.GPL3-EXCEPT +++ /dev/null @@ -1,704 +0,0 @@ -This is the GNU General Public License version 3, annotated with The -Qt Company GPL Exception 1.0: - -------------------------------------------------------------------------- - -The Qt Company GPL Exception 1.0 - -Exception 1: - -As a special exception you may create a larger work which contains the -output of this application and distribute that work under terms of your -choice, so long as the work is not otherwise derived from or based on -this application and so long as the work does not in itself generate -output that contains the output from this application in its original -or modified form. - -Exception 2: - -As a special exception, you have permission to combine this application -with Plugins licensed under the terms of your choice, to produce an -executable, and to copy and distribute the resulting executable under -the terms of your choice. However, the executable must be accompanied -by a prominent notice offering all users of the executable the entire -source code to this application, excluding the source code of the -independent modules, but including any changes you have made to this -application, under the terms of 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/share/qtcreator/qml/qmldump/main.cpp b/share/qtcreator/qml/qmldump/main.cpp deleted file mode 100644 index b9daee7ac5..0000000000 --- a/share/qtcreator/qml/qmldump/main.cpp +++ /dev/null @@ -1,675 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** 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 General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ - -// WARNING: This code is shared with the qmlplugindump tool code in Qt. -// Modifications to this file need to be applied there. - -#include <QtDeclarative> -#include <private/qdeclarativemetatype_p.h> -#include <private/qdeclarativeopenmetaobject_p.h> -#include <QDeclarativeView> - -#include <QApplication> - -#include <QSet> -#include <QMetaObject> -#include <QMetaProperty> -#include <QDebug> -#include <private/qobject_p.h> -#include <private/qmetaobject_p.h> - -#include <iostream> - -#include "qmlstreamwriter.h" - -#ifdef QT_SIMULATOR -#include <private/qsimulatorconnection_p.h> -#endif - -#ifdef Q_OS_UNIX -#include <signal.h> -#endif - -QString pluginImportPath; -bool verbose = false; - -QString currentProperty; -QString inObjectInstantiation; - -void collectReachableMetaObjects(const QMetaObject *meta, QSet<const QMetaObject *> *metas) -{ - if (! meta || metas->contains(meta)) - return; - - // dynamic meta objects break things badly, so just ignore them - const QMetaObjectPrivate *mop = reinterpret_cast<const QMetaObjectPrivate *>(meta->d.data); - if (!(mop->flags & DynamicMetaObject)) - metas->insert(meta); - - collectReachableMetaObjects(meta->superClass(), metas); -} - -void collectReachableMetaObjects(QObject *object, QSet<const QMetaObject *> *metas) -{ - if (! object) - return; - - const QMetaObject *meta = object->metaObject(); - if (verbose) - qDebug() << "Processing object" << meta->className(); - collectReachableMetaObjects(meta, metas); - - for (int index = 0; index < meta->propertyCount(); ++index) { - QMetaProperty prop = meta->property(index); - if (QDeclarativeMetaType::isQObject(prop.userType())) { - if (verbose) - qDebug() << " Processing property" << prop.name(); - currentProperty = QString("%1::%2").arg(meta->className(), prop.name()); - - // if the property was not initialized during construction, - // accessing a member of oo is going to cause a segmentation fault - QObject *oo = QDeclarativeMetaType::toQObject(prop.read(object)); - if (oo && !metas->contains(oo->metaObject())) - collectReachableMetaObjects(oo, metas); - currentProperty.clear(); - } - } -} - -void collectReachableMetaObjects(const QDeclarativeType *ty, QSet<const QMetaObject *> *metas) -{ - collectReachableMetaObjects(ty->metaObject(), metas); - if (ty->attachedPropertiesType()) - collectReachableMetaObjects(ty->attachedPropertiesType(), metas); -} - -/* We want to add the MetaObject for 'Qt' to the list, this is a - simple way to access it. -*/ -class FriendlyQObject: public QObject -{ -public: - static const QMetaObject *qtMeta() { return &staticQtMetaObject; } -}; - -/* When we dump a QMetaObject, we want to list all the types it is exported as. - To do this, we need to find the QDeclarativeTypes associated with this - QMetaObject. -*/ -static QHash<QByteArray, QSet<const QDeclarativeType *> > qmlTypesByCppName; - -static QHash<QByteArray, QByteArray> cppToId; - -/* Takes a C++ type name, such as Qt::LayoutDirection or QString and - maps it to how it should appear in the description file. - - These names need to be unique globally, so we don't change the C++ symbol's - name much. It is mostly used to for explicit translations such as - QString->string and translations for extended QML objects. -*/ -QByteArray convertToId(const QByteArray &cppName) -{ - return cppToId.value(cppName, cppName); -} - -QByteArray convertToId(const QMetaObject *mo) -{ - QByteArray className(mo->className()); - if (!className.isEmpty()) - return convertToId(className); - - // likely a metaobject generated for an extended qml object - if (mo->superClass()) { - className = convertToId(mo->superClass()); - className.append("_extended"); - return className; - } - - static QHash<const QMetaObject *, QByteArray> generatedNames; - className = generatedNames.value(mo); - if (!className.isEmpty()) - return className; - - qWarning() << "Found a QMetaObject without a className, generating a random name"; - className = QByteArray("error-unknown-name-"); - className.append(QByteArray::number(generatedNames.size())); - generatedNames.insert(mo, className); - return className; -} - -QSet<const QMetaObject *> collectReachableMetaObjects(const QList<QDeclarativeType *> &skip = QList<QDeclarativeType *>()) -{ - typedef QHash<QByteArray, QSet<QByteArray> > ExtensionHash; - - QSet<const QMetaObject *> metas; - metas.insert(FriendlyQObject::qtMeta()); - - ExtensionHash extensions; - foreach (const QDeclarativeType *ty, QDeclarativeMetaType::qmlTypes()) { - qmlTypesByCppName[ty->metaObject()->className()].insert(ty); - if (ty->isExtendedType()) { - extensions[ty->typeName()].insert(ty->metaObject()->className()); - } - collectReachableMetaObjects(ty, &metas); - } - - // Adjust exports of the base object if there are extensions. - // For each export of a base object there can be a single extension object overriding it. - // Example: QDeclarativeGraphicsWidget overrides the QtQuick/QGraphicsWidget export - // of QGraphicsWidget. - const ExtensionHash::ConstIterator cend = extensions.constEnd(); - for (ExtensionHash::ConstIterator it = extensions.constBegin(); it != cend; ++it) { - const QByteArray &baseCpp = it.key(); - QSet<const QDeclarativeType *> baseExports = qmlTypesByCppName.value(baseCpp); - - const QSet<QByteArray> &extensionCppNames = it.value(); - foreach (const QByteArray &extensionCppName, extensionCppNames) { - const QSet<const QDeclarativeType *> extensionExports = qmlTypesByCppName.value(extensionCppName); - - // remove extension exports from base imports - // unfortunately the QDeclarativeType pointers don't match, so can't use QSet::substract - QSet<const QDeclarativeType *> newBaseExports; - foreach (const QDeclarativeType *baseExport, baseExports) { - bool match = false; - foreach (const QDeclarativeType *extensionExport, extensionExports) { - if (baseExport->qmlTypeName() == extensionExport->qmlTypeName() - && baseExport->majorVersion() == extensionExport->majorVersion() - && baseExport->minorVersion() == extensionExport->minorVersion()) { - match = true; - break; - } - } - if (!match) - newBaseExports.insert(baseExport); - } - baseExports = newBaseExports; - } - qmlTypesByCppName[baseCpp] = baseExports; - } - - // find even more QMetaObjects by instantiating QML types and running - // over the instances - foreach (QDeclarativeType *ty, QDeclarativeMetaType::qmlTypes()) { - if (skip.contains(ty)) - continue; - if (ty->isExtendedType()) - continue; - if (!ty->isCreatable()) - continue; - if (ty->typeName() == "QDeclarativeComponent") - continue; - - QByteArray tyName = ty->qmlTypeName(); - tyName = tyName.mid(tyName.lastIndexOf('/') + 1); - if (tyName.isEmpty()) - continue; - - inObjectInstantiation = tyName; - QObject *object = ty->create(); - inObjectInstantiation.clear(); - - if (object) - collectReachableMetaObjects(object, &metas); - else - qWarning() << "Could not create" << tyName; - } - - return metas; -} - - -class Dumper -{ - QmlStreamWriter *qml; - QString relocatableModuleUri; - -public: - Dumper(QmlStreamWriter *qml) : qml(qml) {} - - void setRelocatableModuleUri(const QString &uri) - { - relocatableModuleUri = uri; - } - - void dump(const QMetaObject *meta) - { - qml->writeStartObject("Component"); - - QByteArray id = convertToId(meta); - qml->writeScriptBinding(QLatin1String("name"), enquote(id)); - - for (int index = meta->classInfoCount() - 1 ; index >= 0 ; --index) { - QMetaClassInfo classInfo = meta->classInfo(index); - if (QLatin1String(classInfo.name()) == QLatin1String("DefaultProperty")) { - qml->writeScriptBinding(QLatin1String("defaultProperty"), enquote(QLatin1String(classInfo.value()))); - break; - } - } - - if (meta->superClass()) - qml->writeScriptBinding(QLatin1String("prototype"), enquote(convertToId(meta->superClass()))); - - QSet<const QDeclarativeType *> qmlTypes = qmlTypesByCppName.value(meta->className()); - if (!qmlTypes.isEmpty()) { - QStringList exports; - - foreach (const QDeclarativeType *qmlTy, qmlTypes) { - QString qmlTyName = qmlTy->qmlTypeName(); - // some qmltype names are missing the actual names, ignore that import - if (qmlTyName.endsWith('/')) - continue; - if (qmlTyName.startsWith(relocatableModuleUri + QLatin1Char('/'))) { - qmlTyName.remove(0, relocatableModuleUri.size() + 1); - } - if (qmlTyName.startsWith("./")) { - qmlTyName.remove(0, 2); - } - exports += enquote(QString("%1 %2.%3").arg( - qmlTyName, - QString::number(qmlTy->majorVersion()), - QString::number(qmlTy->minorVersion()))); - } - - // ensure exports are sorted and don't change order when the plugin is dumped again - exports.removeDuplicates(); - qSort(exports); - - qml->writeArrayBinding(QLatin1String("exports"), exports); - - if (const QMetaObject *attachedType = (*qmlTypes.begin())->attachedPropertiesType()) { - qml->writeScriptBinding(QLatin1String("attachedType"), enquote( - convertToId(attachedType))); - } - } - - for (int index = meta->enumeratorOffset(); index < meta->enumeratorCount(); ++index) - dump(meta->enumerator(index)); - - for (int index = meta->propertyOffset(); index < meta->propertyCount(); ++index) - dump(meta->property(index)); - - for (int index = meta->methodOffset(); index < meta->methodCount(); ++index) - dump(meta->method(index)); - - qml->writeEndObject(); - } - - void writeEasingCurve() - { - qml->writeStartObject("Component"); - qml->writeScriptBinding(QLatin1String("name"), enquote(QLatin1String("QEasingCurve"))); - qml->writeScriptBinding(QLatin1String("prototype"), enquote(QLatin1String("QDeclarativeEasingValueType"))); - qml->writeEndObject(); - } - -private: - static QString enquote(const QString &string) - { - return QString("\"%1\"").arg(string); - } - - /* Removes pointer and list annotations from a type name, returning - what was removed in isList and isPointer - */ - static void removePointerAndList(QByteArray *typeName, bool *isList, bool *isPointer) - { - static QByteArray declListPrefix = "QDeclarativeListProperty<"; - - if (typeName->endsWith('*')) { - *isPointer = true; - typeName->truncate(typeName->length() - 1); - removePointerAndList(typeName, isList, isPointer); - } else if (typeName->startsWith(declListPrefix)) { - *isList = true; - typeName->truncate(typeName->length() - 1); // get rid of the suffix '>' - *typeName = typeName->mid(declListPrefix.size()); - removePointerAndList(typeName, isList, isPointer); - } - - *typeName = convertToId(*typeName); - } - - void writeTypeProperties(QByteArray typeName, bool isWritable) - { - bool isList = false, isPointer = false; - removePointerAndList(&typeName, &isList, &isPointer); - - qml->writeScriptBinding(QLatin1String("type"), enquote(typeName)); - if (isList) - qml->writeScriptBinding(QLatin1String("isList"), QLatin1String("true")); - if (!isWritable) - qml->writeScriptBinding(QLatin1String("isReadonly"), QLatin1String("true")); - if (isPointer) - qml->writeScriptBinding(QLatin1String("isPointer"), QLatin1String("true")); - } - - void dump(const QMetaProperty &prop) - { - qml->writeStartObject("Property"); - - qml->writeScriptBinding(QLatin1String("name"), enquote(QString::fromUtf8(prop.name()))); -#if (QT_VERSION >= QT_VERSION_CHECK(4, 7, 4)) - if (int revision = prop.revision()) - qml->writeScriptBinding(QLatin1String("revision"), QString::number(revision)); -#endif - writeTypeProperties(prop.typeName(), prop.isWritable()); - - qml->writeEndObject(); - } - - void dump(const QMetaMethod &meth) - { - if (meth.methodType() == QMetaMethod::Signal) { - if (meth.access() != QMetaMethod::Protected) - return; // nothing to do. - } else if (meth.access() != QMetaMethod::Public) { - return; // nothing to do. - } - - QByteArray name = meth.signature(); - int lparenIndex = name.indexOf('('); - if (lparenIndex == -1) { - return; // invalid signature - } - name = name.left(lparenIndex); - - if (meth.methodType() == QMetaMethod::Signal) - qml->writeStartObject(QLatin1String("Signal")); - else - qml->writeStartObject(QLatin1String("Method")); - - qml->writeScriptBinding(QLatin1String("name"), enquote(name)); - -#if (QT_VERSION >= QT_VERSION_CHECK(4, 7, 4)) - if (int revision = meth.revision()) - qml->writeScriptBinding(QLatin1String("revision"), QString::number(revision)); -#endif - - const QString typeName = convertToId(meth.typeName()); - if (! typeName.isEmpty()) - qml->writeScriptBinding(QLatin1String("type"), enquote(typeName)); - - for (int i = 0; i < meth.parameterTypes().size(); ++i) { - QByteArray argName = meth.parameterNames().at(i); - - qml->writeStartObject(QLatin1String("Parameter")); - if (! argName.isEmpty()) - qml->writeScriptBinding(QLatin1String("name"), enquote(argName)); - writeTypeProperties(meth.parameterTypes().at(i), true); - qml->writeEndObject(); - } - - qml->writeEndObject(); - } - - void dump(const QMetaEnum &e) - { - qml->writeStartObject(QLatin1String("Enum")); - qml->writeScriptBinding(QLatin1String("name"), enquote(QString::fromUtf8(e.name()))); - - QList<QPair<QString, QString> > namesValues; - for (int index = 0; index < e.keyCount(); ++index) { - namesValues.append(qMakePair(enquote(QString::fromUtf8(e.key(index))), QString::number(e.value(index)))); - } - - qml->writeScriptObjectLiteralBinding(QLatin1String("values"), namesValues); - qml->writeEndObject(); - } -}; - - -enum ExitCode { - EXIT_INVALIDARGUMENTS = 1, - EXIT_SEGV = 2, - EXIT_IMPORTERROR = 3 -}; - -#ifdef Q_OS_UNIX -void sigSegvHandler(int) { - fprintf(stderr, "Error: SEGV\n"); - if (!currentProperty.isEmpty()) - fprintf(stderr, "While processing the property '%s', which probably has uninitialized data.\n", currentProperty.toLatin1().constData()); - if (!inObjectInstantiation.isEmpty()) - fprintf(stderr, "While instantiating the object '%s'.\n", inObjectInstantiation.toLatin1().constData()); - exit(EXIT_SEGV); -} -#endif - -void printUsage(const QString &appName) -{ - qWarning() << qPrintable(QString( - "Usage: %1 [-v] [-[non]relocatable] module.uri version [module/import/path]\n" - " %1 [-v] -path path/to/qmldir/directory [version]\n" - " %1 [-v] -builtins\n" - "Example: %1 Qt.labs.particles 4.7 /home/user/dev/qt-install/imports").arg( - appName)); -} - -int main(int argc, char *argv[]) -{ -#ifdef Q_OS_UNIX - // qmldump may crash, but we don't want any crash handlers to pop up - // therefore we intercept the segfault and just exit() ourselves - struct sigaction sigAction; - - sigemptyset(&sigAction.sa_mask); - sigAction.sa_handler = &sigSegvHandler; - sigAction.sa_flags = 0; - - sigaction(SIGSEGV, &sigAction, 0); -#endif - -#ifdef QT_SIMULATOR - // Running this application would bring up the Qt Simulator (since it links QtGui), avoid that! - QtSimulatorPrivate::SimulatorConnection::createStubInstance(); -#endif - QApplication app(argc, argv); - const QStringList args = app.arguments(); - const QString appName = QFileInfo(app.applicationFilePath()).baseName(); - if (args.size() < 2) { - printUsage(appName); - return EXIT_INVALIDARGUMENTS; - } - - QString pluginImportUri; - QString pluginImportVersion; - bool relocatable = true; - enum Action { Uri, Path, Builtins }; - Action action = Uri; - { - QStringList positionalArgs; - foreach (const QString &arg, args) { - if (!arg.startsWith(QLatin1Char('-'))) { - positionalArgs.append(arg); - continue; - } - - if (arg == QLatin1String("--notrelocatable") - || arg == QLatin1String("-notrelocatable") - || arg == QLatin1String("--nonrelocatable") - || arg == QLatin1String("-nonrelocatable")) { - relocatable = false; - } else if (arg == QLatin1String("--relocatable") - || arg == QLatin1String("-relocatable")) { - relocatable = true; - } else if (arg == QLatin1String("--path") - || arg == QLatin1String("-path")) { - action = Path; - } else if (arg == QLatin1String("--builtins") - || arg == QLatin1String("-builtins")) { - action = Builtins; - } else if (arg == QLatin1String("-v")) { - verbose = true; - } else { - qWarning() << "Invalid argument: " << arg; - return EXIT_INVALIDARGUMENTS; - } - } - - if (action == Uri) { - if (positionalArgs.size() != 3 && positionalArgs.size() != 4) { - qWarning() << "Incorrect number of positional arguments"; - return EXIT_INVALIDARGUMENTS; - } - pluginImportUri = positionalArgs[1]; - pluginImportVersion = positionalArgs[2]; - if (positionalArgs.size() >= 4) - pluginImportPath = positionalArgs[3]; - } else if (action == Path) { - if (positionalArgs.size() != 2 && positionalArgs.size() != 3) { - qWarning() << "Incorrect number of positional arguments"; - return EXIT_INVALIDARGUMENTS; - } - pluginImportPath = QDir::fromNativeSeparators(positionalArgs[1]); - if (positionalArgs.size() == 3) - pluginImportVersion = positionalArgs[2]; - } else if (action == Builtins) { - if (positionalArgs.size() != 1) { - qWarning() << "Incorrect number of positional arguments"; - return EXIT_INVALIDARGUMENTS; - } - } - } - - QDeclarativeView view; - QDeclarativeEngine *engine = view.engine(); - if (!pluginImportPath.isEmpty()) { - QDir cur = QDir::current(); - cur.cd(pluginImportPath); - pluginImportPath = cur.absolutePath(); - QDir::setCurrent(pluginImportPath); - engine->addImportPath(pluginImportPath); - } - - // find all QMetaObjects reachable from the builtin module - QSet<const QMetaObject *> defaultReachable = collectReachableMetaObjects(); - QList<QDeclarativeType *> defaultTypes = QDeclarativeMetaType::qmlTypes(); - - // this will hold the meta objects we want to dump information of - QSet<const QMetaObject *> metas; - - if (action == Builtins) { - metas = defaultReachable; - } else { - // find a valid QtQuick import - QByteArray importCode; - QDeclarativeType *qtObjectType = QDeclarativeMetaType::qmlType(&QObject::staticMetaObject); - if (!qtObjectType) { - qWarning() << "Could not find QtObject type"; - importCode = QByteArray("import QtQuick 1.0\n"); - } else { - QByteArray module = qtObjectType->qmlTypeName(); - module = module.mid(0, module.lastIndexOf('/')); - importCode = QString("import %1 %2.%3\n").arg(module, - QString::number(qtObjectType->majorVersion()), - QString::number(qtObjectType->minorVersion())).toUtf8(); - } - - // find all QMetaObjects reachable when the specified module is imported - if (action != Path) { - importCode += QString("import %0 %1\n").arg(pluginImportUri, pluginImportVersion).toLatin1(); - } else { - // pluginImportVersion can be empty - importCode += QString("import \".\" %2\n").arg(pluginImportVersion).toLatin1(); - } - - // create a component with these imports to make sure the imports are valid - // and to populate the declarative meta type system - { - QByteArray code = importCode; - code += "QtObject {}"; - QDeclarativeComponent c(engine); - - c.setData(code, QUrl::fromLocalFile(pluginImportPath + "/typelist.qml")); - c.create(); - if (!c.errors().isEmpty()) { - foreach (const QDeclarativeError &error, c.errors()) - qWarning() << error.toString(); - return EXIT_IMPORTERROR; - } - } - - QSet<const QMetaObject *> candidates = collectReachableMetaObjects(defaultTypes); - candidates.subtract(defaultReachable); - - // Also eliminate meta objects with the same classname. - // This is required because extended objects seem not to share - // a single meta object instance. - QSet<QByteArray> defaultReachableNames; - foreach (const QMetaObject *mo, defaultReachable) - defaultReachableNames.insert(QByteArray(mo->className())); - foreach (const QMetaObject *mo, candidates) { - if (!defaultReachableNames.contains(mo->className())) - metas.insert(mo); - } - } - - // setup static rewrites of type names - cppToId.insert("QString", "string"); - cppToId.insert("QDeclarativeEasingValueType::Type", "Type"); - - // start dumping data - QByteArray bytes; - QmlStreamWriter qml(&bytes); - - qml.writeStartDocument(); - qml.writeLibraryImport(QLatin1String("QtQuick.tooling"), 1, 1); - qml.write("\n" - "// This file describes the plugin-supplied types contained in the library.\n" - "// It is used for QML tooling purposes only.\n" - "\n"); - qml.writeStartObject("Module"); - - // put the metaobjects into a map so they are always dumped in the same order - QMap<QString, const QMetaObject *> nameToMeta; - foreach (const QMetaObject *meta, metas) - nameToMeta.insert(convertToId(meta), meta); - - Dumper dumper(&qml); - if (relocatable) - dumper.setRelocatableModuleUri(pluginImportUri); - foreach (const QMetaObject *meta, nameToMeta) { - dumper.dump(meta); - } - - // define QEasingCurve as an extension of QDeclarativeEasingValueType, this way - // properties using the QEasingCurve type get useful type information. - if (pluginImportUri.isEmpty()) - dumper.writeEasingCurve(); - - qml.writeEndObject(); - qml.writeEndDocument(); - - std::cout << bytes.constData() << std::flush; - - // workaround to avoid crashes on exit - QTimer timer; - timer.setSingleShot(true); - timer.setInterval(0); - QObject::connect(&timer, SIGNAL(timeout()), &app, SLOT(quit())); - timer.start(); - - return app.exec(); -} diff --git a/share/qtcreator/qml/qmldump/qmldump.pro b/share/qtcreator/qml/qmldump/qmldump.pro deleted file mode 100644 index 84d570c50e..0000000000 --- a/share/qtcreator/qml/qmldump/qmldump.pro +++ /dev/null @@ -1,21 +0,0 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2010-02-24T10:21:38 -# -#------------------------------------------------- - -TARGET = qmldump -QT += declarative -CONFIG += console - -TEMPLATE = app - -SOURCES += main.cpp \ - qmlstreamwriter.cpp - -# generation of Info.plist from Info.plist.in is handled by static.pro -# compiling this project directly from the Qt Creator source tree does not work -macx:QMAKE_INFO_PLIST = Info.plist - -HEADERS += \ - qmlstreamwriter.h diff --git a/share/qtcreator/qml/qmldump/qmlstreamwriter.cpp b/share/qtcreator/qml/qmldump/qmlstreamwriter.cpp deleted file mode 100644 index 6bd3a72f0e..0000000000 --- a/share/qtcreator/qml/qmldump/qmlstreamwriter.cpp +++ /dev/null @@ -1,170 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** 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 General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ - -// WARNING: This code is shared with the qmlplugindump tool code in Qt. -// Modifications to this file need to be applied there. - -#include "qmlstreamwriter.h" - -#include <QBuffer> -#include <QStringList> - -QmlStreamWriter::QmlStreamWriter(QByteArray *array) - : m_indentDepth(0) - , m_pendingLineLength(0) - , m_maybeOneline(false) - , m_stream(new QBuffer(array)) -{ - m_stream->open(QIODevice::WriteOnly); -} - -void QmlStreamWriter::writeStartDocument() -{ -} - -void QmlStreamWriter::writeEndDocument() -{ -} - -void QmlStreamWriter::writeLibraryImport(const QString &uri, int majorVersion, int minorVersion, const QString &as) -{ - m_stream->write(QString("import %1 %2.%3").arg(uri, QString::number(majorVersion), QString::number(minorVersion)).toUtf8()); - if (!as.isEmpty()) - m_stream->write(QString(" as %1").arg(as).toUtf8()); - m_stream->write("\n"); -} - -void QmlStreamWriter::writeStartObject(const QString &component) -{ - flushPotentialLinesWithNewlines(); - writeIndent(); - m_stream->write(QString("%1 {").arg(component).toUtf8()); - ++m_indentDepth; - m_maybeOneline = true; -} - -void QmlStreamWriter::writeEndObject() -{ - if (m_maybeOneline && !m_pendingLines.isEmpty()) { - --m_indentDepth; - for (int i = 0; i < m_pendingLines.size(); ++i) { - m_stream->write(" "); - m_stream->write(m_pendingLines.at(i).trimmed()); - if (i != m_pendingLines.size() - 1) - m_stream->write(";"); - } - m_stream->write(" }\n"); - m_pendingLines.clear(); - m_pendingLineLength = 0; - m_maybeOneline = false; - } else { - if (m_maybeOneline) - flushPotentialLinesWithNewlines(); - --m_indentDepth; - writeIndent(); - m_stream->write("}\n"); - } -} - -void QmlStreamWriter::writeScriptBinding(const QString &name, const QString &rhs) -{ - writePotentialLine(QString("%1: %2").arg(name, rhs).toUtf8()); -} - -void QmlStreamWriter::writeArrayBinding(const QString &name, const QStringList &elements) -{ - flushPotentialLinesWithNewlines(); - writeIndent(); - m_stream->write(QString("%1: [\n").arg(name).toUtf8()); - ++m_indentDepth; - for (int i = 0; i < elements.size(); ++i) { - writeIndent(); - m_stream->write(elements.at(i).toUtf8()); - if (i != elements.size() - 1) { - m_stream->write(",\n"); - } else { - m_stream->write("\n"); - } - } - --m_indentDepth; - writeIndent(); - m_stream->write("]\n"); -} - -void QmlStreamWriter::write(const QString &data) -{ - flushPotentialLinesWithNewlines(); - m_stream->write(data.toUtf8()); -} - -void QmlStreamWriter::writeScriptObjectLiteralBinding(const QString &name, const QList<QPair<QString, QString> > &keyValue) -{ - flushPotentialLinesWithNewlines(); - writeIndent(); - m_stream->write(QString("%1: {\n").arg(name).toUtf8()); - ++m_indentDepth; - for (int i = 0; i < keyValue.size(); ++i) { - const QString key = keyValue.at(i).first; - const QString value = keyValue.at(i).second; - writeIndent(); - m_stream->write(QString("%1: %2").arg(key, value).toUtf8()); - if (i != keyValue.size() - 1) { - m_stream->write(",\n"); - } else { - m_stream->write("\n"); - } - } - --m_indentDepth; - writeIndent(); - m_stream->write("}\n"); -} - -void QmlStreamWriter::writeIndent() -{ - m_stream->write(QByteArray(m_indentDepth * 4, ' ')); -} - -void QmlStreamWriter::writePotentialLine(const QByteArray &line) -{ - m_pendingLines.append(line); - m_pendingLineLength += line.size(); - if (m_pendingLineLength >= 80) { - flushPotentialLinesWithNewlines(); - } -} - -void QmlStreamWriter::flushPotentialLinesWithNewlines() -{ - if (m_maybeOneline) - m_stream->write("\n"); - foreach (const QByteArray &line, m_pendingLines) { - writeIndent(); - m_stream->write(line); - m_stream->write("\n"); - } - m_pendingLines.clear(); - m_pendingLineLength = 0; - m_maybeOneline = false; -} diff --git a/share/qtcreator/qml/qmldump/qmlstreamwriter.h b/share/qtcreator/qml/qmldump/qmlstreamwriter.h deleted file mode 100644 index 3002c30d1f..0000000000 --- a/share/qtcreator/qml/qmldump/qmlstreamwriter.h +++ /dev/null @@ -1,66 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** 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 General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ - -// WARNING: This code is shared with the qmlplugindump tool code in Qt. -// Modifications to this file need to be applied there. - -#ifndef QMLSTREAMWRITER_H -#define QMLSTREAMWRITER_H - -#include <QIODevice> -#include <QList> -#include <QString> -#include <QScopedPointer> -#include <QPair> - -class QmlStreamWriter -{ -public: - QmlStreamWriter(QByteArray *array); - - void writeStartDocument(); - void writeEndDocument(); - void writeLibraryImport(const QString &uri, int majorVersion, int minorVersion, const QString &as = QString()); - //void writeFilesystemImport(const QString &file, const QString &as = QString()); - void writeStartObject(const QString &component); - void writeEndObject(); - void writeScriptBinding(const QString &name, const QString &rhs); - void writeScriptObjectLiteralBinding(const QString &name, const QList<QPair<QString, QString> > &keyValue); - void writeArrayBinding(const QString &name, const QStringList &elements); - void write(const QString &data); - -private: - void writeIndent(); - void writePotentialLine(const QByteArray &line); - void flushPotentialLinesWithNewlines(); - - int m_indentDepth; - QList<QByteArray> m_pendingLines; - int m_pendingLineLength; - bool m_maybeOneline; - QScopedPointer<QIODevice> m_stream; -}; - -#endif // QMLSTREAMWRITER_H diff --git a/share/qtcreator/static.pro b/share/qtcreator/static.pro index 41fbf2bf69..f22a875be1 100644 --- a/share/qtcreator/static.pro +++ b/share/qtcreator/static.pro @@ -54,14 +54,6 @@ for(data_dir, DATA_DIRS) { include(static.pri) -# stuff that cannot be handled by static.pri -osx { - # do version magic for app bundles - dumpinfo.input = qml/qmldump/Info.plist.in - dumpinfo.output = $$IDE_DATA_PATH/qml/qmldump/Info.plist - QMAKE_SUBSTITUTES += dumpinfo -} - SRCRESOURCEDIR = $$IDE_SOURCE_TREE/src/share/qtcreator/ defineReplace(stripSrcResourceDir) { win32 { |