Merge branch '2.1'

Conflicts:
	src/plugins/coreplugin/basemode.cpp
	src/plugins/coreplugin/basemode.h
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h
	src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp
	src/plugins/debugger/debuggeragents.cpp
	src/plugins/debugger/debuggeruiswitcher.cpp
	src/plugins/debugger/debuggeruiswitcher.h
	src/plugins/projectexplorer/buildconfigdialog.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.h
	src/plugins/qmldesigner/designercore/include/enumeratormetainfo.h
	src/plugins/qmldesigner/designercore/include/modelutilities.h
	src/plugins/qmldesigner/designercore/include/nodeinstance.h
	src/plugins/qmldesigner/designercore/include/propertymetainfo.h
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.h
	src/plugins/qmldesigner/designercore/instances/graphicsviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.h
	src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/qmlviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.h
	src/plugins/qmldesigner/designercore/metainfo/enumeratormetainfo.cpp
	src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp
	src/plugins/qmldesigner/designercore/model/modelutilities.cpp
	src/plugins/snippets/inputwidget.cpp
	src/plugins/snippets/snippetscompletion.cpp
	src/plugins/snippets/snippetscompletion.h
	src/plugins/snippets/snippetspec.cpp
	src/plugins/snippets/snippetsplugin.cpp
	src/plugins/snippets/snippetswindow.cpp
	src/plugins/snippets/snippetswindow.h
	src/plugins/texteditor/snippetsparser.cpp
	src/tools/qml/qmldom/main.cpp
	tests/manual/trk/runner.cpp
	tests/manual/trk/trkolddevice.cpp
	tests/manual/trk/trkolddevice.h
	tests/manual/trk/trkserver.cpp

LICENSE.PREVIEW.COMMERCIAL

@@ -0,0 +1,629 @@
+TECHNOLOGY PREVIEW LICENSE AGREEMENT
+
+For individuals and/or legal entities resident in the Americas (North
+America, Central America and South America), the applicable licensing
+terms are specified under the heading "Technology Preview License 
+Agreement: The Americas".
+
+For individuals and/or legal entities not resident in The Americas, the
+applicable licensing terms are specified under the heading "Technology 
+Preview License Agreement: Rest of the World". 
+
+
+TECHNOLOGY PREVIEW LICENSE AGREEMENT: The Americas
+Agreement version 2.4
+
+This Technology Preview License Agreement ("Agreement") is a legal
+agreement between Nokia Inc. ("Nokia"), with its registered office at
+102 Corporate Park Drive, White Plains, N.Y., U.S.A. 10604 and you (either an
+individual or a legal entity) ("Licensee") for the Licensed Software (as
+defined below). 
+
+1. DEFINITIONS
+
+"Affiliate" of a Party shall mean an entity (i) which is directly or
+indirectly controlling such Party; (ii) which is under the same direct
+or indirect ownership or control as such Party; or (iii) which is
+directly or indirectly owned or controlled by such Party. For these
+purposes, an entity shall be treated as being controlled by another if
+that other entity has fifty percent (50 %) or more of the votes in such
+entity, is able to direct its affairs and/or to control the composition
+of its board of directors or equivalent body. 
+
+"Applications" shall mean Licensee's software products created using the
+Licensed Software which may include portions of the Licensed Software.
+
+"Term" shall mean the period of time six (6) months from the later of
+(a) the Effective Date; or (b) the date the Licensed Software was
+initially delivered to Licensee by Nokia. If no specific Effective Date
+is set forth in the Agreement, the Effective Date shall be deemed to be
+the date the Licensed Software was initially delivered to Licensee. 
+
+"Licensed Software" shall mean the computer software, "online" or
+electronic documentation, associated media and printed materials,
+including the source code, example programs and the documentation
+delivered by Nokia to Licensee in conjunction with this Agreement. 
+
+"Party" or "Parties" shall mean Licensee and/or Nokia.
+
+
+2. OWNERSHIP
+
+The Licensed Software is protected by copyright laws and international
+copyright treaties, as well as other intellectual property laws and
+treaties. The Licensed Software is licensed, not sold. 
+
+If Licensee provides any findings, proposals, suggestions or other
+feedback ("Feedback") to Nokia regarding the Licensed Software, Nokia
+shall own all right, title and interest including the intellectual
+property rights in and to such Feedback, excluding however any existing
+patent rights of Licensee. To the extent Licensee owns or controls any
+patents for such Feedback Licensee hereby grants to Nokia and its
+Affiliates, a worldwide, perpetual, non-transferable, sublicensable,
+royalty-free license to (i) use, copy and modify Feedback and to create
+derivative works thereof, (ii) to make (and have made), use, import,
+sell, offer for sale, lease, dispose, offer for disposal or otherwise
+exploit any products or services of Nokia containing Feedback,, and
+(iii) sublicense all the foregoing rights to third party licensees and
+customers of Nokia and/or its Affiliates. 
+
+
+3. VALIDITY OF THE AGREEMENT
+
+By installing, copying, or otherwise using the Licensed Software,
+Licensee agrees to be bound by the terms of this Agreement. If Licensee
+does not agree to the terms of this Agreement, Licensee may not install,
+copy, or otherwise use the Licensed Software. Upon Licensee's acceptance
+of the terms and conditions of this Agreement, Nokia grants Licensee the
+right to use the Licensed Software in the manner provided below. 
+
+
+4. LICENSES
+
+4.1. Using and Copying
+
+Nokia grants to Licensee a non-exclusive, non-transferable, time-limited
+license to use and copy the Licensed Software for sole purpose of
+designing, developing and testing Applications, and evaluating and the 
+Licensed Software during the Term. 
+
+Licensee may install copies of the Licensed Software on an unlimited
+number of computers provided that (a) if an individual, only such
+individual; or (b) if a legal entity only its employees; use the
+Licensed Software for the authorized purposes. 
+
+4.2	No Distribution or Modifications
+
+Licensee may not disclose, modify, sell, market, commercialise,
+distribute, loan, rent, lease, or license the Licensed Software or any
+copy of it or use the Licensed Software for any purpose that is not
+expressly granted in this Section 4. Licensee may not alter or remove
+any details of ownership, copyright, trademark or other property right
+connected with the Licensed Software. Licensee may not distribute any
+software statically or dynamically linked with the Licensed Software. 
+
+4.3 No Technical Support
+
+Nokia has no obligation to furnish Licensee with any technical support
+whatsoever. Any such support is subject to separate agreement between
+the Parties. 
+
+
+5. PRE-RELEASE CODE
+The Licensed Software contains pre-release code that is not at the level
+of performance and compatibility of a final, generally available,
+product offering. The Licensed Software may not operate correctly and
+may be substantially modified prior to the first commercial product
+release, if any. Nokia is not obligated to make this or any later
+version of the Licensed Software commercially available. The License
+Software is "Not for Commercial Use" and may only be used for the
+purposes described in Section 4. The Licensed Software may not be used
+in a live operating environment where it may be relied upon to perform
+in the same manner as a commercially released product or with data that
+has not been sufficiently backed up. 
+
+6. THIRD PARTY SOFTWARE
+
+The Licensed Software may provide links to third party libraries or code
+(collectively "Third Party Software") to implement various functions.
+Third Party Software does not comprise part of the Licensed Software. In
+some cases, access to Third Party Software may be included along with
+the Licensed Software delivery as a convenience for development and
+testing only. Such source code and libraries may be listed in the
+".../src/3rdparty" source tree delivered with the Licensed Software or
+documented in the Licensed Software where the Third Party Software is
+used, as may be amended from time to time, do not comprise the Licensed
+Software. Licensee acknowledges (1) that some part of Third Party
+Software may require additional licensing of copyright and patents from
+the owners of such, and (2) that distribution of any of the Licensed
+Software referencing any portion of a Third Party Software may require
+appropriate licensing from such third parties. 
+
+
+7. LIMITED WARRANTY AND WARRANTY DISCLAIMER
+
+The Licensed Software is licensed to Licensee "as is". To the maximum
+extent permitted by applicable law, Nokia on behalf of itself and its
+suppliers, disclaims all warranties and conditions, either express or
+implied, including, but not limited to, implied warranties of
+merchantability, fitness for a particular purpose, title and
+non-infringement with regard to the Licensed Software. 
+
+
+8. LIMITATION OF LIABILITY 
+
+If, Nokia's warranty disclaimer notwithstanding, Nokia is held liable to
+Licensee, whether in contract, tort or any other legal theory, based on
+the Licensed Software, Nokia's entire liability to Licensee and
+Licensee's exclusive remedy shall be, at Nokia's option, either (A)
+return of the price Licensee paid for the Licensed Software, or (B)
+repair or replacement of the Licensed Software, provided Licensee
+returns to Nokia all copies of the Licensed Software as originally
+delivered to Licensee. Nokia shall not under any circumstances be liable
+to Licensee based on failure of the Licensed Software if the failure
+resulted from accident, abuse or misapplication, nor shall Nokia under
+any circumstances be liable for special damages, punitive or exemplary
+damages, damages for loss of profits or interruption of business or for
+loss or corruption of data. Any award of damages from Nokia to Licensee
+shall not exceed the total amount Licensee has paid to Nokia in
+connection with this Agreement. 
+
+
+9.	CONFIDENTIALITY
+
+Each party acknowledges that during the Term of this Agreement it shall
+have access to information about the other party's business, business
+methods, business plans, customers, business relations, technology, and
+other information, including the terms of this Agreement, that is
+confidential and of great value to the other party, and the value of
+which would be significantly reduced if disclosed to third parties (the
+"Confidential Information"). Accordingly, when a party (the "Receiving
+Party") receives Confidential Information from another party (the
+"Disclosing Party"), the Receiving Party shall, and shall obligate its
+employees and agents and employees and agents of its Affiliates to: (i)
+maintain the Confidential Information in strict confidence; (ii) not
+disclose the Confidential Information to a third party without the
+Disclosing Party's prior written approval; and (iii) not, directly or
+indirectly, use the Confidential Information for any purpose other than
+for exercising its rights and fulfilling its responsibilities pursuant
+to this Agreement. Each party shall take reasonable measures to protect
+the Confidential Information of the other party, which measures shall
+not be less than the measures taken by such party to protect its own
+confidential and proprietary information. 
+
+"Confidential Information" shall not include information that (a) is or
+becomes generally known to the public through no act or omission of the
+Receiving Party; (b) was in the Receiving Party's lawful possession
+prior to the disclosure hereunder and was not subject to limitations on
+disclosure or use; (c) is developed by the Receiving Party without
+access to the Confidential Information of the Disclosing Party or by
+persons who have not had access to the Confidential Information of the
+Disclosing Party as proven by the written records of the Receiving
+Party; (d) is lawfully disclosed to the Receiving Party without
+restrictions, by a third party not under an obligation of
+confidentiality; or (e) the Receiving Party is legally compelled to
+disclose the information, in which case the Receiving Party shall assert
+the privileged and confidential nature of the information and cooperate
+fully with the Disclosing Party to protect against and prevent
+disclosure of any Confidential Information and to limit the scope of
+disclosure and the dissemination of disclosed Confidential Information
+by all legally available means. 
+
+The obligations of the Receiving Party under this Section shall continue
+during the Initial Term and for a period of five (5) years after
+expiration or termination of this Agreement. To the extent that the
+terms of the Non-Disclosure Agreement between Nokia and Licensee
+conflict with the terms of this Section 9, this Section 9 shall be
+controlling over the terms of the Non-Disclosure Agreement. 
+
+
+10. GENERAL PROVISIONS
+
+10.1	No Assignment
+
+Licensee shall not be entitled to assign or transfer all or any of its
+rights, benefits and obligations under this Agreement without the prior
+written consent of Nokia, which shall not be unreasonably withheld. 
+
+10.2 	Termination
+
+Nokia may terminate the Agreement at any time immediately upon written
+notice by Nokia to Licensee if Licensee breaches this Agreement. 
+
+Upon termination of this Agreement, Licensee shall return to Nokia all
+copies of Licensed Software that were supplied by Nokia. All other
+copies of Licensed Software in the possession or control of Licensee
+must be erased or destroyed. An officer of Licensee must promptly
+deliver to Nokia a written confirmation that this has occurred. 
+
+10.3	Surviving Sections 
+
+Any terms and conditions that by their nature or otherwise reasonably
+should survive a cancellation or termination of this Agreement shall
+also be deemed to survive. Such terms and conditions include, but are
+not limited to the following Sections: 2, 5, 6, 7, 8, 9, 10.2, 10.3, 10.4,
+10.5, 10.6, 10.7, and 10.8 of this Agreement. 
+
+10.4	Entire Agreement 
+
+This Agreement constitutes the complete agreement between the parties
+and supersedes all prior or contemporaneous discussions,
+representations, and proposals, written or oral, with respect to the
+subject matters discussed herein, with the exception of the
+non-disclosure agreement executed by the parties in connection with this
+Agreement ("Non-Disclosure Agreement"), if any, shall be subject to
+Section 9. No modification of this Agreement shall be effective unless
+contained in a writing executed by an authorized representative of each
+party. No term or condition contained in Licensee's purchase order shall
+apply unless expressly accepted by Nokia in writing. If any provision of
+the Agreement is found void or unenforceable, the remainder shall remain
+valid and enforceable according to its terms. If any remedy provided is
+determined to have failed for its essential purpose, all limitations of
+liability and exclusions of damages set forth in this Agreement shall
+remain in effect. 
+
+10.5	Export Control
+
+Licensee acknowledges that the Licensed Software may be subject to
+export control restrictions of various countries. Licensee shall fully
+comply with all applicable export license restrictions and requirements
+as well as with all laws and regulations relating to the importation of
+the Licensed Software and shall procure all necessary governmental
+authorizations, including without limitation, all necessary licenses,
+approvals, permissions or consents, where necessary for the
+re-exportation of the Licensed Software., 
+
+10.6	Governing Law and Legal Venue
+
+This Agreement shall be governed by and construed in accordance with the
+federal laws of the United States of America and the internal laws of
+the State of New York without given effect to any choice of law rule
+that would result in the application of the laws of any other
+jurisdiction. The United Nations Convention on Contracts for the
+International Sale of Goods (CISG) shall not apply. Each Party (a)
+hereby irrevocably submits itself to and consents to the jurisdiction of
+the United States District Court for the Southern District of New York
+(or if such court lacks jurisdiction, the state courts of the State of
+New York) for the purposes of any action, claim, suit or proceeding
+between the Parties in connection with any controversy, claim, or
+dispute arising out of or relating to this Agreement; and (b) hereby
+waives, and agrees not to assert by way of motion, as a defense or
+otherwise, in any such action, claim, suit or proceeding, any claim that
+is not personally subject to the jurisdiction of such court(s), that the
+action, claim, suit or proceeding is brought in an inconvenient forum or
+that the venue of the action, claim, suit or proceeding is improper.
+Notwithstanding the foregoing, nothing in this Section 9.6 is intended
+to, or shall be deemed to, constitute a submission or consent to, or
+selection of, jurisdiction, forum or venue for any action for patent
+infringement, whether or not such action relates to this Agreement. 
+
+10.7	No Implied License
+
+There are no implied licenses or other implied rights granted under this
+Agreement, and all rights, save for those expressly granted hereunder,
+shall remain with Nokia and its licensors. In addition, no licenses or
+immunities are granted to the combination of the Licensed Software with
+any other software or hardware not delivered by Nokia under this
+Agreement. 
+
+10.8	Government End Users 
+ 
+A "U.S. Government End User" shall mean any agency or entity of the
+government of the United States. The following shall apply if Licensee
+is a U.S. Government End User. The Licensed Software is a "commercial
+item," as that term is defined in 48 C.F.R. 2.101 (Oct. 1995),
+consisting of "commercial computer software" and "commercial computer
+software documentation," as such terms are used in 48 C.F.R. 12.212
+(Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
+through 227.7202-4 (June 1995), all U.S. Government End Users acquire
+the Licensed Software with only those rights set forth herein. The
+Licensed Software (including related documentation) is provided to U.S.
+Government End Users: (a) only as a commercial end item; and (b) only
+pursuant to this Agreement. 
+
+
+
+
+
+TECHNOLOGY PREVIEW LICENSE AGREEMENT: Rest of the World
+Agreement version 2.4
+
+This Technology Preview License Agreement ("Agreement") is a legal
+agreement between Nokia Corporation ("Nokia"), with its registered
+office at Keilalahdentie 4, 02150 Espoo, Finland and you (either an
+individual or a legal entity) ("Licensee") for the Licensed Software (as
+defined below). 
+
+1. DEFINITIONS
+
+"Affiliate" of a Party shall mean an entity (i) which is directly or
+indirectly controlling such Party; (ii) which is under the same direct
+or indirect ownership or control as such Party; or (iii) which is
+directly or indirectly owned or controlled by such Party. For these
+purposes, an entity shall be treated as being controlled by another if
+that other entity has fifty percent (50 %) or more of the votes in such
+entity, is able to direct its affairs and/or to control the composition
+of its board of directors or equivalent body. 
+
+"Applications" shall mean Licensee's software products created using the
+Licensed Software which may include portions of the Licensed Software.
+
+"Term" shall mean the period of time six (6) months from the later of
+(a) the Effective Date; or (b) the date the Licensed Software was
+initially delivered to Licensee by Nokia. If no specific Effective Date
+is set forth in the Agreement, the Effective Date shall be deemed to be
+the date the Licensed Software was initially delivered to Licensee. 
+
+"Licensed Software" shall mean the computer software, "online" or
+electronic documentation, associated media and printed materials,
+including the source code, example programs and the documentation
+delivered by Nokia to Licensee in conjunction with this Agreement. 
+
+"Party" or "Parties" shall mean Licensee and/or Nokia. 
+
+
+2. OWNERSHIP
+
+The Licensed Software is protected by copyright laws and international
+copyright treaties, as well as other intellectual property laws and
+treaties. The Licensed Software is licensed, not sold. 
+
+If Licensee provides any findings, proposals, suggestions or other
+feedback ("Feedback") to Nokia regarding the Licensed Software, Nokia
+shall own all right, title and interest including the intellectual
+property rights in and to such Feedback, excluding however any existing
+patent rights of Licensee. To the extent Licensee owns or controls any
+patents for such Feedback Licensee hereby grants to Nokia and its
+Affiliates, a worldwide, perpetual, non-transferable, sublicensable,
+royalty-free license to (i) use, copy and modify Feedback and to create
+derivative works thereof, (ii) to make (and have made), use, import,
+sell, offer for sale, lease, dispose, offer for disposal or otherwise
+exploit any products or services of Nokia containing Feedback,, and
+(iii) sublicense all the foregoing rights to third party licensees and
+customers of Nokia and/or its Affiliates. 
+
+3. VALIDITY OF THE AGREEMENT
+
+By installing, copying, or otherwise using the Licensed Software,
+Licensee agrees to be bound by the terms of this Agreement. If Licensee
+does not agree to the terms of this Agreement, Licensee may not install,
+copy, or otherwise use the Licensed Software. Upon Licensee's acceptance
+of the terms and conditions of this Agreement, Nokia grants Licensee the
+right to use the Licensed Software in the manner provided below. 
+
+
+4. LICENSES
+
+4.1. Using and Copying
+
+Nokia grants to Licensee a non-exclusive, non-transferable, time-limited
+license to use and copy the Licensed Software for sole purpose of
+designing, developing and testing Applications, and evaluating and the 
+Licensed Software during the Term. 
+
+Licensee may install copies of the Licensed Software on an unlimited
+number of computers provided that (a) if an individual, only such
+individual; or (b) if a legal entity only its employees; use the
+Licensed Software for the authorized purposes. 
+
+4.2	No Distribution or Modifications
+
+Licensee may not disclose, modify, sell, market, commercialise,
+distribute, loan, rent, lease, or license the Licensed Software or any
+copy of it or use the Licensed Software for any purpose that is not
+expressly granted in this Section 4. Licensee may not alter or remove
+any details of ownership, copyright, trademark or other property right
+connected with the Licensed Software. Licensee may not distribute any
+software statically or dynamically linked with the Licensed Software. 
+
+4.3 No Technical Support
+
+Nokia has no obligation to furnish Licensee with any technical support
+whatsoever. Any such support is subject to separate agreement between
+the Parties. 
+
+
+5. PRE-RELEASE CODE
+
+The Licensed Software contains pre-release code that is not at the level
+of performance and compatibility of a final, generally available,
+product offering. The Licensed Software may not operate correctly and
+may be substantially modified prior to the first commercial product
+release, if any. Nokia is not obligated to make this or any later
+version of the Licensed Software commercially available. The License
+Software is "Not for Commercial Use" and may only be used for the
+purposes described in Section 4. The Licensed Software may not be used
+in a live operating environment where it may be relied upon to perform
+in the same manner as a commercially released product or with data that
+has not been sufficiently backed up. 
+
+6. THIRD PARTY SOFTWARE
+
+The Licensed Software may provide links to third party libraries or code
+(collectively "Third Party Software") to implement various functions.
+Third Party Software does not comprise part of the Licensed Software. In
+some cases, access to Third Party Software may be included along with
+the Licensed Software delivery as a convenience for development and
+testing only. Such source code and libraries may be listed in the
+".../src/3rdparty" source tree delivered with the Licensed Software or
+documented in the Licensed Software where the Third Party Software is
+used, as may be amended from time to time, do not comprise the Licensed
+Software. Licensee acknowledges (1) that some part of Third Party
+Software may require additional licensing of copyright and patents from
+the owners of such, and (2) that distribution of any of the Licensed
+Software referencing any portion of a Third Party Software may require
+appropriate licensing from such third parties. 
+
+
+7. LIMITED WARRANTY AND WARRANTY DISCLAIMER
+
+The Licensed Software is licensed to Licensee "as is". To the maximum
+extent permitted by applicable law, Nokia on behalf of itself and its
+suppliers, disclaims all warranties and conditions, either express or
+implied, including, but not limited to, implied warranties of
+merchantability, fitness for a particular purpose, title and
+non-infringement with regard to the Licensed Software. 
+
+
+8. LIMITATION OF LIABILITY 
+
+If, Nokia's warranty disclaimer notwithstanding, Nokia is held liable to
+Licensee, whether in contract, tort or any other legal theory, based on
+the Licensed Software, Nokia's entire liability to Licensee and
+Licensee's exclusive remedy shall be, at Nokia's option, either (A)
+return of the price Licensee paid for the Licensed Software, or (B)
+repair or replacement of the Licensed Software, provided Licensee
+returns to Nokia all copies of the Licensed Software as originally
+delivered to Licensee. Nokia shall not under any circumstances be liable
+to Licensee based on failure of the Licensed Software if the failure
+resulted from accident, abuse or misapplication, nor shall Nokia under
+any circumstances be liable for special damages, punitive or exemplary
+damages, damages for loss of profits or interruption of business or for
+loss or corruption of data. Any award of damages from Nokia to Licensee
+shall not exceed the total amount Licensee has paid to Nokia in
+connection with this Agreement. 
+
+
+9.	CONFIDENTIALITY
+
+Each party acknowledges that during the Term of this Agreement it shall
+have access to information about the other party's business, business
+methods, business plans, customers, business relations, technology, and
+other information, including the terms of this Agreement, that is
+confidential and of great value to the other party, and the value of
+which would be significantly reduced if disclosed to third parties (the
+"Confidential Information"). Accordingly, when a party (the "Receiving
+Party") receives Confidential Information from another party (the
+"Disclosing Party"), the Receiving Party shall, and shall obligate its
+employees and agents and employees and agents of its Affiliates to: (i)
+maintain the Confidential Information in strict confidence; (ii) not
+disclose the Confidential Information to a third party without the
+Disclosing Party's prior written approval; and (iii) not, directly or
+indirectly, use the Confidential Information for any purpose other than
+for exercising its rights and fulfilling its responsibilities pursuant
+to this Agreement. Each party shall take reasonable measures to protect
+the Confidential Information of the other party, which measures shall
+not be less than the measures taken by such party to protect its own
+confidential and proprietary information. 
+
+"Confidential Information" shall not include information that (a) is or
+becomes generally known to the public through no act or omission of the
+Receiving Party; (b) was in the Receiving Party's lawful possession
+prior to the disclosure hereunder and was not subject to limitations on
+disclosure or use; (c) is developed by the Receiving Party without
+access to the Confidential Information of the Disclosing Party or by
+persons who have not had access to the Confidential Information of the
+Disclosing Party as proven by the written records of the Receiving
+Party; (d) is lawfully disclosed to the Receiving Party without
+restrictions, by a third party not under an obligation of
+confidentiality; or (e) the Receiving Party is legally compelled to
+disclose the information, in which case the Receiving Party shall assert
+the privileged and confidential nature of the information and cooperate
+fully with the Disclosing Party to protect against and prevent
+disclosure of any Confidential Information and to limit the scope of
+disclosure and the dissemination of disclosed Confidential Information
+by all legally available means. 
+
+The obligations of the Receiving Party under this Section shall continue
+during the Initial Term and for a period of five (5) years after
+expiration or termination of this Agreement. To the extent that the
+terms of the Non-Disclosure Agreement between Nokia and Licensee
+conflict with the terms of this Section 9, this Section 9 shall be
+controlling over the terms of the Non-Disclosure Agreement. 
+
+
+10. GENERAL PROVISIONS
+
+10.1	No Assignment
+
+Licensee shall not be entitled to assign or transfer all or any of its
+rights, benefits and obligations under this Agreement without the prior
+written consent of Nokia, which shall not be unreasonably withheld. 
+
+10.2 	Termination
+
+Nokia may terminate the Agreement at any time immediately upon written
+notice by Nokia to Licensee if Licensee breaches this Agreement. 
+
+Upon termination of this Agreement, Licensee shall return to Nokia all
+copies of Licensed Software that were supplied by Nokia. All other
+copies of Licensed Software in the possession or control of Licensee
+must be erased or destroyed. An officer of Licensee must promptly
+deliver to Nokia a written confirmation that this has occurred. 
+
+10.3	Surviving Sections 
+
+Any terms and conditions that by their nature or otherwise reasonably
+should survive a cancellation or termination of this Agreement shall
+also be deemed to survive. Such terms and conditions include, but are
+not limited to the following Sections: 2, 5, 6, 7, 8, 9, 10.2, 10.3, 10.4,
+10.5, 10.6, 10.7, and 10.8 of this Agreement. 
+
+10.4	Entire Agreement 
+
+This Agreement constitutes the complete agreement between the parties
+and supersedes all prior or contemporaneous discussions,
+representations, and proposals, written or oral, with respect to the
+subject matters discussed herein, with the exception of the
+non-disclosure agreement executed by the parties in connection with this
+Agreement ("Non-Disclosure Agreement"), if any, shall be subject to
+Section 9. No modification of this Agreement shall be effective unless
+contained in a writing executed by an authorized representative of each
+party. No term or condition contained in Licensee's purchase order shall
+apply unless expressly accepted by Nokia in writing. If any provision of
+the Agreement is found void or unenforceable, the remainder shall remain
+valid and enforceable according to its terms. If any remedy provided is
+determined to have failed for its essential purpose, all limitations of
+liability and exclusions of damages set forth in this Agreement shall
+remain in effect. 
+
+10.5	Export Control
+
+Licensee acknowledges that the Licensed Software may be subject to
+export control restrictions of various countries. Licensee shall fully
+comply with all applicable export license restrictions and requirements
+as well as with all laws and regulations relating to the importation of
+the Licensed Software and shall procure all necessary governmental
+authorizations, including without limitation, all necessary licenses,
+approvals, permissions or consents, where necessary for the
+re-exportation of the Licensed Software., 
+
+10.6	Governing Law and Legal Venue
+
+This Agreement shall be construed and interpreted in accordance with the
+laws of Finland, excluding its choice of law provisions. Any disputes
+arising out of or relating to this Agreement shall be resolved in
+arbitration under the Rules of Arbitration of the Chamber of Commerce of
+Helsinki, Finland. The arbitration tribunal shall consist of one (1), or
+if either Party so requires, of three (3), arbitrators. The award shall
+be final and binding and enforceable in any court of competent
+jurisdiction. The arbitration shall be held in Helsinki, Finland and the
+process shall be conducted in the English language. 
+
+10.7	No Implied License
+
+There are no implied licenses or other implied rights granted under this
+Agreement, and all rights, save for those expressly granted hereunder,
+shall remain with Nokia and its licensors. In addition, no licenses or
+immunities are granted to the combination of the Licensed Software with
+any other software or hardware not delivered by Nokia under this
+Agreement. 
+
+10.8	Government End Users 
+ 
+A "U.S. Government End User" shall mean any agency or entity of the
+government of the United States. The following shall apply if Licensee
+is a U.S. Government End User. The Licensed Software is a "commercial
+item," as that term is defined in 48 C.F.R. 2.101 (Oct. 1995),
+consisting of "commercial computer software" and "commercial computer
+software documentation," as such terms are used in 48 C.F.R. 12.212
+(Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
+through 227.7202-4 (June 1995), all U.S. Government End Users acquire
+the Licensed Software with only those rights set forth herein. The
+Licensed Software (including related documentation) is provided to U.S.
+Government End Users: (a) only as a commercial end item; and (b) only
+pursuant to this Agreement. 
+
+
+
+

doc/addressbook-sdk.qdoc

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

doc/maemodev.qdoc

@@ -1,4 +1,4 @@
-***************************************************************************
+/***************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.

doc/qtcreator.qdoc

@@ -288,7 +288,8 @@
 
     Qt Creator provides two integrated visual editors, \QD and \QMLD.
 
-    \QD is a tool for designing and building graphical user interfaces (GUIs) from
+    \l{Using Qt Designer}{\QD} is a tool for designing and building graphical user
+    interfaces (GUIs) from
     Qt widgets. You can compose and customize your widgets or dialogs and test
     them using different styles and resolutions.
 
@@ -304,7 +305,8 @@
     graphics power that are becoming common in portable consumer devices, such as mobile
     phones, media players, set-top boxes, and netbooks.
 
-    \QMLD allows you to easily develop animations by using a declarative programming
+    \l{Using Qt Quick Designer}{\QMLD} allows you to easily develop animations by using a
+    declarative programming
     language called \l {http://doc.qt.nokia.com/4.7/qtquick.html}{QML}.
     In QML, a user interface is specified as a tree of objects with properties.
 
@@ -1026,7 +1028,7 @@
 
     \title Using Qt Quick Designer
 
-    You can edit .qml files in the visual \QMLD editor or in the
+    You can edit .qml files in the \QMLD visual editor or in the
     code editor.
 
     In \gui Projects, double-click a .qml file to open it in the code
@@ -1039,10 +1041,8 @@
 
     \list
 
-    \o \gui {Navigator} pane displays the QML elements in the current QML file.
+    \o \gui {Navigator} pane displays the QML elements in the current QML file
-    You can show and hide items to focus on specific parts of the application.
+    as tree structure.
-    To view lists of files or projects, instead, select \gui {File System},
-    \gui {Open Documents}, or \gui Projects in the menu.
 
     \o \gui {Library} pane displays the building blocks that you can use to design
     applications: predefined QML elements, your own QML components, and other
@@ -1051,13 +1051,65 @@
     \o \gui {Properties} pane organizes the properties of the selected QML element
     or QML component. You can also change the properties in the code editor.
 
-    \o \gui {State} pane displays the different states of the component. To add
+    \o \gui {State} pane displays the different states of the component. QML
-    states, click the empty slot. Then modify the new state in the editor.
+    states typically describe user interface configurations, such as the UI
-    In the code editor, you can see the changes recorded as changes to
+    elements, their properties and behavior and the available actions.
-    the base state.
 
     \endlist
 
+    \section1 Managing Element Hierarchy
+
+    The \gui Navigator pane displays the
+    \l{http://doc.qt.nokia.com/4.7/qdeclarativeelements.html}{QML elements}
+    in the current QML file and their relationships.
+    Elements are listed in a tree structure, below their parent.
+
+    \image qmldesigner-navigator.png "Navigator pane"
+
+    You can select elements in the \gui Navigator to edit their properties
+    in the \gui Properties pane. Elements can access the properties of their
+    parent element.
+
+    Typically, child elements are located within the parent element on the
+    canvas. However, they do not necessarily have to fit inside the parent element.
+    For example, you might want to make a mouse area larger than the rectangle
+    or image beneath it.
+
+    \image qmldesigner-element-size.png "Mouse area for a button"
+
+    When you copy an element, all its child elements are also copied. When
+    you remove an element, the child elements are also removed.
+
+    You can show and hide items to focus on specific parts of the application.
+    Click the
+    \inlineimage qmldesigner-show-hide-icon.png
+    icon to change the visibility of an element on the canvas. To change the
+    visibility of an element in the application, use the \gui Visibility
+    check box or the \gui Opacity field in the \gui Properties pane. If you set
+    \gui Opacity to 0, elements are hidden, but you can still apply animation
+    to them.
+
+    As all properties, visibility and opacity are inherited from the parent
+    element. To hide or show child elements, edit the properties of the
+    parent element.
+
+    To view lists of files or projects, instead, select \gui {File System},
+    \gui {Open Documents}, or \gui Projects in the menu.
+
+    \section2 Switching Parent Elements
+
+    When you drag and drop QML elements to the canvas, Qt Quick Designer
+    adds the new element as a child of the element beneath it.
+    When you move elements on the canvas, Qt Quick Designer cannot determine
+    whether you want to adjust their position or attach them to a new
+    parent element. Therefore, the parent element is not automatically
+    changed. To change the parent of the element, press down the \key Shift
+    key before you drag and drop the element into a new position. The topmost
+    element under the cursor becomes the new parent of the element.
+
+    You can change the parent of an element also in the \gui Navigator pane.
+    Drag and drop the element to another position in the tree.
+
     \section1 Element Library
 
     The \gui {Library} pane contains two tabs: \gui {Items} and \gui {Resources}.
@@ -1082,25 +1134,85 @@
 
     \image qmldesigner-element-properties.png
 
+    The default values of properties are displayed in white color, while the values
+    that you specify explicitly are highlighted with blue color. In addition, property
+    changes in states are highlighted with blue.
+
     For more information on the properties available for an element, press \key {F1}.
 
     \section2 Setting Expressions
 
-    You can set JavaScript expressions as values of some properties. Click the circle
+    \l{http://doc.qt.nokia.com/4.7/propertybinding.html}{Property binding}
+    is a declarative way of specifying the value of a property.
+    Binding allows a property value to be expressed as an JavaScript expression
+    that defines the value relative to other property values or data accessible
+    in the application. The property value is automatically kept up to date if
+    the other properties or data values change.
+
+    Property bindings are created implicitly in QML whenever a property is assigned
+    an JavaScript expression. To set JavaScript expressions as values of properties
+    in Qt Quick Designer, click the circle
     icon next to a property to open a context menu, and select \gui {Set Expression}.
 
     \image qmldesigner-set-expression.png "Element properties context menu"
 
+    To remove expressions, select \gui Reset in the context menu.
+
     For more information on the JavaScript environment provided by QML, see
-    \l{http://doc.qt.nokia.com/4.7-snapshot/qdeclarativejavascript.html}{Integrating JavaScript}.
+    \l{http://doc.qt.nokia.com/4.7/qdeclarativejavascript.html}{Integrating JavaScript}.
 
     \section2 Setting Anchors and Margins
 
-    The \gui Layout pane allows you to set anchors and margins for elements. To set
+    In addition to arranging elements in a grid, row, or column, you can use
-    the anchors of an item, click the anchor buttons. You can combine the top/bottom
+    \l{http://doc.qt.nokia.com/4.7/qml-anchor-layout.html}{anchors} to lay out screens.
-    and left/right anchors to anchor objects in the corners of the parent element.
+    In an anchor-based layout, each item can be thought of as having a set of
+    invisible \e anchor lines: top, bottom, left, right, fill, horizontal center,
+    vertical center, and baseline.
 
-    \inlineimage qmldesigner-anchor-buttons.png "Anchor buttons"
+    In the \gui Layout pane you can set anchors and margins for elements. To set
+    the anchors of an item, click the anchor buttons. You can combine the top/bottom,
+    left/right, and horizontal/vertical anchors to anchor objects in the corners of
+    the parent element or center them horizontally or vertically within the parent
+    element.
+
+    \image qmldesigner-anchor-buttons.png "Anchor buttons"
+
+    In version 2.1, specifying the baseline anchor in Qt Quick Designer is
+    not supported. You can specify it using the code editor.
+
+    For performance reasons, you can only anchor an element to its siblings and
+    direct parent. By default, an element is anchored to its parent when you
+    use the anchor buttons. Select a sibling of the element in the \gui Target
+    field to anchor to it, instead.
+
+    Arbitrary anchoring is not supported. For example, you cannot specify:
+    \c {anchor.left: parent.right}. You have to specify: \c {anchor.left: parent.left}.
+    When you use the anchor buttons, anchors to the parent element are always
+    specified to the same side. However, anchors to sibling elements are specified
+    to the opposite side: \c {anchor.left: sibling.right}. This allows you to keep
+    sibling elements together.
+
+    In the following image, \gui{Rectangle 2} is anchored to its siblings on its
+    right and left and to the bottom of its parent.
+
+    \image qmldesigner-anchors.png "Anchoring sibling elements"
+
+    The anchors for \gui{Rectangle 2} are specified as follows in code:
+
+    \code
+    Rectangle {
+        id: rectangle2
+        anchors.right: rectangle3.left
+        anchors.rightMargin: 15
+        anchors.left: rectangle1.right
+        anchors.leftMargin: 15
+        anchors.bottom: parent.bottom
+        anchors.bottomMargin: 15
+    \endcode
+
+    Margins specify the amount of empty space to leave to the outside of an item.
+    Margins only have meaning for anchors. They do not take any effect when using
+    other layouts or absolute positioning.
 
     \section2 Building Transformations on Items
 
@@ -1111,6 +1223,105 @@
     For more information on Transform elements, see
     \l {http://doc.qt.nokia.com/4.7/qml-transform.html}{QML Transform Element}.
 
+    \section1 Adding States
+
+    User interfaces are designed to present different interface configurations
+    in different scenarios, or to modify their appearances in response to user
+    interaction. Often, there are a set of changes that are made concurrently,
+    such that the interface could be seen to be internally changing from one
+    \e state to another.
+
+    This applies generally to interface elements regardless of their complexity.
+    A photo viewer may initially present images in a grid, and when an image is
+    clicked, change to a detailed state where the individual image is expanded
+    and the interface is changed to present new options for image editing.
+    On the other end of the scale, when a simple button is pressed, it may change
+    to a \e pressed state in which its color and position is modified to give a
+    pressed appearance.
+
+    In QML, any object can change between different states to apply sets of changes
+    that modify the properties of relevant items. Each state can present a
+    different configuration that can, for example:
+
+    \list
+
+        \o Show some UI elements and hide others.
+
+        \o Present different available actions to the user.
+
+        \o Start, stop or pause animations.
+
+        \o Execute some script required in the new state.
+
+        \o Change a property value for a particular item.
+
+        \o Show a different view or screen.
+
+    \endlist
+
+    The \gui State pane displays the different
+    \l{http://doc.qt.nokia.com/4.7/qdeclarativestates.html}{states}
+    of the component in the Qt Quick Designer.
+
+    \image qmldesigner-transitions.png "State pane"
+
+    To add states, click the empty slot. Then modify the new state in the editor.
+    For example, to change the appearance of a button, you can hide the button
+    image and show another image in its place. Or, to add movement to the screen,
+    you can change the position of an object on the canvas and then add animation
+    to the change between the states.
+
+    You can preview the states in the \gui State pane and click them to switch
+    between states on the canvas.
+
+    For more information on using states, see \l{Creating Screens}.
+
+    If you add animation to the states, you can run the application to test the
+    animation.
+
+    For more information on adding animation, see \l{Animating Screens}.
+
+    \section1 Aligning and Positioning Elements
+
+    The position of an element on the canvas can be either absolute or relative
+    to other elements. In the element properties, you can set the x and y
+    coordinates of an element, or \l{Setting Anchors and Margins}{anchor} it to its
+    parent and sibling elements.
+
+    \section2 Snap to Margins
+
+    When you are working on a design, you can use snap and guides to align
+    elements on the canvas. Click the
+    \inlineimage qmldesigner-snap-to-guides-button.png
+    button to have the elements snap to the guides.
+
+    Choose \gui {Tools > Options... > Qt Quick} to specify settings for snap to
+    margins. In the \gui {Snap margin} field, specify the position of the guides
+    as pixels  from the edge of the canvas. In the \gui {Item spacing} field,
+    specify the space in pixels to leave between elements on the screen.
+
+    The following image shows the position of the guides when \gui {Snap margin}
+    is set to 5 pixels.
+
+    \image qmldesigner-snap-margins.png "Snap margins on canvas"
+
+    \section2 Hiding Element Boundaries
+
+    Qt Quick Designer displays the boundaries of elements on the canvas. To hide
+    the element boundaries, click the
+    \inlineimage qmldesigner-show-bounding-rectangles-button.png
+    button.
+
+    \section2 Selecting Elements
+
+    When you point the mouse to overlapping elements, the frontmost element is
+    selected by default. However, elements that do not have any content, such as
+    the mouse area, are typically located in front of elements that do have
+    content, such as rectangles or border images. To select elements with content
+    by default, click the
+    \inlineimage qmldesigner-only-select-items-with-content.png
+    button.
+
 */
 
 
@@ -3118,7 +3329,7 @@
     \endlist
 
     For more information about using the Qt Simulator, see the
-    \l{http://doc.qt.nokia.com/qt-simulator-beta/index.html}{Qt Simulator Manual}.
+    \l{http://doc.qt.nokia.com/qtsimulator/index.html}{Qt Simulator Manual}.
 
     \section1 Running on Maemo
 
@@ -3737,10 +3948,29 @@
     For more information on how to define capabilities for a project, see
     \l{http://doc.qt.nokia.com/4.7/qmake-platform-notes.html#capabilities}{Capabilities}.
 
-    \note If you select a signing option that does not allow the application to access
+    \note In Qt 4.7.1 and later, if you select the \gui {Self-signed certificate}
-    the defined capabilities, qmake disables the capabilities in the .pro file.
+    option, the SIS generation process checks that the package can be self-signed.
-    This allows you to run the application on devices, even though any functionality that
+    If problems are found, it attempts to fix the package. If fixes cannot be made,
-    requires the capabilities is disabled.
+    a message appears in the \gui {Compile Output} view.
+
+    The following modifications can be made:
+
+    \list
+
+        \o Package UID is changed to an UID from the unprotected range (if it was
+        from the protected range).
+
+        \o Vendor ID is set to zero on all binaries included in the package file.
+
+        \o All restricted and device manufacturer capabilities are removed from all
+        libraries included in the package file.
+
+    \endlist
+
+    The application UID or capabilities used in executables (.exe) cannot be changed,
+    because that would break the application. If the executables use protected UIDs
+    or restricted or device manufacturer capabilities, signing fails and an error
+    message appears in the \gui {Compile Output} view.
 
     \section1 Creating Smart Installer for Symbian Packages
 
@@ -3758,6 +3988,11 @@
     Ovi signs the file for you and packages it with Nokia Smart Installer for Symbian.
     For more information, see \l{Publishing Applications to Ovi Store}.
 
+    You can either install the Nokia Smart Installer for Symbian as part of
+    the \QSDK, or download and install it from the
+    \l{http://wiki.forum.nokia.com/index.php/Nokia_Smart_Installer_for_Symbian}{Nokia Smart Installer for Symbian}
+    wiki.
+
     To package Nokia Smart Installer with the application, select the \gui {Create Smart Installer
     package} check box. This ensures that up-to-date and appropriate versions of Qt and its
     dependencies are installed on devices. Further, it reduces the file size of the application you
@@ -3795,6 +4030,12 @@
 
         \o In the \gui {Create SIS Package} step, select \gui {Self-signed certificate}.
 
+        \o In the \gui {Deploy SIS Package} step, click \gui {Remove Item} to
+        skip the step of copying the SIS file to a device. The SIS file is created
+        in the project folder.
+
+        \image qtcreator-remove-deploy-step.png "Removing deploy steps"
+
         \o To package Nokia Smart Installer for Symbian with the application, select
         the \gui {Create Smart Installer package} check box.
 
@@ -3846,6 +4087,10 @@
         \o In the \gui {Create SIS Package} step, specify the developer certificate
         and key in the \gui {Custom certificate} and \gui {Key file} fields.
 
+        \o In the \gui {Deploy SIS Package} step, click \gui {Remove Item} to
+        skip the step of copying the SIS file to a device. The SIS file is created
+        in the project folder.
+
         \o Edit the project .pro file to use the correct UIDs and vendor information
         for the application, as illustrated by the following code snippet:
 
@@ -3875,6 +4120,8 @@
         \o After receiving the .sis file from Symbian Signed, copy it over the old
         application.sis.
 
+        \note The instructions below assume that you have installed \QSDK.
+
         \o To package Nokia Smart Installer for Symbian with the application, choose
         \gui {Start > Nokia Qt SDK > Symbian > Qt for Symbian Command Prompt}
         to open the Qt command line environment.
@@ -3896,6 +4143,7 @@
     \endlist
 
     Qt Creator automatically generates a wrapper package in the project folder.
+
     \note Ensure that your application complies with the requirements before submitting
     the file to Ovi Store.
 
@@ -3903,7 +4151,7 @@
     \l{http://doc.qt.nokia.com/4.7/qmake-variable-reference.html#deployment}{qmake Variable Reference}.
 
     For more information about the Nokia Smart Installer, see the
-    \l{http://doc.qt.nokia.com/smart-installer-1.0/index.html}{Nokia Smart Installer for Symbian Manual}.
+    \l{http://doc.qt.nokia.com/smart-installer/index.html}{Nokia Smart Installer for Symbian Manual}.
 
     Note: Nokia Smart Installer for Symbian is only available on Windows.
 
@@ -3959,6 +4207,8 @@
 
     For an up-to-date list, see
     \l{http://www.forum.nokia.com/Distribute/Packaging_and_signing.xhtml}{Packaging and Signing}.
+    New devices are added to the list periodically. The final authority
+    on the supported devices is the Ovi Publish tool itself.
 
     \section1 Publishing Qt Content for Symbian Devices
 
@@ -4038,6 +4288,43 @@
     applied when UIDs from the trusted range 0x2xxxxxxx are used. For more
     information, see \l{http://wiki.forum.nokia.com/index.php/UID}{UID}.
 
+    \section1 Publishing Qt Content for Maemo Devices
+
+    The applications that you publish on Ovi Store, must meet the testing criteria
+    listed in
+    \l{http://www.forum.nokia.com/info/sw.nokia.com/id/9cd1eb18-821b-4228-a0a3-36b049c5d608/Maemo_5_Application_OVI_Store_Entry_Requirements.pdf.html}
+    {Maemo 5 Applications: Ovi Store Entry Requirements}.
+
+    Make sure that your application passes the following most commonly
+    failed test cases:
+
+    \list
+
+        \o Package filename must include the application name and version
+        number using three digits. For example: myapplication_1_0_1.deb
+
+        \o Application files must be installed to the opt folder on the ext3
+        partition.
+
+        \o Debian packages must be given the category user/hidden.
+
+        \o Application cannot crash or hang during use.
+
+        \o The application must handle different memory situations correctly.
+
+    \endlist
+
+    You set the application name and installation folder in the
+    \gui {Run Settings} for the project. For more information, see
+    \l{Deploying Applications to Maemo Devices}. Qt Creator specifies the correct
+    category settings by default when it creates the Debian directory and
+    the necessary files.
+
+    You can test the application on Qt Simulator and Maemo Emulator to make
+    sure that it does not crash or hang and to check how it handles different
+    memory situations. Before you submit the application to Ovi Publishing, you
+    must also fully test it on a Maemo device.
+
 */
 
 /*!
@@ -4226,7 +4513,7 @@
     Each Mobility API has its corresponding value that you have to add
     as a value of MOBILITY to use the API. For a list of the APIs and the
     corresponding values that you can assign to MOBILITY, see the
-    \l {http://doc.qt.nokia.com/qtmobility-1.0/quickstart.html}{Quickstart Example}.
+    \l {http://doc.qt.nokia.com/qtmobility/quickstart.html}{Quickstart Example}.
 
     \section1 Designing the User Interface
 
@@ -4424,7 +4711,7 @@
     \l {http://doc.qt.nokia.com/4.7/qtquick.html}{Qt Quick}.
 
     This tutorial describes how to use the Qt Creator to implement the
-    \l{http://doc.qt.nokia.com/4.7-snapshot/declarative-animation-states.html}
+    \l{http://doc.qt.nokia.com/4.7/declarative-animation-states.html}
     {states and transitions example application}. The example application displays a
     Qt logo that moves between three rectangles on the page when you click them.
 
@@ -7617,6 +7904,65 @@
 
     The properties that you change in a state are highlighted with blue color.
     In the code editor, you can see the changes recorded as changes to the base state.
+
+    To keep the QML code clean, you should create a base state that contains all the
+    elements you will need in the application. You can then create states, in
+    which you hide and show a set of items and modify their properties.
+    This allows you to:
+
+    \list
+
+        \o Align items on different screens with each other.
+
+        \o Avoid excessive property changes. If an item is invisible in the base
+        state, you must define all changes to its child elements as property changes,
+        which leads to complicated QML code.
+
+        \o Minimize the differences between the base state and the other states
+        to keep the QML code short and readable and to improve performance.
+
+        \o Avoid problems when using transitions and animation when changing
+        states.
+
+    \endlist
+
+    To create screens for an application by using states:
+
+    \list 1
+
+        \o In the base state, add all elements you will need in the application.
+        While you work on one screen, you can click the
+        \inlineimage qmldesigner-show-hide-icon.png
+        icon to hide elements on the canvas that are not part of a screen.
+
+        \o In the \gui States pane, click the empty slot to create a new state
+        and give it a name. For example, \c Normal.
+
+        \o In the \gui Properties pane, deselect the \gui Visibility check box
+        or set \gui Opacity to 0 for each element that is not needed in this view.
+        If you specify the setting for the parent element, all child elements
+        inherit it and are also hidden.
+
+        \image qmldesigner-screen-design.png "Designing screens"
+
+        \o Create additional states for each screen and set the visibility or
+        opacity of the elements in the screen.
+
+        \o To determine which view opens when the application starts, use the code
+        editor to set the state of the root item of the .qml file, as specified by the
+        following code snippet:
+
+        \code
+
+        Item {
+            state: "Normal"
+        }
+
+        \endcode
+
+    \endlist
+
+
 */
 
 
@@ -7797,7 +8143,7 @@
     To test the application UI, user interaction with the application, and
     functionality that uses the mobility APIs, use the Qt Simulator,
     instead. For more information, see the
-    \l{http://doc.qt.nokia.com/qt-simulator-beta/index.html}{Qt Simulator Manual}.
+    \l{http://doc.qt.nokia.com/qtsimulator/index.html}{Qt Simulator Manual}.
 
     The Maemo emulator is installed and configured as part of the \QSDK
     package. You can also install and configure the MADDE environment and

share/qtcreator/gdbmacros/gdbmacros.cpp

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

share/qtcreator/gdbmacros/gdbmacros.h

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

share/qtcreator/gdbmacros/gdbmacros_p.h

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

share/qtcreator/gdbmacros/test/main.cpp

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

share/qtcreator/qml/qmljsdebugger/editor/abstractformeditortool.cpp

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

share/qtcreator/qml/qmljsdebugger/editor/abstractformeditortool.h

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

share/qtcreator/qml/qmljsdebugger/editor/boundingrecthighlighter.cpp

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

share/qtcreator/qml/qmljsdebugger/editor/boundingrecthighlighter.h

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

share/qtcreator/qml/qmljsdebugger/editor/colorpickertool.cpp

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

share/qtcreator/qml/qmljsdebugger/editor/colorpickertool.h

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

share/qtcreator/qml/qmljsdebugger/editor/layeritem.cpp

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

share/qtcreator/qml/qmljsdebugger/editor/layeritem.h

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

share/qtcreator/qml/qmljsdebugger/editor/qmltoolbar.cpp

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

share/qtcreator/qml/qmljsdebugger/editor/qmltoolbar.h

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

share/qtcreator/qml/qmljsdebugger/editor/rubberbandselectionmanipulator.cpp

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

share/qtcreator/qml/qmljsdebugger/editor/rubberbandselectionmanipulator.h

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

share/qtcreator/qml/qmljsdebugger/editor/selectionindicator.cpp

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

share/qtcreator/qml/qmljsdebugger/editor/selectionindicator.h

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

share/qtcreator/qml/qmljsdebugger/editor/selectionrectangle.cpp

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

share/qtcreator/qml/qmljsdebugger/editor/selectionrectangle.h

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

share/qtcreator/qml/qmljsdebugger/editor/selectiontool.cpp

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

share/qtcreator/qml/qmljsdebugger/editor/selectiontool.h

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

share/qtcreator/qml/qmljsdebugger/editor/singleselectionmanipulator.cpp

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

share/qtcreator/qml/qmljsdebugger/editor/singleselectionmanipulator.h

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

share/qtcreator/qml/qmljsdebugger/editor/subcomponenteditortool.cpp

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

share/qtcreator/qml/qmljsdebugger/editor/subcomponenteditortool.h

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

share/qtcreator/qml/qmljsdebugger/editor/subcomponentmasklayeritem.cpp

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

share/qtcreator/qml/qmljsdebugger/editor/subcomponentmasklayeritem.h

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

share/qtcreator/qml/qmljsdebugger/editor/toolbarcolorbox.cpp

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

share/qtcreator/qml/qmljsdebugger/editor/toolbarcolorbox.h

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

share/qtcreator/qml/qmljsdebugger/editor/zoomtool.cpp

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

share/qtcreator/qml/qmljsdebugger/editor/zoomtool.h

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

share/qtcreator/qml/qmljsdebugger/include/qdeclarativeviewobserver.h

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

share/qtcreator/qml/qmljsdebugger/include/qmljsdebugger_global.h

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

share/qtcreator/qml/qmljsdebugger/include/qmlobserverconstants.h

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

share/qtcreator/qml/qmljsdebugger/qdeclarativeviewobserver.cpp

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

share/qtcreator/qml/qmljsdebugger/qdeclarativeviewobserver_p.h

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

share/qtcreator/templates/wizards/helloworld/wizard_sample.xml

@@ -8,12 +8,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -24,8 +24,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

share/qtcreator/templates/wizards/listmodel/wizard_sample.xml

@@ -8,12 +8,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -24,8 +24,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

share/qtcreator/templates/wizards/qml-extension/wizard.xml

@@ -8,12 +8,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -24,8 +24,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

share/qtcreator/templates/wizards/qtcreatorplugin/wizard.xml

@@ -8,12 +8,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -24,8 +24,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

share/qtcreator/templates/wizards/scriptgeneratedproject/wizard_sample.xml

@@ -8,12 +8,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -24,8 +24,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

share/qtcreator/translations/qtcreator_de.ts

@@ -15374,11 +15374,11 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
     </message>
     <message>
         <source>Stop Deploying</source>
-        <translation>Deployement beenden</translation>
+        <translation>Deployment beenden</translation>
     </message>
     <message>
         <source>Could not connect to host: %1</source>
-        <translation>Es konnte keine Verbindung zum Host %1 hergestellt werden</translation>
+        <translation>Es konnte keine Verbindung zum Host hergestellt werden: %1</translation>
     </message>
     <message>
         <source>Key was successfully deployed.</source>
@@ -16057,7 +16057,7 @@ Qt Quick-UI-Projekte benötigen keine Übersetzung und können direkt im QML-Bet
     </message>
     <message>
         <source>Free ports:</source>
-        <translation>Freien Ports:</translation>
+        <translation>Freie Ports:</translation>
     </message>
     <message>
         <source>You can enter lists and ranges like this: 1024,1026-1028,1030</source>
@@ -16323,7 +16323,7 @@ Qt Quick-UI-Projekte benötigen keine Übersetzung und können direkt im QML-Bet
     </message>
     <message>
         <source>Could not connect to host: %1</source>
-        <translation>Es konnte keine Verbindung zum Host %1 hergestellt werden</translation>
+        <translation>Es konnte keine Verbindung zum Host hergestellt werden: %1</translation>
     </message>
     <message>
         <source>
@@ -20164,7 +20164,7 @@ Weder der Pfad zur Bibliothek noch der Pfad zu den Headerdateien wird zur .pro-D
     </message>
     <message>
         <source>Could not connect to host: %1</source>
-        <translation>Es konnte keine Verbindung zum Host %1 hergestellt werden</translation>
+        <translation>Es konnte keine Verbindung zum Host hergestellt werden: %1</translation>
     </message>
     <message>
         <source>Upload failed: Could not open file &apos;%1&apos;</source>
@@ -20268,7 +20268,7 @@ Weder der Pfad zur Bibliothek noch der Pfad zu den Headerdateien wird zur .pro-D
     <name>Qt4ProjectManager::Internal::MaemoDeviceEnvReader</name>
     <message>
         <source>Could not connect to host: %1</source>
-        <translation>Es konnte keine Verbindung zum Host %1 hergestellt werden</translation>
+        <translation>Es konnte keine Verbindung zum Host hergestellt werden: %1</translation>
     </message>
     <message>
         <source>Error running remote process: %1</source>
@@ -20440,7 +20440,7 @@ Fehlerausgabe: %1</translation>
     </message>
     <message>
         <source>Could not connect to host: %1</source>
-        <translation>Es konnte keine Verbindung zum Host %1 hergestellt werden</translation>
+        <translation>Es konnte keine Verbindung zum Host hergestellt werden: %1</translation>
     </message>
     <message>
         <source>Connection failed: %1</source>

share/qtcreator/translations/qtcreator_ru.ts

@@ -2892,6 +2892,10 @@ Would you like to overwrite them?</source>
         <source>Yes, I know what I am doing.</source>
         <translation>Да, я знаю что делаю.</translation>
     </message>
+    <message>
+        <source>&amp;Refactor</source>
+        <translation>&amp;Рефакторинг</translation>
+    </message>
     <message>
         <source>Unused variable</source>
         <translation>Неиспользуемая переменная</translation>

src/app/main.cpp

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

src/libs/3rdparty/botan/build/botan/build.h

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

src/libs/3rdparty/precompiled_headers/botan_pch.h

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

src/libs/aggregation/aggregate.cpp

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

src/libs/aggregation/aggregate.h

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

src/libs/aggregation/aggregation_global.h

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

src/libs/aggregation/examples/text/main.cpp

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

src/libs/aggregation/examples/text/main.h

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

src/libs/aggregation/examples/text/myinterfaces.h

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

src/libs/cplusplus/ASTParent.cpp

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

src/libs/cplusplus/ASTParent.h

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

src/libs/cplusplus/ASTPath.cpp

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

src/libs/cplusplus/ASTPath.h

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

src/libs/cplusplus/BackwardsScanner.cpp

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 #include "BackwardsScanner.h"

src/libs/cplusplus/BackwardsScanner.h

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 #ifndef CPLUSPLUS_BACKWARDSSCANNER_H

src/libs/cplusplus/CppDocument.cpp

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

src/libs/cplusplus/CppDocument.h

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

src/libs/cplusplus/CppRewriter.cpp

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 #include "CppRewriter.h"

src/libs/cplusplus/CppRewriter.h

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

src/libs/cplusplus/DependencyTable.cpp

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

src/libs/cplusplus/DependencyTable.h

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

src/libs/cplusplus/DeprecatedGenTemplateInstance.cpp

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

src/libs/cplusplus/DeprecatedGenTemplateInstance.h

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

src/libs/cplusplus/ExpressionUnderCursor.cpp

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

src/libs/cplusplus/ExpressionUnderCursor.h

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

src/libs/cplusplus/FastPreprocessor.cpp

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

src/libs/cplusplus/FastPreprocessor.h

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

src/libs/cplusplus/FindUsages.cpp

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

src/libs/cplusplus/FindUsages.h

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

src/libs/cplusplus/Icons.cpp

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

src/libs/cplusplus/Icons.h

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

src/libs/cplusplus/LookupContext.cpp

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

src/libs/cplusplus/LookupContext.h

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

src/libs/cplusplus/LookupItem.cpp

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

src/libs/cplusplus/LookupItem.h

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 

src/libs/cplusplus/Macro.cpp

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 /*

src/libs/cplusplus/Macro.h

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 /*

src/libs/cplusplus/MatchingText.cpp

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 #include "MatchingText.h"

src/libs/cplusplus/MatchingText.h

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
 #ifndef CPLUSPLUS_MATCHINGTEXT_H

src/libs/cplusplus/NamePrettyPrinter.cpp

@@ -6,12 +6,12 @@
 **
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** Commercial Usage
+** No Commercial Usage
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
+** This file contains pre-release code and may not be distributed.
-** accordance with the Qt Commercial License Agreement provided with the
+** You may use this file in accordance with the terms and conditions
-** Software or, alternatively, in accordance with the terms contained in
+** contained in the Technology Preview License Agreement accompanying
-** a written agreement between you and Nokia.
+** this package.
 **
 ** GNU Lesser General Public License Usage
 **
@@ -22,8 +22,12 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** If you are unsure which license is appropriate for your use, please
+** In addition, as a special exception, Nokia gives you certain additional
-** contact the sales department at http://qt.nokia.com/contact.
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/