diff options
1098 files changed, 1759 insertions, 1632 deletions
diff --git a/GPL_EXCEPTION.txt b/GPL_EXCEPTION.TXT index 8fa94329fe..8fa94329fe 100644 --- a/GPL_EXCEPTION.txt +++ b/GPL_EXCEPTION.TXT diff --git a/GPL_EXCEPTION_ADDENDUM.TXT b/GPL_EXCEPTION_ADDENDUM.TXT new file mode 100644 index 0000000000..e3d26987cd --- /dev/null +++ b/GPL_EXCEPTION_ADDENDUM.TXT @@ -0,0 +1,240 @@ +Addendum to the Nokia Corporation GPL Exception version 1.3 +=========================================================== + + +-------------------------------------------------------------------------- + + The "Artistic License" + + Preamble + +The intent of this document is to state the conditions under which a +Package may be copied, such that the Copyright Holder maintains some +semblance of artistic control over the development of the package, +while giving the users of the package the right to use and distribute +the Package in a more-or-less customary fashion, plus the right to make +reasonable modifications. + +Definitions: + + "Package" refers to the collection of files distributed by the + Copyright Holder, and derivatives of that collection of files + created through textual modification. + + "Standard Version" refers to such a Package if it has not been + modified, or has been modified in accordance with the wishes + of the Copyright Holder as specified below. + + "Copyright Holder" is whoever is named in the copyright or + copyrights for the package. + + "You" is you, if you're thinking about copying or distributing + this Package. + + "Reasonable copying fee" is whatever you can justify on the + basis of media cost, duplication charges, time of people involved, + and so on. (You will not be required to justify it to the + Copyright Holder, but only to the computing community at large + as a market that must bear the fee.) + + "Freely Available" means that no fee is charged for the item + itself, though there may be fees involved in handling the item. + It also means that recipients of the item may redistribute it + under the same conditions they received it. + +1. You may make and give away verbatim copies of the source form of the +Standard Version of this Package without restriction, provided that you +duplicate all of the original copyright notices and associated disclaimers. + +2. You may apply bug fixes, portability fixes and other modifications +derived from the Public Domain or from the Copyright Holder. A Package +modified in such a way shall still be considered the Standard Version. + +3. You may otherwise modify your copy of this Package in any way, provided +that you insert a prominent notice in each changed file stating how and +when you changed that file, and provided that you do at least ONE of the +following: + + a) place your modifications in the Public Domain or otherwise make them + Freely Available, such as by posting said modifications to Usenet or + an equivalent medium, or placing the modifications on a major archive + site such as uunet.uu.net, or by allowing the Copyright Holder to include + your modifications in the Standard Version of the Package. + + b) use the modified Package only within your corporation or organization. + + c) rename any non-standard executables so the names do not conflict + with standard executables, which must also be provided, and provide + a separate manual page for each non-standard executable that clearly + documents how it differs from the Standard Version. + + d) make other distribution arrangements with the Copyright Holder. + +4. You may distribute the programs of this Package in object code or +executable form, provided that you do at least ONE of the following: + + a) distribute a Standard Version of the executables and library files, + together with instructions (in the manual page or equivalent) on where + to get the Standard Version. + + b) accompany the distribution with the machine-readable source of + the Package with your modifications. + + c) give non-standard executables non-standard names, and clearly + document the differences in manual pages (or equivalent), together + with instructions on where to get the Standard Version. + + d) make other distribution arrangements with the Copyright Holder. + +5. You may charge a reasonable copying fee for any distribution of this +Package. You may charge any fee you choose for support of this +Package. You may not charge a fee for this Package itself. However, +you may distribute this Package in aggregate with other (possibly +commercial) programs as part of a larger (possibly commercial) software +distribution provided that you do not advertise this Package as a +product of your own. You may embed this Package's interpreter within +an executable of yours (by linking); this shall be construed as a mere +form of aggregation, provided that the complete Standard Version of the +interpreter is so embedded. + +6. The scripts and library files supplied as input to or produced as +output from the programs of this Package do not automatically fall +under the copyright of this Package, but belong to whoever generated +them, and may be sold commercially, and may be aggregated with this +Package. If such scripts or library files are aggregated with this +Package via the so-called "undump" or "unexec" methods of producing a +binary executable image, then distribution of such an image shall +neither be construed as a distribution of this Package nor shall it +fall under the restrictions of Paragraphs 3 and 4, provided that you do +not represent such an executable image as a Standard Version of this +Package. + +7. C subroutines (or comparably compiled subroutines in other +languages) supplied by you and linked into this Package in order to +emulate subroutines and variables of the language defined by this +Package shall not be considered part of this Package, but are the +equivalent of input as in Paragraph 6, provided these subroutines do +not change the language in any way that would cause it to fail the +regression tests for the language. + +8. Aggregation of this Package with a commercial distribution is always +permitted provided that the use of this Package is embedded; that is, +when no overt attempt is made to make this Package's interfaces visible +to the end user of the commercial distribution. Such use shall not be +construed as a distribution of this Package. + +9. The name of the Copyright Holder may not be used to endorse or promote +products derived from this software without specific prior written permission. + +10. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR +IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED +WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. + + The End + +-------------------------------------------------------------------------- + +MIT License + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +-------------------------------------------------------------------------- + +Python License (CNRI Python License) + +CNRI OPEN SOURCE LICENSE AGREEMENT + +IMPORTANT: PLEASE READ THE FOLLOWING AGREEMENT CAREFULLY. + +BY CLICKING ON "ACCEPT" WHERE INDICATED BELOW, OR BY COPYING, INSTALLING OR +OTHERWISE USING PYTHON 1.6, beta 1 SOFTWARE, YOU ARE DEEMED TO HAVE AGREED TO +THE TERMS AND CONDITIONS OF THIS LICENSE AGREEMENT. + +1. This LICENSE AGREEMENT is between the Corporation for National Research +Initiatives, having an office at 1895 Preston White Drive, Reston, VA 20191 +("CNRI"), and the Individual or Organization ("Licensee") accessing and +otherwise using Python 1.6, beta 1 software in source or binary form and its +associated documentation, as released at the www.python.org Internet site on +August 4, 2000 ("Python 1.6b1"). + +2. Subject to the terms and conditions of this License Agreement, CNRI hereby +grants Licensee a non-exclusive, royalty-free, world-wide license to reproduce, +analyze, test, perform and/or display publicly, prepare derivative works, +distribute, and otherwise use Python 1.6b1 alone or in any derivative version, +provided, however, that CNRIs License Agreement is retained in Python 1.6b1, +alone or in any derivative version prepared by Licensee. + +Alternately, in lieu of CNRIs License Agreement, Licensee may substitute the +following text (omitting the quotes): "Python 1.6, beta 1, is made available +subject to the terms and conditions in CNRIs License Agreement. This Agreement +may be located on the Internet using the following unique, persistent identifier +(known as a handle): 1895.22/1011. This Agreement may also be obtained from a +proxy server on the Internet using the URL:http://hdl.handle.net/1895.22/1011". + +3. In the event Licensee prepares a derivative work that is based on or +incorporates Python 1.6b1or any part thereof, and wants to make the derivative +work available to the public as provided herein, then Licensee hereby agrees to +indicate in any such work the nature of the modifications made to Python 1.6b1. + +4. CNRI is making Python 1.6b1 available to Licensee on an "AS IS" basis. CNRI +MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF EXAMPLE, +BUT NOT LIMITATION, CNRI MAKES NO AND DISCLAIMS ANY REPRESENTATION OR WARRANTY +OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF +PYTHON 1.6b1WILL NOT INFRINGE ANY THIRD PARTY RIGHTS. + +5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE SOFTWARE FOR +ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF USING, +MODIFYING OR DISTRIBUTING PYTHON 1.6b1, OR ANY DERIVATIVE THEREOF, EVEN IF +ADVISED OF THE POSSIBILITY THEREOF. + +6. This License Agreement will automatically terminate upon a material breach of +its terms and conditions. + +7. This License Agreement shall be governed by and interpreted in all respects +by the law of the State of Virginia, excluding conflict of law +provisions. Nothing in this License Agreement shall be deemed to create any +relationship of agency, partnership, or joint venture between CNRI and +Licensee. This License Agreement does not grant permission to use CNRI +trademarks or trade name in a trademark sense to endorse or promote products or +services of Licensee, or any third party. + +8. By clicking on the "ACCEPT" button where indicated, or by copying, installing +or otherwise using Python 1.6b1, Licensee agrees to be bound by the terms and +conditions of this License Agreement. + + + +ACCEPT + +-------------------------------------------------------------------------- + +The zlib/libpng License + +Copyright (c) <year> <copyright holders> + +This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. + + 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. + + 3. This notice may not be removed or altered from any source distribution. + +-------------------------------------------------------------------------- diff --git a/bin/gdbmacros/gdbmacros.cpp b/bin/gdbmacros/gdbmacros.cpp index 775819934b..ca19e58702 100644 --- a/bin/gdbmacros/gdbmacros.cpp +++ b/bin/gdbmacros/gdbmacros.cpp @@ -1,34 +1,35 @@ -/**************************************************************************** +/*************************************************************************** +** ** This file is part of Qt Creator ** -** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).* +** Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies). +** +** Contact: Qt Software Information (qt-info@nokia.com) +** ** -** Contact: Qt Software Information (qt-info@nokia.com)** +** Non-Open Source Usage ** -** No Commercial Usage -** This file contains pre-release code and may only be used for evaluation -** and testing purposes. It may not be used for commercial development. You -** may use this file in accordance with the terms and conditions contained in -** the either Technology Preview License Agreement or the Beta Release -** License Agreement. +** Licensees may use this file in accordance with the Qt Beta Version +** License Agreement, Agreement version 2.2 provided with the Software or, +** alternatively, in accordance with the terms contained in a written +** agreement between you and Nokia. ** ** GNU General Public License Usage +** ** Alternatively, this file may be used under the terms of the GNU General ** Public License versions 2.0 or 3.0 as published by the Free Software ** Foundation and appearing in the file LICENSE.GPL included in the packaging ** of this file. Please review the following information to ensure GNU ** General Public Licensing requirements will be met: +** ** http://www.fsf.org/licensing/licenses/info/GPLv2.html and -** http://www.gnu.org/copyleft/gpl.html. In addition, as a special -** exception, Nokia gives you certain additional rights. These rights are -** described in the Nokia Qt GPL Exception version 1.2, included in the file -** GPL_EXCEPTION.txt in this package. +** http://www.gnu.org/copyleft/gpl.html. ** -** If you have questions regarding the use of this file, please contact Nokia -** at qt-info@nokia.com -****************************************************************************/ - -// {[( +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt GPL Exception +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. +** +***************************************************************************/ #include <qglobal.h> @@ -2497,6 +2498,3 @@ void qDumpObjectData440( qDebug() << "Unsupported protocol version" << protocolVersion; } } - - -// ]}) diff --git a/bin/license.txt b/bin/license.txt index 8e4678abe4..e965c1d70f 100644 --- a/bin/license.txt +++ b/bin/license.txt @@ -1,615 +1,229 @@ -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 resident in the Americas (North America, Central America and South America), the applicable licensing terms are specified under the heading "Beta Version License +Agreement (Agreement version 2.2): 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". +For individuals and/or legal entities not resident in The Americas, the applicable licensing terms are specified under the heading " Beta Version License Agreement (Agreement version 2.2): Rest of the World". +---------------------------------------- -TECHNOLOGY PREVIEW LICENSE AGREEMENT: The Americas -Agreement version 2.3 +BETA VERSION LICENSE AGREEMENT +Agreement version 2.2 "Rest of the World" -This Technology Preview License Agreement ("Agreement") is a legal -agreement between Nokia Inc. ("Nokia"), with its registered office at -6021 Connection Drive, Irving, TX 75039, U.S.A. and you (either an -individual or a legal entity) ("Licensee") for the Licensed Software (as -defined below). +This Beta Version 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. 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. +"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. -"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. +"Applications" shall mean Licensee's software products created using the Licensed Software which may include portions of the Licensed Software. -"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. +"Term" shall mean the period of time from the later of (a) the Effective Date; or (b) the date the Licensed Software was initially delivered to Licensee by Nokia until thirty (30) days after Nokia's next beta or commercial release of a version of the Licensed Software with the same major and minor version number as the Licensed Software. 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. Notwithstanding the foregoing, in no event shall the term exceed six (6) months from the date Nokia initially delivered the Licensed Software to Licensee. -"Party" or "Parties" shall mean Licensee and/or Nokia. +"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. +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. +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 -evaluating and testing the Licensed Software during the Term. +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 testing 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. +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. +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 +4.3 Support -Nokia has no obligation to furnish Licensee with any technical support -whatsoever. Any such support is subject to separate agreement between -the Parties. +Nokia has no obligation to furnish Licensee with maintenance, technical support or updates for the Licensed Software provided under this Agreement. However, Nokia may, in its sole discretion, provide further pre-release versions, technical support, updates and/or supplements of the Licensed Software and/or related information ("Support and Updates") to Licensee hereunder, in which case Support and Updates shall also be deemed to be included in the Licensed Software and therefore governed by the terms of this Agreement, unless other terms of use are provided by Nokia with such Support and Updates. 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. +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, however Applications may be distributed within Licensee's organization for testing purposes. 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. +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. +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. +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 8, this Section 8 shall be -controlling over the terms of the Non-Disclosure Agreement. +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 8, this Section 8 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. +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. +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. +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. +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 8. 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. +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 8. 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., +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. + 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. +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. - - +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.3 +BETA VERSION LICENSE AGREEMENT +Agreement version 2.2"The Americas" -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). +This Beta Version License Agreement ("Agreement") is a legal agreement between Nokia Inc. ("Nokia"), with its registered office at 6021 Connection Drive, Irving, TX 75039 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. +"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. -"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. +"Applications" shall mean Licensee's software products created using the Licensed Software which may include portions of the Licensed Software. -"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. +"Term" shall mean the period of time from the later of (a) the Effective Date; or (b) the date the Licensed Software was initially delivered to Licensee by Nokia until thirty (30) days after Nokia's next beta or commercial release of a version of the Licensed Software with the same major and minor version number as the Licensed Software. 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. Notwithstanding the foregoing, in no event shall the term exceed six (6) months from the date Nokia initially delivered the Licensed Software to Licensee. -"Party" or "Parties" shall mean Licensee and/or Nokia. +"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. +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. +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 -evaluating and testing the Licensed Software during the Term. +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 testing 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. +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. +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 +4.3 Support -Nokia has no obligation to furnish Licensee with any technical support -whatsoever. Any such support is subject to separate agreement between -the Parties. +Nokia has no obligation to furnish Licensee with maintenance, technical support or updates for the Licensed Software provided under this Agreement. However, Nokia may, in its sole discretion, provide further pre-release versions, technical support, updates and/or supplements of the Licensed Software and/or related information ("Support and Updates") to Licensee hereunder, in which case Support and Updates shall also be deemed to be included in the Licensed Software and therefore governed by the terms of this Agreement, unless other terms of use are provided by Nokia with such Support and Updates. 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. +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, however Applications may be distributed within Licensee's organization for testing purposes. 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. +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. +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. +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 8, this Section 8 shall be -controlling over the terms of the Non-Disclosure Agreement. +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 8, this Section 8 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. +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. +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. +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. +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 8. 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. +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 8. 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., +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. + 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. +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. +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. diff --git a/doc/example/textfinder/main.cpp b/doc/example/textfinder/main.cpp index c388d8bba8..5e73ed9d91 100644 --- a/doc/example/textfinder/main.cpp +++ b/doc/example/textfinder/main.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/doc/example/textfinder/textfinder.cpp b/doc/example/textfinder/textfinder.cpp index 7fcd061d6f..c289b45e8c 100644 --- a/doc/example/textfinder/textfinder.cpp +++ b/doc/example/textfinder/textfinder.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/doc/example/textfinder/textfinder.h b/doc/example/textfinder/textfinder.h index 0ff4839575..a712a1d12d 100644 --- a/doc/example/textfinder/textfinder.h +++ b/doc/example/textfinder/textfinder.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/doc/qtcreator-add-resource-wizard.png b/doc/qtcreator-add-resource-wizard.png Binary files differindex 92c21e5b54..1a1ceb62e6 100644 --- a/doc/qtcreator-add-resource-wizard.png +++ b/doc/qtcreator-add-resource-wizard.png diff --git a/doc/qtcreator-add-resource-wizard2.png b/doc/qtcreator-add-resource-wizard2.png Binary files differnew file mode 100644 index 0000000000..74569996fe --- /dev/null +++ b/doc/qtcreator-add-resource-wizard2.png diff --git a/doc/qtcreator-add-resource.png b/doc/qtcreator-add-resource.png Binary files differindex 8a068987f1..036ff91548 100644 --- a/doc/qtcreator-add-resource.png +++ b/doc/qtcreator-add-resource.png diff --git a/doc/qtcreator-breakdown.png b/doc/qtcreator-breakdown.png Binary files differindex 9b9f070695..bba842e1f5 100644 --- a/doc/qtcreator-breakdown.png +++ b/doc/qtcreator-breakdown.png diff --git a/doc/qtcreator-class-info.png b/doc/qtcreator-class-info.png Binary files differindex 757eb12856..a005239707 100644 --- a/doc/qtcreator-class-info.png +++ b/doc/qtcreator-class-info.png diff --git a/doc/qtcreator-debug-stack.png b/doc/qtcreator-debug-stack.png Binary files differnew file mode 100644 index 0000000000..d6dce2c57f --- /dev/null +++ b/doc/qtcreator-debug-stack.png diff --git a/doc/qtcreator-debug-view.png b/doc/qtcreator-debug-view.png Binary files differnew file mode 100644 index 0000000000..856a85f920 --- /dev/null +++ b/doc/qtcreator-debug-view.png diff --git a/doc/qtcreator-intro-and-location.png b/doc/qtcreator-intro-and-location.png Binary files differindex e0d8c9f150..f03e4fb6a4 100644 --- a/doc/qtcreator-intro-and-location.png +++ b/doc/qtcreator-intro-and-location.png diff --git a/doc/qtcreator-new-project-summary.png b/doc/qtcreator-new-project-summary.png Binary files differnew file mode 100644 index 0000000000..05e1cf2e0d --- /dev/null +++ b/doc/qtcreator-new-project-summary.png diff --git a/doc/qtcreator-new-project.png b/doc/qtcreator-new-project.png Binary files differindex 6f7832e5cb..f6c186206e 100644 --- a/doc/qtcreator-new-project.png +++ b/doc/qtcreator-new-project.png diff --git a/doc/qtcreator-screenshots.png b/doc/qtcreator-screenshots.png Binary files differnew file mode 100644 index 0000000000..18ae5e77f8 --- /dev/null +++ b/doc/qtcreator-screenshots.png diff --git a/doc/qtcreator-select-modules.png b/doc/qtcreator-select-modules.png Binary files differindex b5b2ead006..313934ec97 100644 --- a/doc/qtcreator-select-modules.png +++ b/doc/qtcreator-select-modules.png diff --git a/doc/qtcreator-setting-breakpoint2.png b/doc/qtcreator-setting-breakpoint2.png Binary files differindex 668c46b8a6..056eb29a54 100644 --- a/doc/qtcreator-setting-breakpoint2.png +++ b/doc/qtcreator-setting-breakpoint2.png diff --git a/doc/qtcreator-watcher.png b/doc/qtcreator-watcher.png Binary files differindex 8495e1c678..0e0cde052e 100644 --- a/doc/qtcreator-watcher.png +++ b/doc/qtcreator-watcher.png diff --git a/doc/qtcreator.qch b/doc/qtcreator.qch Binary files differindex 1245104481..2d2985d9cf 100644 --- a/doc/qtcreator.qch +++ b/doc/qtcreator.qch diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc index 04b87584f9..31ef1d571a 100644 --- a/doc/qtcreator.qdoc +++ b/doc/qtcreator.qdoc @@ -1,17 +1,17 @@ /*! \contentspage{index.html}{Qt Creator} \page index.html - \nextpage qtcreator-quick-tour.html + \nextpage creator-quick-tour.html \title Qt Creator Manual - \section1 Version 0.9 - Technical Preview + \section1 Version 0.9.1 (Beta) The goal of Qt Creator is to provide a cross-platform, complete Integrated Development Environment (IDE) to develop Qt projects. It is available for the Linux, Mac OS X and Windows platforms. - \note Qt Creator is currently released as a Technical Preview. It is + \note The current version of Qt Creator is 0.9.1 (Beta). It is possible to edit source code, compile, run and debug applications; other features are still under development. Please send bug reports and suggestions to qt-creator@trolltech.com. To subscribe, send a @@ -20,7 +20,8 @@ \table \row - \o \inlineimage qtcreator.png + \o \inlineimage qtcreator-screenshots.png + \row \o Qt Creator includes a wide range of useful features. Among them are: \list 1 \o \bold{Smart Code Editor}: The code editor provides syntax @@ -54,7 +55,7 @@ \o \l{Debugging with Qt Creator} \o \l{Tips and Tricks} \o \l{Glossary} - \o \l{Known Issues of Version 0.9 (Technical Preview)} + \o \l{Known Issues of Version 0.9.1 (Beta)} \endlist */ @@ -94,8 +95,8 @@ on the left provides different views to navigate between files. \o \gui{Debug Mode} - Provides various ways to inspect the state of the - program while debugging. See \l{qtcreator-debugging}{Debugging With Qt - Creator} for a hands-on description of how to use this mode. + program while debugging. See \l{Debugging With Qt Creator} for a hands-on + description of how to use this mode. \o \gui{Projects Mode} - Lets you configure how projects can be built and executed. Under the list of projects, there are tabs to configure the @@ -170,7 +171,7 @@ interface forms just like you would with the standalone version. The Qt Designer integration also includes project management and code completion. For more information on Qt Designer, you can refer to - \l{The Designer Manual}. + \l{http://doc.trolltech.com/designer-manual.html}{The Designer Manual}. \image qtcreator-formedit.png @@ -284,16 +285,16 @@ \i \inlineimage qtcreator-new-project.png \i \bold{Creating a New Project} - To create a new project, select \gui{New Project} from the \gui{File} menu. - You can create one of the following three projects: + To create a new project, select \gui{New Project} from the \gui{File} menu. + You can create one of the following three projects: - \list - \o Qt4 Console Application - \o Qt4 Gui Application - \o C++ Library - \endlist + \list + \o Qt4 Console Application + \o Qt4 Gui Application + \o C++ Library + \endlist - In this example, we select a \e{Qt4 Gui Application} and click \gui{OK}. + In this example, we select a \e{Qt4 Gui Application} and click \gui{OK}. \row \i \inlineimage qtcreator-intro-and-location.png @@ -318,12 +319,18 @@ \i \inlineimage qtcreator-class-info.png \i \bold{Specifying Class Information} - Lastly, specify the name of the class you would like to create. The + Specify the name of the class you would like to create. The \e{Header file}, \e{Source file} and \e{Form file} fields will update automatically according to your choice of class name. You also have to select the base class for your class, either a - QWidget, QDialog or QMainWindow, from the drop down box. Click + QWidget, QDialog or QMainWindow, from the drop down box. + + \row + \i \inlineimage qtcreator-new-project-summary.png + \i \bold{Creating the Project} + + Finally, review the files that will be created for you. Click \gui{Done} and your project will be generated. \endtable @@ -401,11 +408,18 @@ \image qtcreator-textfinder-ui.png - Design the form above using a QLabel, QLineEdit, QPushButton and a - QTextEdit. We recommend that you use a QGridLayout to lay out the QLabel, - QLineEdit and QPushButton. The QTextEdit can then be added to a - QVBoxLayout, along with the QGridLayout. If you are new to designing forms - with \QD, you can take a look at the + Design the form above using a \l{http://doc.trolltech.com/qlabel.html} + {QLabel}, \l{http://doc.trolltech.com/qlinedit.html}{QLineEdit}, + \l{http://doc.trolltech.com/qpushbutton.html}{QPushButton} and a + \l{http://doc.trolltech.com/qtextedit.html}{QTextEdit}. We recommend that + you use a QGridLayout to lay out the + \l{http://doc.trolltech.com/qlabel.html}{QLabel}, + \l{http://doc.trolltech.com/qlinedit.html}{QLineEdit} and + \l{http://doc.trolltech.com/qpushbutton.html}{QPushButton}. The + \l{http://doc.trolltech.com/qtextedit.html}{QTextEdit} can then be added to + a \l{http://doc.trolltech.com/qvboxlayout.html}{QVBoxLayout}, along with + the \l{http://doc.trolltech.com/qgridlayout.html}{QGridLayout}. If you are + new to designing forms with \QD, you can take a look at the \l{http://doc.trolltech.com/designer-manual.html}{Designer Manual}. \section2 The Header File @@ -414,8 +428,9 @@ constructor, a destructor, and the \c{Ui} object. We need to add a private slot, \c{on_findButton_clicked()}, to carry out our find operation. We also need a private function, \c{loadTextFile()}, to read and display the - contents of our input text file in the QTextEdit. This is done with the - following code: + contents of our input text file in the + \l{http://doc.trolltech.com/qtextedit.html}{QTextEdit}. This is done with + the following code: \code private slots: @@ -449,12 +464,16 @@ } \endcode - Basically, we load a text file using QFile, read it with QTextStream, and - then display it on \c{textEdit} with \l{QTextEdit::}{setPlainText()}. + Basically, we load a text file using + \l{http://doc.trolltech.com/qfile.html}{QFile}, read it with + \l{http://doc.trolltech.com/qtextstream.html}{QTextStream}, and + then display it on \c{textEdit} with + \l{http://doc.trolltech.com/qtextedit.html#plainText-prop}{setPlainText()}. For the \c{on_findButton_clicked()} slot, we extract the search string and - use the \l{QTextEdit::}{find()} function to look for the search string - within the text file. The code snippet below further describes it: + use the \l{http://doc.trolltech.com/qtextedit.html#find}{find()} function + to look for the search string within the text file. The code snippet below + further describes it: \code void TextFinder::on_findButton_clicked() @@ -496,7 +515,14 @@ \image qtcreator-add-resource-wizard.png Enter "textfinder" in the \gui{Name} field and use the given \gui{Path}. - Then, click \gui{Done}. + Then, click \gui{Continue}. + + \image qtcreator-add-resource-wizard2.png + + On this page you can choose to which project you want to add the new file. + Make sure that \gui{Add to Project} is checked and + "TextFinder" is selected as the \gui{Project}, and click + \gui{Done}. Your resource file will now be displayed with the Resource Editor. Click on the \gui{Add} drop down box and select \gui{Add Prefix}. The prefix we @@ -684,7 +710,7 @@ default; the rarely used ones are hidden. To change the default settings, select \gui Debug and then select \gui View. - ####SCREENSHOT + \image qtcreator-debug-view.png Here, you can lock or unlock the location of your views as well as display or hide them. Among the views you can display are \gui Breakpoints, @@ -784,14 +810,13 @@ file name and line number of the corresponding source files. This data is shown in the \gui Stack view. + \image qtcreator-debug-stack.png + Since the call stack leading to the current position may originate or go through code for which no debug information is available, not all stack frames will have corresponding source locations. These frames will be greyed out in the \gui Stack view. - ###SCREENSHOT - - If you click on a frame with a known source location, the text editor will jump to the corresponding location and update the \gui{Locals and Watchers} view, making it seem like the program stopped before entering the function. @@ -895,9 +920,9 @@ \i \bold{Setting a Breakpoint} First, we set a breakpoint on the line where we invoke - \l{QTextEdit::}{setPlainText()} by clicking between the line number and the - window border. Then, select \gui{Start Debugging} from the \gui{Debug} menu - or press \key{F5}. + \l{http://doc.trolltech.com/qtextedit.html#plainText-prop}{setPlainText()} + by clicking between the line number and the window border. Then, select + \gui{Start Debugging} from the \gui{Debug} menu or press \key{F5}. \endtable Breakpoints are visible in the \gui{Breakpoints} view, shown below, in @@ -1131,9 +1156,9 @@ \previouspage creator-keyboard-shortcuts.html \page creator-known-issues.html - \title Known Issues of Version 0.9 (Technical Preview) + \title Known Issues of Version 0.9.1 (Beta) - There are some known issues with the Technical Preview. + There are some known issues with Qt Creator 0.9.1 (Beta). The development team is aware of those, there is no need to report them as bug. \list diff --git a/examples/scripting/demo.js b/examples/scripting/demo.js index 396423b654..b823995fa6 100644 --- a/examples/scripting/demo.js +++ b/examples/scripting/demo.js @@ -1,3 +1,36 @@ +/*************************************************************************** +** +** This file is part of Qt Creator +** +** Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies). +** +** Contact: Qt Software Information (qt-info@nokia.com) +** +** +** Non-Open Source Usage +** +** Licensees may use this file in accordance with the Qt Beta Version +** License Agreement, Agreement version 2.2 provided with the Software or, +** alternatively, in accordance with the terms contained in a written +** agreement between you and Nokia. +** +** GNU General Public License Usage +** +** Alternatively, this file may be used under the terms of the GNU General +** Public License versions 2.0 or 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the packaging +** of this file. Please review the following information to ensure GNU +** General Public Licensing requirements will be met: +** +** http://www.fsf.org/licensing/licenses/info/GPLv2.html and +** http://www.gnu.org/copyleft/gpl.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt GPL Exception +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. +** +***************************************************************************/ + // This script file demos the scripting features // of Qt Creator. // Choose "Run" from the context menu. diff --git a/installer/installer.cpp b/installer/installer.cpp index 8357a6c597..013d26d2b8 100644 --- a/installer/installer.cpp +++ b/installer/installer.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/installer/qinstaller.cpp b/installer/qinstaller.cpp index 9ccaa53850..be72b66b2f 100644 --- a/installer/qinstaller.cpp +++ b/installer/qinstaller.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/installer/qinstaller.h b/installer/qinstaller.h index 0e4672a3f2..ea3a97f8d5 100644 --- a/installer/qinstaller.h +++ b/installer/qinstaller.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/installer/qinstallergui.cpp b/installer/qinstallergui.cpp index 3250052cc9..ca2c6d73c0 100644 --- a/installer/qinstallergui.cpp +++ b/installer/qinstallergui.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/installer/qinstallergui.h b/installer/qinstallergui.h index c176e2e009..ec7db64677 100644 --- a/installer/qinstallergui.h +++ b/installer/qinstallergui.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/cpaster/cgi.cpp b/shared/cpaster/cgi.cpp index 6e8ecd1404..eeeea1ac85 100644 --- a/shared/cpaster/cgi.cpp +++ b/shared/cpaster/cgi.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/cpaster/cgi.h b/shared/cpaster/cgi.h index f459b26715..d1b904348e 100644 --- a/shared/cpaster/cgi.h +++ b/shared/cpaster/cgi.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/cpaster/fetcher.cpp b/shared/cpaster/fetcher.cpp index 56b15907f0..39995d899f 100644 --- a/shared/cpaster/fetcher.cpp +++ b/shared/cpaster/fetcher.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/cpaster/fetcher.h b/shared/cpaster/fetcher.h index 9e998eea59..d188412f76 100644 --- a/shared/cpaster/fetcher.h +++ b/shared/cpaster/fetcher.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/cpaster/poster.cpp b/shared/cpaster/poster.cpp index de8b1fa9f4..5c20cc44c5 100644 --- a/shared/cpaster/poster.cpp +++ b/shared/cpaster/poster.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/cpaster/poster.h b/shared/cpaster/poster.h index 00bc061df9..f60896dbd0 100644 --- a/shared/cpaster/poster.h +++ b/shared/cpaster/poster.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/cpaster/splitter.cpp b/shared/cpaster/splitter.cpp index 22ccf1d990..490108136f 100644 --- a/shared/cpaster/splitter.cpp +++ b/shared/cpaster/splitter.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/cpaster/splitter.h b/shared/cpaster/splitter.h index 491fe27e5c..9b333c19e0 100644 --- a/shared/cpaster/splitter.h +++ b/shared/cpaster/splitter.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/cpaster/view.cpp b/shared/cpaster/view.cpp index 6c37defe36..f1fd664b79 100644 --- a/shared/cpaster/view.cpp +++ b/shared/cpaster/view.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/cpaster/view.h b/shared/cpaster/view.h index 6058f4bc41..f5eb411332 100644 --- a/shared/cpaster/view.h +++ b/shared/cpaster/view.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/cplusplus/AST.cpp b/shared/cplusplus/AST.cpp index d3d6d051a5..248ed13a02 100644 --- a/shared/cplusplus/AST.cpp +++ b/shared/cplusplus/AST.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com> diff --git a/shared/cplusplus/AST.h b/shared/cplusplus/AST.h index 5481aa29e7..fd7cec40de 100644 --- a/shared/cplusplus/AST.h +++ b/shared/cplusplus/AST.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com> diff --git a/shared/cplusplus/ASTVisitor.cpp b/shared/cplusplus/ASTVisitor.cpp index 8a1a5a04cc..9fbf242700 100644 --- a/shared/cplusplus/ASTVisitor.cpp +++ b/shared/cplusplus/ASTVisitor.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com> diff --git a/shared/cplusplus/ASTVisitor.h b/shared/cplusplus/ASTVisitor.h index ae0f12373e..4e1ecaefd8 100644 --- a/shared/cplusplus/ASTVisitor.h +++ b/shared/cplusplus/ASTVisitor.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com> diff --git a/shared/cplusplus/ASTfwd.h b/shared/cplusplus/ASTfwd.h index 525cdd3e0c..14beadfdd0 100644 --- a/shared/cplusplus/ASTfwd.h +++ b/shared/cplusplus/ASTfwd.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com> diff --git a/shared/cplusplus/Array.cpp b/shared/cplusplus/Array.cpp index b04417bf11..e6b9c9f4fe 100644 --- a/shared/cplusplus/Array.cpp +++ b/shared/cplusplus/Array.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/cplusplus/Array.h b/shared/cplusplus/Array.h index a4c9940635..08618fce03 100644 --- a/shared/cplusplus/Array.h +++ b/shared/cplusplus/Array.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com> diff --git a/shared/cplusplus/CPlusPlusForwardDeclarations.h b/shared/cplusplus/CPlusPlusForwardDeclarations.h index d83b9540b7..78f06e647d 100644 --- a/shared/cplusplus/CPlusPlusForwardDeclarations.h +++ b/shared/cplusplus/CPlusPlusForwardDeclarations.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com> diff --git a/shared/cplusplus/CheckDeclaration.cpp b/shared/cplusplus/CheckDeclaration.cpp index 6915faf82c..bb83b6a670 100644 --- a/shared/cplusplus/CheckDeclaration.cpp +++ b/shared/cplusplus/CheckDeclaration.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com> diff --git a/shared/cplusplus/CheckDeclaration.h b/shared/cplusplus/CheckDeclaration.h index ba6b696b0c..6c6148ce6a 100644 --- a/shared/cplusplus/CheckDeclaration.h +++ b/shared/cplusplus/CheckDeclaration.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com> diff --git a/shared/cplusplus/CheckDeclarator.cpp b/shared/cplusplus/CheckDeclarator.cpp index 11ff36584f..d21f14cecf 100644 --- a/shared/cplusplus/CheckDeclarator.cpp +++ b/shared/cplusplus/CheckDeclarator.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com> diff --git a/shared/cplusplus/CheckDeclarator.h b/shared/cplusplus/CheckDeclarator.h index 9626380492..11f14c5e50 100644 --- a/shared/cplusplus/CheckDeclarator.h +++ b/shared/cplusplus/CheckDeclarator.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com> diff --git a/shared/cplusplus/CheckExpression.cpp b/shared/cplusplus/CheckExpression.cpp index 993d44fb45..9976cbf500 100644 --- a/shared/cplusplus/CheckExpression.cpp +++ b/shared/cplusplus/CheckExpression.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com> diff --git a/shared/cplusplus/CheckExpression.h b/shared/cplusplus/CheckExpression.h index 69900f94c2..e018e7dc89 100644 --- a/shared/cplusplus/CheckExpression.h +++ b/shared/cplusplus/CheckExpression.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com> diff --git a/shared/cplusplus/CheckName.cpp b/shared/cplusplus/CheckName.cpp index 30f60f8f80..c2976a9aa3 100644 --- a/shared/cplusplus/CheckName.cpp +++ b/shared/cplusplus/CheckName.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com> diff --git a/shared/cplusplus/CheckName.h b/shared/cplusplus/CheckName.h index b953fdfd16..98caed462d 100644 --- a/shared/cplusplus/CheckName.h +++ b/shared/cplusplus/CheckName.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com> diff --git a/shared/cplusplus/CheckSpecifier.cpp b/shared/cplusplus/CheckSpecifier.cpp index 5fda892900..dabb4f4bd2 100644 --- a/shared/cplusplus/CheckSpecifier.cpp +++ b/shared/cplusplus/CheckSpecifier.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com> diff --git a/shared/cplusplus/CheckSpecifier.h b/shared/cplusplus/CheckSpecifier.h index 0c5a6f92b2..d93c8db480 100644 --- a/shared/cplusplus/CheckSpecifier.h +++ b/shared/cplusplus/CheckSpecifier.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com> diff --git a/shared/cplusplus/CheckStatement.cpp b/shared/cplusplus/CheckStatement.cpp index 7b1530f702..7758bd0381 100644 --- a/shared/cplusplus/CheckStatement.cpp +++ b/shared/cplusplus/CheckStatement.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com> diff --git a/shared/cplusplus/CheckStatement.h b/shared/cplusplus/CheckStatement.h index 1b96c6ded1..a6f02fe391 100644 --- a/shared/cplusplus/CheckStatement.h +++ b/shared/cplusplus/CheckStatement.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com> diff --git a/shared/cplusplus/Control.cpp b/shared/cplusplus/Control.cpp index a486dfdb94..f6b4e229c2 100644 --- a/shared/cplusplus/Control.cpp +++ b/shared/cplusplus/Control.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com> diff --git a/shared/cplusplus/Control.h b/shared/cplusplus/Control.h index bd4b204843..87015c20e8 100644 --- a/shared/cplusplus/Control.h +++ b/shared/cplusplus/Control.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com> diff --git a/shared/cplusplus/CoreTypes.cpp b/shared/cplusplus/CoreTypes.cpp index d2359fc12d..b9184b48d5 100644 --- a/shared/cplusplus/CoreTypes.cpp +++ b/shared/cplusplus/CoreTypes.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com> diff --git a/shared/cplusplus/CoreTypes.h b/shared/cplusplus/CoreTypes.h index ced34f0085..b05bd96e4f 100644 --- a/shared/cplusplus/CoreTypes.h +++ b/shared/cplusplus/CoreTypes.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com> diff --git a/shared/cplusplus/DiagnosticClient.cpp b/shared/cplusplus/DiagnosticClient.cpp index ac35e60e53..32ade8a066 100644 --- a/shared/cplusplus/DiagnosticClient.cpp +++ b/shared/cplusplus/DiagnosticClient.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com> diff --git a/shared/cplusplus/DiagnosticClient.h b/shared/cplusplus/DiagnosticClient.h index aefc566267..de60b120c4 100644 --- a/shared/cplusplus/DiagnosticClient.h +++ b/shared/cplusplus/DiagnosticClient.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com> diff --git a/shared/cplusplus/FullySpecifiedType.cpp b/shared/cplusplus/FullySpecifiedType.cpp index 7d7f97a29a..18b556c009 100644 --- a/shared/cplusplus/FullySpecifiedType.cpp +++ b/shared/cplusplus/FullySpecifiedType.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com> diff --git a/shared/cplusplus/FullySpecifiedType.h b/shared/cplusplus/FullySpecifiedType.h index 802e221522..c484b943ed 100644 --- a/shared/cplusplus/FullySpecifiedType.h +++ b/shared/cplusplus/FullySpecifiedType.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com> diff --git a/shared/cplusplus/Keywords.cpp b/shared/cplusplus/Keywords.cpp index d5ec6b5d43..8cf8dbbd10 100644 --- a/shared/cplusplus/Keywords.cpp +++ b/shared/cplusplus/Keywords.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com> diff --git a/shared/cplusplus/Lexer.cpp b/shared/cplusplus/Lexer.cpp index 2e9ae98c1e..56098d39f2 100644 --- a/shared/cplusplus/Lexer.cpp +++ b/shared/cplusplus/Lexer.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com> diff --git a/shared/cplusplus/Lexer.h b/shared/cplusplus/Lexer.h index 57f9d3e136..d9610849ab 100644 --- a/shared/cplusplus/Lexer.h +++ b/shared/cplusplus/Lexer.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com> diff --git a/shared/cplusplus/LiteralTable.cpp b/shared/cplusplus/LiteralTable.cpp index 226e640039..e448330ef8 100644 --- a/shared/cplusplus/LiteralTable.cpp +++ b/shared/cplusplus/LiteralTable.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/cplusplus/LiteralTable.h b/shared/cplusplus/LiteralTable.h index 097f16185b..23de104dd8 100644 --- a/shared/cplusplus/LiteralTable.h +++ b/shared/cplusplus/LiteralTable.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com> diff --git a/shared/cplusplus/Literals.cpp b/shared/cplusplus/Literals.cpp index ba2184a003..a2d517d8b6 100644 --- a/shared/cplusplus/Literals.cpp +++ b/shared/cplusplus/Literals.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com> diff --git a/shared/cplusplus/Literals.h b/shared/cplusplus/Literals.h index c777063086..53e5c0dbef 100644 --- a/shared/cplusplus/Literals.h +++ b/shared/cplusplus/Literals.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com> diff --git a/shared/cplusplus/MemoryPool.cpp b/shared/cplusplus/MemoryPool.cpp index 45cab6586e..639bb2c616 100644 --- a/shared/cplusplus/MemoryPool.cpp +++ b/shared/cplusplus/MemoryPool.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com> diff --git a/shared/cplusplus/MemoryPool.h b/shared/cplusplus/MemoryPool.h index e71ae2d51c..8d1f09b54e 100644 --- a/shared/cplusplus/MemoryPool.h +++ b/shared/cplusplus/MemoryPool.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com> diff --git a/shared/cplusplus/Name.cpp b/shared/cplusplus/Name.cpp index 18fbd0b126..8fc1d82c01 100644 --- a/shared/cplusplus/Name.cpp +++ b/shared/cplusplus/Name.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com> diff --git a/shared/cplusplus/Name.h b/shared/cplusplus/Name.h index 57936b1c88..ba7a359fae 100644 --- a/shared/cplusplus/Name.h +++ b/shared/cplusplus/Name.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com> diff --git a/shared/cplusplus/NameVisitor.cpp b/shared/cplusplus/NameVisitor.cpp index 8c39490079..8573759be4 100644 --- a/shared/cplusplus/NameVisitor.cpp +++ b/shared/cplusplus/NameVisitor.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com> diff --git a/shared/cplusplus/NameVisitor.h b/shared/cplusplus/NameVisitor.h index f36a73aa94..3f8ece3885 100644 --- a/shared/cplusplus/NameVisitor.h +++ b/shared/cplusplus/NameVisitor.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com> diff --git a/shared/cplusplus/Names.cpp b/shared/cplusplus/Names.cpp index b6d703bfa6..186dfa9e17 100644 --- a/shared/cplusplus/Names.cpp +++ b/shared/cplusplus/Names.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com> diff --git a/shared/cplusplus/Names.h b/shared/cplusplus/Names.h index 88792d91ef..18b21f14d3 100644 --- a/shared/cplusplus/Names.h +++ b/shared/cplusplus/Names.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com> diff --git a/shared/cplusplus/Parser.cpp b/shared/cplusplus/Parser.cpp index 13ca6b2074..549a74ce11 100644 --- a/shared/cplusplus/Parser.cpp +++ b/shared/cplusplus/Parser.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com> diff --git a/shared/cplusplus/Parser.h b/shared/cplusplus/Parser.h index fbaf423b6f..6059aa6837 100644 --- a/shared/cplusplus/Parser.h +++ b/shared/cplusplus/Parser.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com> diff --git a/shared/cplusplus/Scope.cpp b/shared/cplusplus/Scope.cpp index 47221da121..e6a6add9e0 100644 --- a/shared/cplusplus/Scope.cpp +++ b/shared/cplusplus/Scope.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com> diff --git a/shared/cplusplus/Scope.h b/shared/cplusplus/Scope.h index 61f394f20d..8d5dd29c75 100644 --- a/shared/cplusplus/Scope.h +++ b/shared/cplusplus/Scope.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com> diff --git a/shared/cplusplus/Semantic.cpp b/shared/cplusplus/Semantic.cpp index 4f2ab18cbd..79da36b891 100644 --- a/shared/cplusplus/Semantic.cpp +++ b/shared/cplusplus/Semantic.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com> diff --git a/shared/cplusplus/Semantic.h b/shared/cplusplus/Semantic.h index 10d80276d9..113b373024 100644 --- a/shared/cplusplus/Semantic.h +++ b/shared/cplusplus/Semantic.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com> diff --git a/shared/cplusplus/SemanticCheck.cpp b/shared/cplusplus/SemanticCheck.cpp index 6c829ad62d..979c7f69a3 100644 --- a/shared/cplusplus/SemanticCheck.cpp +++ b/shared/cplusplus/SemanticCheck.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com> diff --git a/shared/cplusplus/SemanticCheck.h b/shared/cplusplus/SemanticCheck.h index a03c40e20d..453e517b2a 100644 --- a/shared/cplusplus/SemanticCheck.h +++ b/shared/cplusplus/SemanticCheck.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com> diff --git a/shared/cplusplus/Symbol.cpp b/shared/cplusplus/Symbol.cpp index 97abf77354..5d392f3826 100644 --- a/shared/cplusplus/Symbol.cpp +++ b/shared/cplusplus/Symbol.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com> diff --git a/shared/cplusplus/Symbol.h b/shared/cplusplus/Symbol.h index 1221f374eb..fe274339a5 100644 --- a/shared/cplusplus/Symbol.h +++ b/shared/cplusplus/Symbol.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com> diff --git a/shared/cplusplus/SymbolVisitor.cpp b/shared/cplusplus/SymbolVisitor.cpp index cc110f7c1e..6a06617596 100644 --- a/shared/cplusplus/SymbolVisitor.cpp +++ b/shared/cplusplus/SymbolVisitor.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com> diff --git a/shared/cplusplus/SymbolVisitor.h b/shared/cplusplus/SymbolVisitor.h index 04b56df414..a09924d017 100644 --- a/shared/cplusplus/SymbolVisitor.h +++ b/shared/cplusplus/SymbolVisitor.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com> diff --git a/shared/cplusplus/Symbols.cpp b/shared/cplusplus/Symbols.cpp index 7e7e148b18..7dd497426d 100644 --- a/shared/cplusplus/Symbols.cpp +++ b/shared/cplusplus/Symbols.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com> diff --git a/shared/cplusplus/Symbols.h b/shared/cplusplus/Symbols.h index 9d43c6b235..3bedf3e888 100644 --- a/shared/cplusplus/Symbols.h +++ b/shared/cplusplus/Symbols.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com> diff --git a/shared/cplusplus/Token.cpp b/shared/cplusplus/Token.cpp index 40dfb9efab..c21c7b4681 100644 --- a/shared/cplusplus/Token.cpp +++ b/shared/cplusplus/Token.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com> diff --git a/shared/cplusplus/Token.h b/shared/cplusplus/Token.h index f017bbc8e7..826f724d2c 100644 --- a/shared/cplusplus/Token.h +++ b/shared/cplusplus/Token.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com> diff --git a/shared/cplusplus/TranslationUnit.cpp b/shared/cplusplus/TranslationUnit.cpp index bc4d219e0f..c64bbf52c1 100644 --- a/shared/cplusplus/TranslationUnit.cpp +++ b/shared/cplusplus/TranslationUnit.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com> diff --git a/shared/cplusplus/TranslationUnit.h b/shared/cplusplus/TranslationUnit.h index ae6b911aee..9e71b1a8ee 100644 --- a/shared/cplusplus/TranslationUnit.h +++ b/shared/cplusplus/TranslationUnit.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com> diff --git a/shared/cplusplus/Type.cpp b/shared/cplusplus/Type.cpp index a58f855f68..e5d70e088a 100644 --- a/shared/cplusplus/Type.cpp +++ b/shared/cplusplus/Type.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com> diff --git a/shared/cplusplus/Type.h b/shared/cplusplus/Type.h index 1623ee5605..e6d360bc4f 100644 --- a/shared/cplusplus/Type.h +++ b/shared/cplusplus/Type.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com> diff --git a/shared/cplusplus/TypeVisitor.cpp b/shared/cplusplus/TypeVisitor.cpp index 0271025638..1428addedc 100644 --- a/shared/cplusplus/TypeVisitor.cpp +++ b/shared/cplusplus/TypeVisitor.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com> diff --git a/shared/cplusplus/TypeVisitor.h b/shared/cplusplus/TypeVisitor.h index 6fa8f4f1af..2bd6fb15c9 100644 --- a/shared/cplusplus/TypeVisitor.h +++ b/shared/cplusplus/TypeVisitor.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com> diff --git a/shared/designerintegrationv2/formresizer.cpp b/shared/designerintegrationv2/formresizer.cpp index 156b8e718a..3b9644fbca 100644 --- a/shared/designerintegrationv2/formresizer.cpp +++ b/shared/designerintegrationv2/formresizer.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/designerintegrationv2/formresizer.h b/shared/designerintegrationv2/formresizer.h index 912e7ab169..c88619b804 100644 --- a/shared/designerintegrationv2/formresizer.h +++ b/shared/designerintegrationv2/formresizer.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ #ifndef FORMRESIZER_H diff --git a/shared/designerintegrationv2/sizehandlerect.cpp b/shared/designerintegrationv2/sizehandlerect.cpp index 0061d9671b..f5c67a47e6 100644 --- a/shared/designerintegrationv2/sizehandlerect.cpp +++ b/shared/designerintegrationv2/sizehandlerect.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ #include "sizehandlerect.h" diff --git a/shared/designerintegrationv2/sizehandlerect.h b/shared/designerintegrationv2/sizehandlerect.h index cbcc5b0777..2438781227 100644 --- a/shared/designerintegrationv2/sizehandlerect.h +++ b/shared/designerintegrationv2/sizehandlerect.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ #ifndef SIZEHANDLERECT_H diff --git a/shared/designerintegrationv2/widgethost.cpp b/shared/designerintegrationv2/widgethost.cpp index 763b101d4e..cdda8e3a1a 100644 --- a/shared/designerintegrationv2/widgethost.cpp +++ b/shared/designerintegrationv2/widgethost.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/designerintegrationv2/widgethost.h b/shared/designerintegrationv2/widgethost.h index 1284707e4d..8aaf1d781d 100644 --- a/shared/designerintegrationv2/widgethost.h +++ b/shared/designerintegrationv2/widgethost.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/designerintegrationv2/widgethostconstants.h b/shared/designerintegrationv2/widgethostconstants.h index cfd3a4ac51..e71b3a2dd1 100644 --- a/shared/designerintegrationv2/widgethostconstants.h +++ b/shared/designerintegrationv2/widgethostconstants.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/help/bookmarkmanager.cpp b/shared/help/bookmarkmanager.cpp index 2664fea2e0..bb223eb206 100644 --- a/shared/help/bookmarkmanager.cpp +++ b/shared/help/bookmarkmanager.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/help/bookmarkmanager.h b/shared/help/bookmarkmanager.h index c40d8672db..892c74b77c 100644 --- a/shared/help/bookmarkmanager.h +++ b/shared/help/bookmarkmanager.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/help/contentwindow.cpp b/shared/help/contentwindow.cpp index 37f258228a..768a1223ed 100644 --- a/shared/help/contentwindow.cpp +++ b/shared/help/contentwindow.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/help/contentwindow.h b/shared/help/contentwindow.h index 22e519d49b..bbd4a26a3d 100644 --- a/shared/help/contentwindow.h +++ b/shared/help/contentwindow.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/help/filternamedialog.cpp b/shared/help/filternamedialog.cpp index a2c0eff903..197bf290f7 100644 --- a/shared/help/filternamedialog.cpp +++ b/shared/help/filternamedialog.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/help/filternamedialog.h b/shared/help/filternamedialog.h index 41bcf17dca..f5b9027989 100644 --- a/shared/help/filternamedialog.h +++ b/shared/help/filternamedialog.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/help/helpviewer.cpp b/shared/help/helpviewer.cpp index 9b80e99cd8..59c6df629a 100644 --- a/shared/help/helpviewer.cpp +++ b/shared/help/helpviewer.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/help/helpviewer.h b/shared/help/helpviewer.h index 925cfdd81c..75659da563 100644 --- a/shared/help/helpviewer.h +++ b/shared/help/helpviewer.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/help/indexwindow.cpp b/shared/help/indexwindow.cpp index 6c72d75c6c..3879dfc8c2 100644 --- a/shared/help/indexwindow.cpp +++ b/shared/help/indexwindow.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/help/indexwindow.h b/shared/help/indexwindow.h index 51ebb06653..7f9ddff099 100644 --- a/shared/help/indexwindow.h +++ b/shared/help/indexwindow.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/help/topicchooser.cpp b/shared/help/topicchooser.cpp index e5fa5ba9e7..31b8d52c05 100644 --- a/shared/help/topicchooser.cpp +++ b/shared/help/topicchooser.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/help/topicchooser.h b/shared/help/topicchooser.h index 2c21ac5206..e29a9aae7e 100644 --- a/shared/help/topicchooser.h +++ b/shared/help/topicchooser.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/indenter/constants.cpp b/shared/indenter/constants.cpp index 120ebdccb2..76f2f3f1d9 100644 --- a/shared/indenter/constants.cpp +++ b/shared/indenter/constants.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/indenter/indenter.h b/shared/indenter/indenter.h index 0f4be06340..ea078a2c80 100644 --- a/shared/indenter/indenter.h +++ b/shared/indenter/indenter.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/indenter/indenter_impl.h b/shared/indenter/indenter_impl.h index e71e55881e..135cbc4109 100644 --- a/shared/indenter/indenter_impl.h +++ b/shared/indenter/indenter_impl.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/indenter/test/main.cpp b/shared/indenter/test/main.cpp index e9c9396197..26ffbdc4e3 100644 --- a/shared/indenter/test/main.cpp +++ b/shared/indenter/test/main.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/namespace_global.h b/shared/namespace_global.h index 4452eb88c3..1eb8fed086 100644 --- a/shared/namespace_global.h +++ b/shared/namespace_global.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/proparser/abstractproitemvisitor.h b/shared/proparser/abstractproitemvisitor.h index 45dede34eb..340e7a00b5 100644 --- a/shared/proparser/abstractproitemvisitor.h +++ b/shared/proparser/abstractproitemvisitor.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/proparser/procommandmanager.cpp b/shared/proparser/procommandmanager.cpp index 99fc302563..b5ae09e036 100644 --- a/shared/proparser/procommandmanager.cpp +++ b/shared/proparser/procommandmanager.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/proparser/procommandmanager.h b/shared/proparser/procommandmanager.h index 94c2969329..5d0dbb9378 100644 --- a/shared/proparser/procommandmanager.h +++ b/shared/proparser/procommandmanager.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/proparser/proeditor.cpp b/shared/proparser/proeditor.cpp index 93adb12493..63215a9f29 100644 --- a/shared/proparser/proeditor.cpp +++ b/shared/proparser/proeditor.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/proparser/proeditor.h b/shared/proparser/proeditor.h index 6dbab2048d..bef371c27b 100644 --- a/shared/proparser/proeditor.h +++ b/shared/proparser/proeditor.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/proparser/proeditormodel.cpp b/shared/proparser/proeditormodel.cpp index a929c7ab88..7708c991ea 100644 --- a/shared/proparser/proeditormodel.cpp +++ b/shared/proparser/proeditormodel.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/proparser/proeditormodel.h b/shared/proparser/proeditormodel.h index 74b8bdaae8..ab5bafae13 100644 --- a/shared/proparser/proeditormodel.h +++ b/shared/proparser/proeditormodel.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/proparser/profileevaluator.cpp b/shared/proparser/profileevaluator.cpp index ba7a31d6e0..b7c296420a 100644 --- a/shared/proparser/profileevaluator.cpp +++ b/shared/proparser/profileevaluator.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/proparser/profileevaluator.h b/shared/proparser/profileevaluator.h index 83ba9361eb..1480542160 100644 --- a/shared/proparser/profileevaluator.h +++ b/shared/proparser/profileevaluator.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/proparser/proiteminfo.cpp b/shared/proparser/proiteminfo.cpp index 63ac6bd1d8..5905acfb0a 100644 --- a/shared/proparser/proiteminfo.cpp +++ b/shared/proparser/proiteminfo.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/proparser/proiteminfo.h b/shared/proparser/proiteminfo.h index 70c1411781..9d7e1bac8a 100644 --- a/shared/proparser/proiteminfo.h +++ b/shared/proparser/proiteminfo.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/proparser/proitems.cpp b/shared/proparser/proitems.cpp index 02a9a796c2..346517c0f0 100644 --- a/shared/proparser/proitems.cpp +++ b/shared/proparser/proitems.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/proparser/proitems.h b/shared/proparser/proitems.h index 852a247cc9..a3736086e7 100644 --- a/shared/proparser/proitems.h +++ b/shared/proparser/proitems.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/proparser/proparserutils.h b/shared/proparser/proparserutils.h index 4c457eebd5..daab115a44 100644 --- a/shared/proparser/proparserutils.h +++ b/shared/proparser/proparserutils.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/proparser/prowriter.cpp b/shared/proparser/prowriter.cpp index 98787294ce..e1e28eb4c5 100644 --- a/shared/proparser/prowriter.cpp +++ b/shared/proparser/prowriter.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/proparser/prowriter.h b/shared/proparser/prowriter.h index 8cfa319511..664ab6db15 100644 --- a/shared/proparser/prowriter.h +++ b/shared/proparser/prowriter.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/proparser/proxml.cpp b/shared/proparser/proxml.cpp index 2416b3f6bc..f3d1edb31a 100644 --- a/shared/proparser/proxml.cpp +++ b/shared/proparser/proxml.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/proparser/proxml.h b/shared/proparser/proxml.h index 276fd684aa..059d90f7e9 100644 --- a/shared/proparser/proxml.h +++ b/shared/proparser/proxml.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/proparser/valueeditor.cpp b/shared/proparser/valueeditor.cpp index 638d7994a9..aafbddbf73 100644 --- a/shared/proparser/valueeditor.cpp +++ b/shared/proparser/valueeditor.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/proparser/valueeditor.h b/shared/proparser/valueeditor.h index d4ca360cdd..f3fd2f9c87 100644 --- a/shared/proparser/valueeditor.h +++ b/shared/proparser/valueeditor.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/qrceditor/qrceditor.cpp b/shared/qrceditor/qrceditor.cpp index 576615a2e3..741ac12f63 100644 --- a/shared/qrceditor/qrceditor.cpp +++ b/shared/qrceditor/qrceditor.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/qrceditor/qrceditor.h b/shared/qrceditor/qrceditor.h index db9aab9bfe..3c4f3a2497 100644 --- a/shared/qrceditor/qrceditor.h +++ b/shared/qrceditor/qrceditor.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ #ifndef QRCEDITOR_H diff --git a/shared/qrceditor/resourcefile.cpp b/shared/qrceditor/resourcefile.cpp index f394f43f41..141e9e6d4b 100644 --- a/shared/qrceditor/resourcefile.cpp +++ b/shared/qrceditor/resourcefile.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/qrceditor/resourcefile_p.h b/shared/qrceditor/resourcefile_p.h index 6643be39ab..d5046e1ed8 100644 --- a/shared/qrceditor/resourcefile_p.h +++ b/shared/qrceditor/resourcefile_p.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/qrceditor/resourceview.cpp b/shared/qrceditor/resourceview.cpp index d0d3a9d11c..8af6a7a9e2 100644 --- a/shared/qrceditor/resourceview.cpp +++ b/shared/qrceditor/resourceview.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/qrceditor/resourceview.h b/shared/qrceditor/resourceview.h index ebf0b7b94c..e3ac2f1c4e 100644 --- a/shared/qrceditor/resourceview.h +++ b/shared/qrceditor/resourceview.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/qrceditor/test/main.cpp b/shared/qrceditor/test/main.cpp index 71d316aebb..01fb1f9e7d 100644 --- a/shared/qrceditor/test/main.cpp +++ b/shared/qrceditor/test/main.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/qrceditor/test/mainwindow.cpp b/shared/qrceditor/test/mainwindow.cpp index e73635fceb..e737efc52e 100644 --- a/shared/qrceditor/test/mainwindow.cpp +++ b/shared/qrceditor/test/mainwindow.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/qrceditor/test/mainwindow.h b/shared/qrceditor/test/mainwindow.h index 80b31a7896..cb33eebab8 100644 --- a/shared/qrceditor/test/mainwindow.h +++ b/shared/qrceditor/test/mainwindow.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/qrceditor/undocommands.cpp b/shared/qrceditor/undocommands.cpp index 246b69c0d7..fb9d581d23 100644 --- a/shared/qrceditor/undocommands.cpp +++ b/shared/qrceditor/undocommands.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/qrceditor/undocommands_p.h b/shared/qrceditor/undocommands_p.h index b9f6dc7aca..5e277f59e8 100644 --- a/shared/qrceditor/undocommands_p.h +++ b/shared/qrceditor/undocommands_p.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/qscripthighlighter/qscripthighlighter.cpp b/shared/qscripthighlighter/qscripthighlighter.cpp index f9940a6bbe..776d9ca743 100644 --- a/shared/qscripthighlighter/qscripthighlighter.cpp +++ b/shared/qscripthighlighter/qscripthighlighter.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/qscripthighlighter/qscripthighlighter.h b/shared/qscripthighlighter/qscripthighlighter.h index 353b7506c8..bdb59ec49f 100644 --- a/shared/qscripthighlighter/qscripthighlighter.h +++ b/shared/qscripthighlighter/qscripthighlighter.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/qscripthighlighter/test/main.cpp b/shared/qscripthighlighter/test/main.cpp index 6bac143208..cf914d0d59 100644 --- a/shared/qscripthighlighter/test/main.cpp +++ b/shared/qscripthighlighter/test/main.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/qtextended_integration.h b/shared/qtextended_integration.h index 1a465ae4cb..f02012c23d 100644 --- a/shared/qtextended_integration.h +++ b/shared/qtextended_integration.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/qtlockedfile/qtlockedfile.cpp b/shared/qtlockedfile/qtlockedfile.cpp index 71da391d7e..a530f72f38 100644 --- a/shared/qtlockedfile/qtlockedfile.cpp +++ b/shared/qtlockedfile/qtlockedfile.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/qtlockedfile/qtlockedfile.h b/shared/qtlockedfile/qtlockedfile.h index f23475ed93..8dfbbb14c2 100644 --- a/shared/qtlockedfile/qtlockedfile.h +++ b/shared/qtlockedfile/qtlockedfile.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/qtlockedfile/qtlockedfile_unix.cpp b/shared/qtlockedfile/qtlockedfile_unix.cpp index 665d39295f..499198053b 100644 --- a/shared/qtlockedfile/qtlockedfile_unix.cpp +++ b/shared/qtlockedfile/qtlockedfile_unix.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/qtlockedfile/qtlockedfile_win.cpp b/shared/qtlockedfile/qtlockedfile_win.cpp index 4909e9636f..cc156b0364 100644 --- a/shared/qtlockedfile/qtlockedfile_win.cpp +++ b/shared/qtlockedfile/qtlockedfile_win.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/qtsingleapplication/qtlocalpeer.cpp b/shared/qtsingleapplication/qtlocalpeer.cpp index 1e324106ad..dbc6d3a683 100644 --- a/shared/qtsingleapplication/qtlocalpeer.cpp +++ b/shared/qtsingleapplication/qtlocalpeer.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/qtsingleapplication/qtlocalpeer.h b/shared/qtsingleapplication/qtlocalpeer.h index 104586b439..b0d78005c9 100644 --- a/shared/qtsingleapplication/qtlocalpeer.h +++ b/shared/qtsingleapplication/qtlocalpeer.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/qtsingleapplication/qtsingleapplication.cpp b/shared/qtsingleapplication/qtsingleapplication.cpp index c1f557bacf..90bd9cd35e 100644 --- a/shared/qtsingleapplication/qtsingleapplication.cpp +++ b/shared/qtsingleapplication/qtsingleapplication.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/qtsingleapplication/qtsingleapplication.h b/shared/qtsingleapplication/qtsingleapplication.h index 75ce5ff530..f3a41c044b 100644 --- a/shared/qtsingleapplication/qtsingleapplication.h +++ b/shared/qtsingleapplication/qtsingleapplication.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/qtsingleapplication/qtsinglecoreapplication.cpp b/shared/qtsingleapplication/qtsinglecoreapplication.cpp index 82526226ba..1bb8d14f48 100644 --- a/shared/qtsingleapplication/qtsinglecoreapplication.cpp +++ b/shared/qtsingleapplication/qtsinglecoreapplication.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/qtsingleapplication/qtsinglecoreapplication.h b/shared/qtsingleapplication/qtsinglecoreapplication.h index fcf9c7a224..9b712fe620 100644 --- a/shared/qtsingleapplication/qtsinglecoreapplication.h +++ b/shared/qtsingleapplication/qtsinglecoreapplication.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/scriptwrapper/interface_wrap_helpers.h b/shared/scriptwrapper/interface_wrap_helpers.h index 717bb72463..e8dadffb99 100644 --- a/shared/scriptwrapper/interface_wrap_helpers.h +++ b/shared/scriptwrapper/interface_wrap_helpers.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/shared/scriptwrapper/wrap_helpers.h b/shared/scriptwrapper/wrap_helpers.h index 02db144a3e..cb697b1f23 100644 --- a/shared/scriptwrapper/wrap_helpers.h +++ b/shared/scriptwrapper/wrap_helpers.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/app/app.pro b/src/app/app.pro index ab9f20fdd5..a0e120da1c 100644 --- a/src/app/app.pro +++ b/src/app/app.pro @@ -13,13 +13,16 @@ win32 { } linux-* { LIBS *= -lExtensionSystem -lAggregation - QMAKE_FLAGS+=-Wl,--enable-new-dtags + ISGCC33=$$(GCC33) + !equals(ISGCC33, 1):QT += svg dbus + } TEMPLATE = app TARGET = $$IDE_APP_TARGET DESTDIR = ../../bin + SOURCES += main.cpp macx { diff --git a/src/app/main.cpp b/src/app/main.cpp index b8d4b9d4b4..f11e81764d 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/aggregation/aggregate.cpp b/src/libs/aggregation/aggregate.cpp index de1a366f5e..6fd7414dfc 100644 --- a/src/libs/aggregation/aggregate.cpp +++ b/src/libs/aggregation/aggregate.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/aggregation/aggregate.h b/src/libs/aggregation/aggregate.h index dc30ebf35c..98b1693dd5 100644 --- a/src/libs/aggregation/aggregate.h +++ b/src/libs/aggregation/aggregate.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/aggregation/aggregation_global.h b/src/libs/aggregation/aggregation_global.h index 09dc064394..324a249395 100644 --- a/src/libs/aggregation/aggregation_global.h +++ b/src/libs/aggregation/aggregation_global.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/aggregation/examples/text/main.cpp b/src/libs/aggregation/examples/text/main.cpp index 0d5a09f6e8..87bfe784e2 100644 --- a/src/libs/aggregation/examples/text/main.cpp +++ b/src/libs/aggregation/examples/text/main.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/aggregation/examples/text/main.h b/src/libs/aggregation/examples/text/main.h index ad766013cc..69e6f1caf8 100644 --- a/src/libs/aggregation/examples/text/main.h +++ b/src/libs/aggregation/examples/text/main.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/aggregation/examples/text/myinterfaces.h b/src/libs/aggregation/examples/text/myinterfaces.h index 4c994f3ee1..78c78f05e1 100644 --- a/src/libs/aggregation/examples/text/myinterfaces.h +++ b/src/libs/aggregation/examples/text/myinterfaces.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/aggregation/test/tst_aggregate.cpp b/src/libs/aggregation/test/tst_aggregate.cpp index 04b32fc8ea..1a26dc0125 100644 --- a/src/libs/aggregation/test/tst_aggregate.cpp +++ b/src/libs/aggregation/test/tst_aggregate.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/cplusplus/CppDocument.cpp b/src/libs/cplusplus/CppDocument.cpp index d670e7e001..453f3367af 100644 --- a/src/libs/cplusplus/CppDocument.cpp +++ b/src/libs/cplusplus/CppDocument.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/cplusplus/CppDocument.h b/src/libs/cplusplus/CppDocument.h index 54de3c801e..57efe4fe33 100644 --- a/src/libs/cplusplus/CppDocument.h +++ b/src/libs/cplusplus/CppDocument.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/cplusplus/ExpressionUnderCursor.cpp b/src/libs/cplusplus/ExpressionUnderCursor.cpp index d43283cd7a..d55a19e885 100644 --- a/src/libs/cplusplus/ExpressionUnderCursor.cpp +++ b/src/libs/cplusplus/ExpressionUnderCursor.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/cplusplus/ExpressionUnderCursor.h b/src/libs/cplusplus/ExpressionUnderCursor.h index 8d66cd8166..c979c103e2 100644 --- a/src/libs/cplusplus/ExpressionUnderCursor.h +++ b/src/libs/cplusplus/ExpressionUnderCursor.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/cplusplus/Icons.cpp b/src/libs/cplusplus/Icons.cpp index 3b7ee24da3..447db104bc 100644 --- a/src/libs/cplusplus/Icons.cpp +++ b/src/libs/cplusplus/Icons.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/cplusplus/Icons.h b/src/libs/cplusplus/Icons.h index 6d4e0bb25d..eb31a07dcf 100644 --- a/src/libs/cplusplus/Icons.h +++ b/src/libs/cplusplus/Icons.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/cplusplus/LookupContext.cpp b/src/libs/cplusplus/LookupContext.cpp index 8b24b59f5e..cbf6b1ef66 100644 --- a/src/libs/cplusplus/LookupContext.cpp +++ b/src/libs/cplusplus/LookupContext.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/cplusplus/LookupContext.h b/src/libs/cplusplus/LookupContext.h index 18754bf667..e1aec69d12 100644 --- a/src/libs/cplusplus/LookupContext.h +++ b/src/libs/cplusplus/LookupContext.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/cplusplus/NameOfExpression.cpp b/src/libs/cplusplus/NameOfExpression.cpp index ac00aa27b8..12690881bf 100644 --- a/src/libs/cplusplus/NameOfExpression.cpp +++ b/src/libs/cplusplus/NameOfExpression.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/cplusplus/NameOfExpression.h b/src/libs/cplusplus/NameOfExpression.h index 0333cc4dfb..3aec6a5430 100644 --- a/src/libs/cplusplus/NameOfExpression.h +++ b/src/libs/cplusplus/NameOfExpression.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/cplusplus/NamePrettyPrinter.cpp b/src/libs/cplusplus/NamePrettyPrinter.cpp index 08fe4f2416..50f12b5d97 100644 --- a/src/libs/cplusplus/NamePrettyPrinter.cpp +++ b/src/libs/cplusplus/NamePrettyPrinter.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/cplusplus/NamePrettyPrinter.h b/src/libs/cplusplus/NamePrettyPrinter.h index d072b0b307..fea6e07967 100644 --- a/src/libs/cplusplus/NamePrettyPrinter.h +++ b/src/libs/cplusplus/NamePrettyPrinter.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/cplusplus/Overview.cpp b/src/libs/cplusplus/Overview.cpp index d887bc95f8..e394415dad 100644 --- a/src/libs/cplusplus/Overview.cpp +++ b/src/libs/cplusplus/Overview.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/cplusplus/Overview.h b/src/libs/cplusplus/Overview.h index f68fb0f6cc..6a4bcdc237 100644 --- a/src/libs/cplusplus/Overview.h +++ b/src/libs/cplusplus/Overview.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/cplusplus/OverviewModel.cpp b/src/libs/cplusplus/OverviewModel.cpp index b1b7267027..92b20d9f73 100644 --- a/src/libs/cplusplus/OverviewModel.cpp +++ b/src/libs/cplusplus/OverviewModel.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/cplusplus/OverviewModel.h b/src/libs/cplusplus/OverviewModel.h index e56473300a..124382e80a 100644 --- a/src/libs/cplusplus/OverviewModel.h +++ b/src/libs/cplusplus/OverviewModel.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/cplusplus/ResolveExpression.cpp b/src/libs/cplusplus/ResolveExpression.cpp index 0ea9018a35..7ce0e42c69 100644 --- a/src/libs/cplusplus/ResolveExpression.cpp +++ b/src/libs/cplusplus/ResolveExpression.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/cplusplus/ResolveExpression.h b/src/libs/cplusplus/ResolveExpression.h index 00f0f07485..ac4a675b45 100644 --- a/src/libs/cplusplus/ResolveExpression.h +++ b/src/libs/cplusplus/ResolveExpression.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/cplusplus/SimpleLexer.cpp b/src/libs/cplusplus/SimpleLexer.cpp index 8b7ee01d7a..4c2a783036 100644 --- a/src/libs/cplusplus/SimpleLexer.cpp +++ b/src/libs/cplusplus/SimpleLexer.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/cplusplus/SimpleLexer.h b/src/libs/cplusplus/SimpleLexer.h index 5296471334..b4889fc92e 100644 --- a/src/libs/cplusplus/SimpleLexer.h +++ b/src/libs/cplusplus/SimpleLexer.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ #ifndef SIMPLELEXER_H diff --git a/src/libs/cplusplus/TokenUnderCursor.cpp b/src/libs/cplusplus/TokenUnderCursor.cpp index 216caebb11..af0a72284e 100644 --- a/src/libs/cplusplus/TokenUnderCursor.cpp +++ b/src/libs/cplusplus/TokenUnderCursor.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/cplusplus/TokenUnderCursor.h b/src/libs/cplusplus/TokenUnderCursor.h index c94af4f96f..6863832919 100644 --- a/src/libs/cplusplus/TokenUnderCursor.h +++ b/src/libs/cplusplus/TokenUnderCursor.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ #ifndef TOKENUNDERCURSOR_H diff --git a/src/libs/cplusplus/TypeOfExpression.cpp b/src/libs/cplusplus/TypeOfExpression.cpp index cb373cce02..ba088a056e 100644 --- a/src/libs/cplusplus/TypeOfExpression.cpp +++ b/src/libs/cplusplus/TypeOfExpression.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/cplusplus/TypeOfExpression.h b/src/libs/cplusplus/TypeOfExpression.h index 87d4113f30..34ad0943e4 100644 --- a/src/libs/cplusplus/TypeOfExpression.h +++ b/src/libs/cplusplus/TypeOfExpression.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ #ifndef CPLUSPLUS_TYPEOFEXPRESSION_H diff --git a/src/libs/cplusplus/TypePrettyPrinter.cpp b/src/libs/cplusplus/TypePrettyPrinter.cpp index 435f308dce..f772757230 100644 --- a/src/libs/cplusplus/TypePrettyPrinter.cpp +++ b/src/libs/cplusplus/TypePrettyPrinter.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/cplusplus/TypePrettyPrinter.h b/src/libs/cplusplus/TypePrettyPrinter.h index 5d46ec5638..e80b1d435a 100644 --- a/src/libs/cplusplus/TypePrettyPrinter.h +++ b/src/libs/cplusplus/TypePrettyPrinter.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ #ifndef TYPEPRETTYPRINTER_H diff --git a/src/libs/cplusplus/cplusplus.pro b/src/libs/cplusplus/cplusplus.pro index 49d78fda8b..35ec8a070b 100644 --- a/src/libs/cplusplus/cplusplus.pro +++ b/src/libs/cplusplus/cplusplus.pro @@ -24,7 +24,6 @@ HEADERS += \ LookupContext.h \ pp-cctype.h \ pp-engine.h \ - pp-fwd.h \ pp-macro-expander.h \ pp-scanner.h \ pp-client.h \ diff --git a/src/libs/cplusplus/pp-cctype.h b/src/libs/cplusplus/pp-cctype.h index b7558ae505..532f56a7e1 100644 --- a/src/libs/cplusplus/pp-cctype.h +++ b/src/libs/cplusplus/pp-cctype.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ /* diff --git a/src/libs/cplusplus/pp-client.h b/src/libs/cplusplus/pp-client.h index eead5bf460..e866be4aa8 100644 --- a/src/libs/cplusplus/pp-client.h +++ b/src/libs/cplusplus/pp-client.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/cplusplus/pp-engine.cpp b/src/libs/cplusplus/pp-engine.cpp index c33fc8cb15..0ed09f224d 100644 --- a/src/libs/cplusplus/pp-engine.cpp +++ b/src/libs/cplusplus/pp-engine.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ /* diff --git a/src/libs/cplusplus/pp-engine.h b/src/libs/cplusplus/pp-engine.h index c909ffab3a..e7c0af68fb 100644 --- a/src/libs/cplusplus/pp-engine.h +++ b/src/libs/cplusplus/pp-engine.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ /* diff --git a/src/libs/cplusplus/pp-environment.cpp b/src/libs/cplusplus/pp-environment.cpp index dd839087a4..60827d4b9b 100644 --- a/src/libs/cplusplus/pp-environment.cpp +++ b/src/libs/cplusplus/pp-environment.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ /* diff --git a/src/libs/cplusplus/pp-environment.h b/src/libs/cplusplus/pp-environment.h index 4200b5ea0f..4ba6b9353c 100644 --- a/src/libs/cplusplus/pp-environment.h +++ b/src/libs/cplusplus/pp-environment.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ /* diff --git a/src/libs/cplusplus/pp-fwd.h b/src/libs/cplusplus/pp-fwd.h deleted file mode 100644 index e69de29bb2..0000000000 --- a/src/libs/cplusplus/pp-fwd.h +++ /dev/null diff --git a/src/libs/cplusplus/pp-internal.h b/src/libs/cplusplus/pp-internal.h index c11de37453..f3b8aef835 100644 --- a/src/libs/cplusplus/pp-internal.h +++ b/src/libs/cplusplus/pp-internal.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ /* diff --git a/src/libs/cplusplus/pp-macro-expander.cpp b/src/libs/cplusplus/pp-macro-expander.cpp index e17dd873db..21148d2446 100644 --- a/src/libs/cplusplus/pp-macro-expander.cpp +++ b/src/libs/cplusplus/pp-macro-expander.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/cplusplus/pp-macro-expander.h b/src/libs/cplusplus/pp-macro-expander.h index c2f636c138..2959977bb1 100644 --- a/src/libs/cplusplus/pp-macro-expander.h +++ b/src/libs/cplusplus/pp-macro-expander.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ /* diff --git a/src/libs/cplusplus/pp-macro.h b/src/libs/cplusplus/pp-macro.h index 887fff53b0..9f5e32752c 100644 --- a/src/libs/cplusplus/pp-macro.h +++ b/src/libs/cplusplus/pp-macro.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ /* diff --git a/src/libs/cplusplus/pp-scanner.h b/src/libs/cplusplus/pp-scanner.h index 85b65403b0..c2e768912f 100644 --- a/src/libs/cplusplus/pp-scanner.h +++ b/src/libs/cplusplus/pp-scanner.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ /* diff --git a/src/libs/cplusplus/pp.h b/src/libs/cplusplus/pp.h index 62f3245a28..2dee3e87f1 100644 --- a/src/libs/cplusplus/pp.h +++ b/src/libs/cplusplus/pp.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ /* diff --git a/src/libs/extensionsystem/ExtensionSystemInterfaces b/src/libs/extensionsystem/ExtensionSystemInterfaces index 527148af8e..db175b4050 100644 --- a/src/libs/extensionsystem/ExtensionSystemInterfaces +++ b/src/libs/extensionsystem/ExtensionSystemInterfaces @@ -1,3 +1,36 @@ +/*************************************************************************** +** +** This file is part of Qt Creator +** +** Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies). +** +** Contact: Qt Software Information (qt-info@nokia.com) +** +** +** Non-Open Source Usage +** +** Licensees may use this file in accordance with the Qt Beta Version +** License Agreement, Agreement version 2.2 provided with the Software or, +** alternatively, in accordance with the terms contained in a written +** agreement between you and Nokia. +** +** GNU General Public License Usage +** +** Alternatively, this file may be used under the terms of the GNU General +** Public License versions 2.0 or 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the packaging +** of this file. Please review the following information to ensure GNU +** General Public Licensing requirements will be met: +** +** http://www.fsf.org/licensing/licenses/info/GPLv2.html and +** http://www.gnu.org/copyleft/gpl.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt GPL Exception +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. +** +***************************************************************************/ + #include "extensionsystem/pluginmanager.h" #include "extensionsystem/pluginspec.h" #include "extensionsystem/iplugin.h" diff --git a/src/libs/extensionsystem/extensionsystem_global.h b/src/libs/extensionsystem/extensionsystem_global.h index af945f2f51..7ff0d1d471 100644 --- a/src/libs/extensionsystem/extensionsystem_global.h +++ b/src/libs/extensionsystem/extensionsystem_global.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/extensionsystem/iplugin.cpp b/src/libs/extensionsystem/iplugin.cpp index f548430d7a..1b75839fa8 100644 --- a/src/libs/extensionsystem/iplugin.cpp +++ b/src/libs/extensionsystem/iplugin.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/extensionsystem/iplugin.h b/src/libs/extensionsystem/iplugin.h index e4f01c86b4..fe242b0fb7 100644 --- a/src/libs/extensionsystem/iplugin.h +++ b/src/libs/extensionsystem/iplugin.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/extensionsystem/iplugin_p.h b/src/libs/extensionsystem/iplugin_p.h index 38e8b7da9b..cc7e1bdae3 100644 --- a/src/libs/extensionsystem/iplugin_p.h +++ b/src/libs/extensionsystem/iplugin_p.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/extensionsystem/optionsparser.cpp b/src/libs/extensionsystem/optionsparser.cpp index 09dbaa59b7..414895c9de 100644 --- a/src/libs/extensionsystem/optionsparser.cpp +++ b/src/libs/extensionsystem/optionsparser.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/extensionsystem/optionsparser.h b/src/libs/extensionsystem/optionsparser.h index 1f41f06d41..1be8531d53 100644 --- a/src/libs/extensionsystem/optionsparser.h +++ b/src/libs/extensionsystem/optionsparser.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/extensionsystem/plugindetailsview.cpp b/src/libs/extensionsystem/plugindetailsview.cpp index 03013e2305..1f3070411f 100644 --- a/src/libs/extensionsystem/plugindetailsview.cpp +++ b/src/libs/extensionsystem/plugindetailsview.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/extensionsystem/plugindetailsview.h b/src/libs/extensionsystem/plugindetailsview.h index 19ea5966d8..9ae44dad34 100644 --- a/src/libs/extensionsystem/plugindetailsview.h +++ b/src/libs/extensionsystem/plugindetailsview.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/extensionsystem/pluginerrorview.cpp b/src/libs/extensionsystem/pluginerrorview.cpp index 0af08f8ecd..dae77d0b87 100644 --- a/src/libs/extensionsystem/pluginerrorview.cpp +++ b/src/libs/extensionsystem/pluginerrorview.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/extensionsystem/pluginerrorview.h b/src/libs/extensionsystem/pluginerrorview.h index c9f0449186..d6c8897931 100644 --- a/src/libs/extensionsystem/pluginerrorview.h +++ b/src/libs/extensionsystem/pluginerrorview.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/extensionsystem/pluginmanager.cpp b/src/libs/extensionsystem/pluginmanager.cpp index 90e6e4bb00..0603cd87ca 100644 --- a/src/libs/extensionsystem/pluginmanager.cpp +++ b/src/libs/extensionsystem/pluginmanager.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/extensionsystem/pluginmanager.h b/src/libs/extensionsystem/pluginmanager.h index e621fbea17..42e3029bc5 100644 --- a/src/libs/extensionsystem/pluginmanager.h +++ b/src/libs/extensionsystem/pluginmanager.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/extensionsystem/pluginmanager_p.h b/src/libs/extensionsystem/pluginmanager_p.h index b286fdf2b1..cfe2d6d17a 100644 --- a/src/libs/extensionsystem/pluginmanager_p.h +++ b/src/libs/extensionsystem/pluginmanager_p.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/extensionsystem/pluginspec.cpp b/src/libs/extensionsystem/pluginspec.cpp index a8694e2967..99e83d9fc6 100644 --- a/src/libs/extensionsystem/pluginspec.cpp +++ b/src/libs/extensionsystem/pluginspec.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/extensionsystem/pluginspec.h b/src/libs/extensionsystem/pluginspec.h index f96ab6b812..6ab9d46591 100644 --- a/src/libs/extensionsystem/pluginspec.h +++ b/src/libs/extensionsystem/pluginspec.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/extensionsystem/pluginspec_p.h b/src/libs/extensionsystem/pluginspec_p.h index b4fefc59b3..436a1f44b0 100644 --- a/src/libs/extensionsystem/pluginspec_p.h +++ b/src/libs/extensionsystem/pluginspec_p.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/extensionsystem/pluginview.cpp b/src/libs/extensionsystem/pluginview.cpp index 82e8c45dd8..c60ae33473 100644 --- a/src/libs/extensionsystem/pluginview.cpp +++ b/src/libs/extensionsystem/pluginview.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/extensionsystem/pluginview.h b/src/libs/extensionsystem/pluginview.h index d99f996401..dc4c5f1c84 100644 --- a/src/libs/extensionsystem/pluginview.h +++ b/src/libs/extensionsystem/pluginview.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/extensionsystem/pluginview_p.h b/src/libs/extensionsystem/pluginview_p.h index e9565c1384..77e511ba2c 100644 --- a/src/libs/extensionsystem/pluginview_p.h +++ b/src/libs/extensionsystem/pluginview_p.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin1/plugin1.cpp b/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin1/plugin1.cpp index e2a774e231..68332a77b3 100644 --- a/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin1/plugin1.cpp +++ b/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin1/plugin1.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin1/plugin1.h b/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin1/plugin1.h index 6b4ce93446..c15a30bf16 100644 --- a/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin1/plugin1.h +++ b/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin1/plugin1.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin2/plugin2.cpp b/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin2/plugin2.cpp index ed42eed157..fd788e4da6 100644 --- a/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin2/plugin2.cpp +++ b/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin2/plugin2.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin2/plugin2.h b/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin2/plugin2.h index d4281b8443..431fa8201f 100644 --- a/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin2/plugin2.h +++ b/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin2/plugin2.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin3/plugin3.cpp b/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin3/plugin3.cpp index 18023f15c7..9da1403df8 100644 --- a/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin3/plugin3.cpp +++ b/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin3/plugin3.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ #include "plugin3.h" diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin3/plugin3.h b/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin3/plugin3.h index b083a1a1b0..0878a907be 100644 --- a/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin3/plugin3.h +++ b/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin3/plugin3.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin1/plugin1.cpp b/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin1/plugin1.cpp index e2da43f004..f67dd11e9e 100644 --- a/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin1/plugin1.cpp +++ b/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin1/plugin1.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin1/plugin1.h b/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin1/plugin1.h index 19472a051c..498d827dd1 100644 --- a/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin1/plugin1.h +++ b/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin1/plugin1.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin2/plugin2.cpp b/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin2/plugin2.cpp index b05261600e..4cd3a89f6d 100644 --- a/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin2/plugin2.cpp +++ b/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin2/plugin2.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin2/plugin2.h b/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin2/plugin2.h index 8a8d9e7a6a..c509439800 100644 --- a/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin2/plugin2.h +++ b/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin2/plugin2.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin3/plugin3.cpp b/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin3/plugin3.cpp index 3768b6e81c..7e170878e6 100644 --- a/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin3/plugin3.cpp +++ b/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin3/plugin3.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin3/plugin3.h b/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin3/plugin3.h index 813d91aee6..484ceace7a 100644 --- a/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin3/plugin3.h +++ b/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin3/plugin3.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ #ifndef PLUGIN3_H diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/tst_pluginmanager.cpp b/src/libs/extensionsystem/test/auto/pluginmanager/tst_pluginmanager.cpp index 18e3c26b01..ca2b00fc71 100644 --- a/src/libs/extensionsystem/test/auto/pluginmanager/tst_pluginmanager.cpp +++ b/src/libs/extensionsystem/test/auto/pluginmanager/tst_pluginmanager.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/extensionsystem/test/auto/pluginspec/testplugin/testplugin.cpp b/src/libs/extensionsystem/test/auto/pluginspec/testplugin/testplugin.cpp index 79ffc72ebf..eff30909c7 100644 --- a/src/libs/extensionsystem/test/auto/pluginspec/testplugin/testplugin.cpp +++ b/src/libs/extensionsystem/test/auto/pluginspec/testplugin/testplugin.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/extensionsystem/test/auto/pluginspec/testplugin/testplugin.h b/src/libs/extensionsystem/test/auto/pluginspec/testplugin/testplugin.h index 050a9f12c4..1cc205c334 100644 --- a/src/libs/extensionsystem/test/auto/pluginspec/testplugin/testplugin.h +++ b/src/libs/extensionsystem/test/auto/pluginspec/testplugin/testplugin.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/extensionsystem/test/auto/pluginspec/testplugin/testplugin_global.h b/src/libs/extensionsystem/test/auto/pluginspec/testplugin/testplugin_global.h index 4c80166ca4..93b2bdb2d7 100644 --- a/src/libs/extensionsystem/test/auto/pluginspec/testplugin/testplugin_global.h +++ b/src/libs/extensionsystem/test/auto/pluginspec/testplugin/testplugin_global.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/extensionsystem/test/auto/pluginspec/tst_pluginspec.cpp b/src/libs/extensionsystem/test/auto/pluginspec/tst_pluginspec.cpp index ceb43f4920..59683feb04 100644 --- a/src/libs/extensionsystem/test/auto/pluginspec/tst_pluginspec.cpp +++ b/src/libs/extensionsystem/test/auto/pluginspec/tst_pluginspec.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/extensionsystem/test/manual/pluginview/plugindialog.cpp b/src/libs/extensionsystem/test/manual/pluginview/plugindialog.cpp index 4dd5027f61..468a06dda0 100644 --- a/src/libs/extensionsystem/test/manual/pluginview/plugindialog.cpp +++ b/src/libs/extensionsystem/test/manual/pluginview/plugindialog.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/extensionsystem/test/manual/pluginview/plugindialog.h b/src/libs/extensionsystem/test/manual/pluginview/plugindialog.h index 4e74409ab0..7eaffeef47 100644 --- a/src/libs/extensionsystem/test/manual/pluginview/plugindialog.h +++ b/src/libs/extensionsystem/test/manual/pluginview/plugindialog.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin1/plugin1.cpp b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin1/plugin1.cpp index 23ad88838b..465215ec42 100644 --- a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin1/plugin1.cpp +++ b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin1/plugin1.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin1/plugin1.h b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin1/plugin1.h index d225aa8589..77648b733b 100644 --- a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin1/plugin1.h +++ b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin1/plugin1.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin2/plugin2.cpp b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin2/plugin2.cpp index 9c3ac91ad6..b74b339b23 100644 --- a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin2/plugin2.cpp +++ b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin2/plugin2.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin2/plugin2.h b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin2/plugin2.h index 4d060b348e..c13f47f925 100644 --- a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin2/plugin2.h +++ b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin2/plugin2.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin3/plugin3.cpp b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin3/plugin3.cpp index 5764776ccf..888e3fb662 100644 --- a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin3/plugin3.cpp +++ b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin3/plugin3.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin3/plugin3.h b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin3/plugin3.h index cd5a823036..c6d865b885 100644 --- a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin3/plugin3.h +++ b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin3/plugin3.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/qtconcurrent/QtConcurrentTools b/src/libs/qtconcurrent/QtConcurrentTools index ffd0cb10a7..b618f1cb49 100644 --- a/src/libs/qtconcurrent/QtConcurrentTools +++ b/src/libs/qtconcurrent/QtConcurrentTools @@ -1,2 +1,35 @@ +/*************************************************************************** +** +** This file is part of Qt Creator +** +** Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies). +** +** Contact: Qt Software Information (qt-info@nokia.com) +** +** +** Non-Open Source Usage +** +** Licensees may use this file in accordance with the Qt Beta Version +** License Agreement, Agreement version 2.2 provided with the Software or, +** alternatively, in accordance with the terms contained in a written +** agreement between you and Nokia. +** +** GNU General Public License Usage +** +** Alternatively, this file may be used under the terms of the GNU General +** Public License versions 2.0 or 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the packaging +** of this file. Please review the following information to ensure GNU +** General Public Licensing requirements will be met: +** +** http://www.fsf.org/licensing/licenses/info/GPLv2.html and +** http://www.gnu.org/copyleft/gpl.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt GPL Exception +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. +** +***************************************************************************/ + #include "qtconcurrent/multitask.h" #include "qtconcurrent/runextensions.h" diff --git a/src/libs/qtconcurrent/multitask.h b/src/libs/qtconcurrent/multitask.h index 8f87ca0419..b23c6e3580 100644 --- a/src/libs/qtconcurrent/multitask.h +++ b/src/libs/qtconcurrent/multitask.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/qtconcurrent/qtconcurrent_global.h b/src/libs/qtconcurrent/qtconcurrent_global.h index fd3f8c76e6..6c49354fff 100644 --- a/src/libs/qtconcurrent/qtconcurrent_global.h +++ b/src/libs/qtconcurrent/qtconcurrent_global.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/qtconcurrent/runextensions.h b/src/libs/qtconcurrent/runextensions.h index 9305f29ace..c5c2954db9 100644 --- a/src/libs/qtconcurrent/runextensions.h +++ b/src/libs/qtconcurrent/runextensions.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/utils/basevalidatinglineedit.cpp b/src/libs/utils/basevalidatinglineedit.cpp index f15e69641f..6c26d0bf4b 100644 --- a/src/libs/utils/basevalidatinglineedit.cpp +++ b/src/libs/utils/basevalidatinglineedit.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/utils/basevalidatinglineedit.h b/src/libs/utils/basevalidatinglineedit.h index 977f9fddec..4a9468e714 100644 --- a/src/libs/utils/basevalidatinglineedit.h +++ b/src/libs/utils/basevalidatinglineedit.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/utils/classnamevalidatinglineedit.cpp b/src/libs/utils/classnamevalidatinglineedit.cpp index aa6557574c..a4e55ccd81 100644 --- a/src/libs/utils/classnamevalidatinglineedit.cpp +++ b/src/libs/utils/classnamevalidatinglineedit.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/utils/classnamevalidatinglineedit.h b/src/libs/utils/classnamevalidatinglineedit.h index bf6a23c615..321bc9e34f 100644 --- a/src/libs/utils/classnamevalidatinglineedit.h +++ b/src/libs/utils/classnamevalidatinglineedit.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/utils/codegeneration.cpp b/src/libs/utils/codegeneration.cpp index b450fe426c..4bfa9098cd 100644 --- a/src/libs/utils/codegeneration.cpp +++ b/src/libs/utils/codegeneration.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/utils/codegeneration.h b/src/libs/utils/codegeneration.h index fcb1e99f9a..e8b844784a 100644 --- a/src/libs/utils/codegeneration.h +++ b/src/libs/utils/codegeneration.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/utils/fancylineedit.cpp b/src/libs/utils/fancylineedit.cpp index 2552649263..8e9911f8f4 100644 --- a/src/libs/utils/fancylineedit.cpp +++ b/src/libs/utils/fancylineedit.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/utils/fancylineedit.h b/src/libs/utils/fancylineedit.h index 072360ec9b..10b5f32129 100644 --- a/src/libs/utils/fancylineedit.h +++ b/src/libs/utils/fancylineedit.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/utils/filenamevalidatinglineedit.cpp b/src/libs/utils/filenamevalidatinglineedit.cpp index a7e228903b..e11c578070 100644 --- a/src/libs/utils/filenamevalidatinglineedit.cpp +++ b/src/libs/utils/filenamevalidatinglineedit.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/utils/filenamevalidatinglineedit.h b/src/libs/utils/filenamevalidatinglineedit.h index 042a48fc5f..95440c83f3 100644 --- a/src/libs/utils/filenamevalidatinglineedit.h +++ b/src/libs/utils/filenamevalidatinglineedit.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/utils/filesearch.cpp b/src/libs/utils/filesearch.cpp index 153b953174..a04e6a4295 100644 --- a/src/libs/utils/filesearch.cpp +++ b/src/libs/utils/filesearch.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/utils/filesearch.h b/src/libs/utils/filesearch.h index d8b8f68cdb..09bef9d1be 100644 --- a/src/libs/utils/filesearch.h +++ b/src/libs/utils/filesearch.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/utils/filewizarddialog.cpp b/src/libs/utils/filewizarddialog.cpp index 8441cdb863..a564c63bb4 100644 --- a/src/libs/utils/filewizarddialog.cpp +++ b/src/libs/utils/filewizarddialog.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/utils/filewizarddialog.h b/src/libs/utils/filewizarddialog.h index e5ed0d90a3..5a01a9558d 100644 --- a/src/libs/utils/filewizarddialog.h +++ b/src/libs/utils/filewizarddialog.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/utils/filewizardpage.cpp b/src/libs/utils/filewizardpage.cpp index da892faf03..0e5c7b2455 100644 --- a/src/libs/utils/filewizardpage.cpp +++ b/src/libs/utils/filewizardpage.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/utils/filewizardpage.h b/src/libs/utils/filewizardpage.h index 6f9364a3a4..18e89af9d0 100644 --- a/src/libs/utils/filewizardpage.h +++ b/src/libs/utils/filewizardpage.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/utils/linecolumnlabel.cpp b/src/libs/utils/linecolumnlabel.cpp index c44df2217e..75e1dd2708 100644 --- a/src/libs/utils/linecolumnlabel.cpp +++ b/src/libs/utils/linecolumnlabel.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/utils/linecolumnlabel.h b/src/libs/utils/linecolumnlabel.h index 044bfe209f..1ae84ccac9 100644 --- a/src/libs/utils/linecolumnlabel.h +++ b/src/libs/utils/linecolumnlabel.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/utils/listutils.h b/src/libs/utils/listutils.h index a3d85605d8..fa260e0ed7 100644 --- a/src/libs/utils/listutils.h +++ b/src/libs/utils/listutils.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/utils/newclasswidget.cpp b/src/libs/utils/newclasswidget.cpp index b34ee40d4f..46db9fda71 100644 --- a/src/libs/utils/newclasswidget.cpp +++ b/src/libs/utils/newclasswidget.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/utils/newclasswidget.h b/src/libs/utils/newclasswidget.h index 40c850d28e..7b141f8c37 100644 --- a/src/libs/utils/newclasswidget.h +++ b/src/libs/utils/newclasswidget.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/utils/pathchooser.cpp b/src/libs/utils/pathchooser.cpp index 100fdbe717..d374350970 100644 --- a/src/libs/utils/pathchooser.cpp +++ b/src/libs/utils/pathchooser.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/utils/pathchooser.h b/src/libs/utils/pathchooser.h index d4bd098e90..b389846553 100644 --- a/src/libs/utils/pathchooser.h +++ b/src/libs/utils/pathchooser.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/utils/projectintropage.cpp b/src/libs/utils/projectintropage.cpp index 6312313873..85bf22b14c 100644 --- a/src/libs/utils/projectintropage.cpp +++ b/src/libs/utils/projectintropage.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/utils/projectintropage.h b/src/libs/utils/projectintropage.h index e554c61705..7f6b34bc88 100644 --- a/src/libs/utils/projectintropage.h +++ b/src/libs/utils/projectintropage.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/utils/projectnamevalidatinglineedit.cpp b/src/libs/utils/projectnamevalidatinglineedit.cpp index 4160bc1879..bbd8d73466 100644 --- a/src/libs/utils/projectnamevalidatinglineedit.cpp +++ b/src/libs/utils/projectnamevalidatinglineedit.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/utils/projectnamevalidatinglineedit.h b/src/libs/utils/projectnamevalidatinglineedit.h index 12152912cc..d660c1aa4a 100644 --- a/src/libs/utils/projectnamevalidatinglineedit.h +++ b/src/libs/utils/projectnamevalidatinglineedit.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/utils/qtcassert.h b/src/libs/utils/qtcassert.h index f75d225f6e..3206e8c38b 100644 --- a/src/libs/utils/qtcassert.h +++ b/src/libs/utils/qtcassert.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/utils/qtcolorbutton.cpp b/src/libs/utils/qtcolorbutton.cpp index 4003f6ec6f..a30b3e5f55 100644 --- a/src/libs/utils/qtcolorbutton.cpp +++ b/src/libs/utils/qtcolorbutton.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/utils/qtcolorbutton.h b/src/libs/utils/qtcolorbutton.h index cd94aa7e96..2fee344d78 100644 --- a/src/libs/utils/qtcolorbutton.h +++ b/src/libs/utils/qtcolorbutton.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/utils/reloadpromptutils.cpp b/src/libs/utils/reloadpromptutils.cpp index e3d3961a0d..509d241741 100644 --- a/src/libs/utils/reloadpromptutils.cpp +++ b/src/libs/utils/reloadpromptutils.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/utils/reloadpromptutils.h b/src/libs/utils/reloadpromptutils.h index 4ccb259179..ec7d7b4117 100644 --- a/src/libs/utils/reloadpromptutils.h +++ b/src/libs/utils/reloadpromptutils.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/utils/settingsutils.cpp b/src/libs/utils/settingsutils.cpp index 5862c4f306..5394c746d6 100644 --- a/src/libs/utils/settingsutils.cpp +++ b/src/libs/utils/settingsutils.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/utils/settingsutils.h b/src/libs/utils/settingsutils.h index 9920ec6ba9..3777587a40 100644 --- a/src/libs/utils/settingsutils.h +++ b/src/libs/utils/settingsutils.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/utils/submiteditorwidget.cpp b/src/libs/utils/submiteditorwidget.cpp index 4aa021e63e..ae8eb41593 100644 --- a/src/libs/utils/submiteditorwidget.cpp +++ b/src/libs/utils/submiteditorwidget.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/utils/submiteditorwidget.h b/src/libs/utils/submiteditorwidget.h index 9e3b245557..921bb6d16d 100644 --- a/src/libs/utils/submiteditorwidget.h +++ b/src/libs/utils/submiteditorwidget.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/utils/synchronousprocess.cpp b/src/libs/utils/synchronousprocess.cpp index 6a1b2efa84..a8e2979f81 100644 --- a/src/libs/utils/synchronousprocess.cpp +++ b/src/libs/utils/synchronousprocess.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/utils/synchronousprocess.h b/src/libs/utils/synchronousprocess.h index 822edcb74e..5b51f53cd4 100644 --- a/src/libs/utils/synchronousprocess.h +++ b/src/libs/utils/synchronousprocess.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/libs/utils/utils_global.h b/src/libs/utils/utils_global.h index 0a921cff91..5a326faa45 100644 --- a/src/libs/utils/utils_global.h +++ b/src/libs/utils/utils_global.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/bineditor/BinEditor.pluginspec b/src/plugins/bineditor/BinEditor.pluginspec index 9e09f93eec..4c79a18f25 100644 --- a/src/plugins/bineditor/BinEditor.pluginspec +++ b/src/plugins/bineditor/BinEditor.pluginspec @@ -1,7 +1,7 @@ <plugin name="BinEditor" version="0.9.1" compatVersion="0.9.1"> <vendor>Nokia Corporation</vendor> <copyright>(C) 2008 Nokia Corporation</copyright> - <license>Nokia Technology Preview License Agreement</license> + <license>Nokia Beta Version License</license> <description>Binary editor component.</description> <url>http://www.trolltech.com/</url> <dependencyList> diff --git a/src/plugins/bineditor/bineditor.cpp b/src/plugins/bineditor/bineditor.cpp index 9ca1dbfb74..b7576f9803 100644 --- a/src/plugins/bineditor/bineditor.cpp +++ b/src/plugins/bineditor/bineditor.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/bineditor/bineditor.h b/src/plugins/bineditor/bineditor.h index c6bb870b0a..1940434b42 100644 --- a/src/plugins/bineditor/bineditor.h +++ b/src/plugins/bineditor/bineditor.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/bineditor/bineditorconstants.h b/src/plugins/bineditor/bineditorconstants.h index 66419c42f4..86cdb5ea5b 100644 --- a/src/plugins/bineditor/bineditorconstants.h +++ b/src/plugins/bineditor/bineditorconstants.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/bineditor/bineditorplugin.cpp b/src/plugins/bineditor/bineditorplugin.cpp index e3a5540717..ff07d5e876 100644 --- a/src/plugins/bineditor/bineditorplugin.cpp +++ b/src/plugins/bineditor/bineditorplugin.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/bineditor/bineditorplugin.h b/src/plugins/bineditor/bineditorplugin.h index 78d54db695..b5bedb49aa 100644 --- a/src/plugins/bineditor/bineditorplugin.h +++ b/src/plugins/bineditor/bineditorplugin.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/bookmarks/Bookmarks.pluginspec b/src/plugins/bookmarks/Bookmarks.pluginspec index 359ab6d203..e6ef924e48 100644 --- a/src/plugins/bookmarks/Bookmarks.pluginspec +++ b/src/plugins/bookmarks/Bookmarks.pluginspec @@ -1,7 +1,7 @@ <plugin name="Bookmarks" version="0.9.1" compatVersion="0.9.1"> <vendor>Nokia Corporation</vendor> <copyright>(C) 2008 Nokia Corporation</copyright> - <license>Nokia Technology Preview License Agreement</license> + <license>Nokia Beta Version License</license> <description>Bookmarks in text editors.</description> <url>http://www.trolltech.com/</url> <dependencyList> diff --git a/src/plugins/bookmarks/bookmark.cpp b/src/plugins/bookmarks/bookmark.cpp index 00bcecf937..f622bff74b 100644 --- a/src/plugins/bookmarks/bookmark.cpp +++ b/src/plugins/bookmarks/bookmark.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/bookmarks/bookmark.h b/src/plugins/bookmarks/bookmark.h index bbf5d13a46..72ead1d054 100644 --- a/src/plugins/bookmarks/bookmark.h +++ b/src/plugins/bookmarks/bookmark.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/bookmarks/bookmarkmanager.cpp b/src/plugins/bookmarks/bookmarkmanager.cpp index a9377730fd..ea59be8377 100644 --- a/src/plugins/bookmarks/bookmarkmanager.cpp +++ b/src/plugins/bookmarks/bookmarkmanager.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/bookmarks/bookmarkmanager.h b/src/plugins/bookmarks/bookmarkmanager.h index d3a2fc9a32..d0d84d50ed 100644 --- a/src/plugins/bookmarks/bookmarkmanager.h +++ b/src/plugins/bookmarks/bookmarkmanager.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/bookmarks/bookmarks_global.h b/src/plugins/bookmarks/bookmarks_global.h index 5eecc4c9a5..59e639e634 100644 --- a/src/plugins/bookmarks/bookmarks_global.h +++ b/src/plugins/bookmarks/bookmarks_global.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/bookmarks/bookmarksplugin.cpp b/src/plugins/bookmarks/bookmarksplugin.cpp index 615ba5ec2a..63fbb1c2ee 100644 --- a/src/plugins/bookmarks/bookmarksplugin.cpp +++ b/src/plugins/bookmarks/bookmarksplugin.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/bookmarks/bookmarksplugin.h b/src/plugins/bookmarks/bookmarksplugin.h index 2a60bb04a3..9bf68c6b9b 100644 --- a/src/plugins/bookmarks/bookmarksplugin.h +++ b/src/plugins/bookmarks/bookmarksplugin.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp index 6e1e8fd1f4..b28989b168 100644 --- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.h b/src/plugins/cmakeprojectmanager/cmakeproject.h index 48f5057d10..c6a93f8693 100644 --- a/src/plugins/cmakeprojectmanager/cmakeproject.h +++ b/src/plugins/cmakeprojectmanager/cmakeproject.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectconstants.h b/src/plugins/cmakeprojectmanager/cmakeprojectconstants.h index 7130058991..4e753c570e 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectconstants.h +++ b/src/plugins/cmakeprojectmanager/cmakeprojectconstants.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp index 7d9780eaf1..2282f0cb52 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.h b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.h index 04c497288f..b3335702de 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.h +++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp index d750ca60a2..2d48295f0f 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.h b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.h index 80044fcf98..3f7b8442fa 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.h +++ b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp index 932278a32c..d38cb56c14 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.h b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.h index 44ef238772..d3cd8941b5 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.h +++ b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp index fe337ac8f3..f9cc2b914e 100644 --- a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp +++ b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.h b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.h index 082364e304..6dff25adfd 100644 --- a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.h +++ b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/cmakeprojectmanager/cmakestep.cpp b/src/plugins/cmakeprojectmanager/cmakestep.cpp index 045fa46a24..a24c3f085b 100644 --- a/src/plugins/cmakeprojectmanager/cmakestep.cpp +++ b/src/plugins/cmakeprojectmanager/cmakestep.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/cmakeprojectmanager/cmakestep.h b/src/plugins/cmakeprojectmanager/cmakestep.h index 75cc0d6ba3..a0a20b0c50 100644 --- a/src/plugins/cmakeprojectmanager/cmakestep.h +++ b/src/plugins/cmakeprojectmanager/cmakestep.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/cmakeprojectmanager/makestep.cpp b/src/plugins/cmakeprojectmanager/makestep.cpp index 71d1a5d93a..716f548af5 100644 --- a/src/plugins/cmakeprojectmanager/makestep.cpp +++ b/src/plugins/cmakeprojectmanager/makestep.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/cmakeprojectmanager/makestep.h b/src/plugins/cmakeprojectmanager/makestep.h index f0ef530b42..33800265d6 100644 --- a/src/plugins/cmakeprojectmanager/makestep.h +++ b/src/plugins/cmakeprojectmanager/makestep.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/Core.pluginspec b/src/plugins/coreplugin/Core.pluginspec index 28b9067ed2..ef7a7e38f0 100644 --- a/src/plugins/coreplugin/Core.pluginspec +++ b/src/plugins/coreplugin/Core.pluginspec @@ -1,7 +1,7 @@ <plugin name="Core" version="0.9.1" compatVersion="0.9.1"> <vendor>Nokia Corporation</vendor> <copyright>(C) 2008 Nokia Corporation</copyright> - <license>Nokia Technology Preview License Agreement</license> + <license>Nokia Beta Version License</license> <description>The core plugin for the Qt IDE.</description> <url>http://www.trolltech.com/</url> </plugin> diff --git a/src/plugins/coreplugin/actionmanager/actioncontainer.cpp b/src/plugins/coreplugin/actionmanager/actioncontainer.cpp index 063b80e0b7..bec545cc26 100644 --- a/src/plugins/coreplugin/actionmanager/actioncontainer.cpp +++ b/src/plugins/coreplugin/actionmanager/actioncontainer.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/actionmanager/actioncontainer.h b/src/plugins/coreplugin/actionmanager/actioncontainer.h index 140ddee211..6d116426f2 100644 --- a/src/plugins/coreplugin/actionmanager/actioncontainer.h +++ b/src/plugins/coreplugin/actionmanager/actioncontainer.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/actionmanager/actionmanager.cpp b/src/plugins/coreplugin/actionmanager/actionmanager.cpp index cb59db7a12..bc43374f0e 100644 --- a/src/plugins/coreplugin/actionmanager/actionmanager.cpp +++ b/src/plugins/coreplugin/actionmanager/actionmanager.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/actionmanager/actionmanager.h b/src/plugins/coreplugin/actionmanager/actionmanager.h index 0b301afa03..dd5e2f61e9 100644 --- a/src/plugins/coreplugin/actionmanager/actionmanager.h +++ b/src/plugins/coreplugin/actionmanager/actionmanager.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/actionmanager/actionmanagerinterface.h b/src/plugins/coreplugin/actionmanager/actionmanagerinterface.h index 62d74503d4..f77e9ca484 100644 --- a/src/plugins/coreplugin/actionmanager/actionmanagerinterface.h +++ b/src/plugins/coreplugin/actionmanager/actionmanagerinterface.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/actionmanager/command.cpp b/src/plugins/coreplugin/actionmanager/command.cpp index be71fa45cd..d5370e4ffe 100644 --- a/src/plugins/coreplugin/actionmanager/command.cpp +++ b/src/plugins/coreplugin/actionmanager/command.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/actionmanager/command.h b/src/plugins/coreplugin/actionmanager/command.h index 27885ad2db..848114c8b9 100644 --- a/src/plugins/coreplugin/actionmanager/command.h +++ b/src/plugins/coreplugin/actionmanager/command.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/actionmanager/commandsfile.cpp b/src/plugins/coreplugin/actionmanager/commandsfile.cpp index 3c427dad0a..99602efaa8 100644 --- a/src/plugins/coreplugin/actionmanager/commandsfile.cpp +++ b/src/plugins/coreplugin/actionmanager/commandsfile.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/actionmanager/commandsfile.h b/src/plugins/coreplugin/actionmanager/commandsfile.h index 6aefea7d63..7c515a32c2 100644 --- a/src/plugins/coreplugin/actionmanager/commandsfile.h +++ b/src/plugins/coreplugin/actionmanager/commandsfile.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/actionmanager/iactioncontainer.h b/src/plugins/coreplugin/actionmanager/iactioncontainer.h index e27fda1a93..ad51039352 100644 --- a/src/plugins/coreplugin/actionmanager/iactioncontainer.h +++ b/src/plugins/coreplugin/actionmanager/iactioncontainer.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/actionmanager/icommand.h b/src/plugins/coreplugin/actionmanager/icommand.h index 85fc7d5d43..7ab5145b74 100644 --- a/src/plugins/coreplugin/actionmanager/icommand.h +++ b/src/plugins/coreplugin/actionmanager/icommand.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/basefilewizard.cpp b/src/plugins/coreplugin/basefilewizard.cpp index bb7adb9962..51ad57bc27 100644 --- a/src/plugins/coreplugin/basefilewizard.cpp +++ b/src/plugins/coreplugin/basefilewizard.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/basefilewizard.h b/src/plugins/coreplugin/basefilewizard.h index 9de2943bbf..d530b728aa 100644 --- a/src/plugins/coreplugin/basefilewizard.h +++ b/src/plugins/coreplugin/basefilewizard.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/basemode.cpp b/src/plugins/coreplugin/basemode.cpp index 16930ce936..1a428aa4df 100644 --- a/src/plugins/coreplugin/basemode.cpp +++ b/src/plugins/coreplugin/basemode.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/basemode.h b/src/plugins/coreplugin/basemode.h index a9e8f13ef1..c6fea7d480 100644 --- a/src/plugins/coreplugin/basemode.h +++ b/src/plugins/coreplugin/basemode.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/baseview.cpp b/src/plugins/coreplugin/baseview.cpp index 2d7724bcb5..5367062d37 100644 --- a/src/plugins/coreplugin/baseview.cpp +++ b/src/plugins/coreplugin/baseview.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/baseview.h b/src/plugins/coreplugin/baseview.h index 8004721ef3..0312de6613 100644 --- a/src/plugins/coreplugin/baseview.h +++ b/src/plugins/coreplugin/baseview.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/core_global.h b/src/plugins/coreplugin/core_global.h index ca867625af..630b660c0c 100644 --- a/src/plugins/coreplugin/core_global.h +++ b/src/plugins/coreplugin/core_global.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/coreconstants.h b/src/plugins/coreplugin/coreconstants.h index c2a703a2d6..41e00202e5 100644 --- a/src/plugins/coreplugin/coreconstants.h +++ b/src/plugins/coreplugin/coreconstants.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/coreimpl.cpp b/src/plugins/coreplugin/coreimpl.cpp index e35a24d20e..7a7eca4044 100644 --- a/src/plugins/coreplugin/coreimpl.cpp +++ b/src/plugins/coreplugin/coreimpl.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/coreimpl.h b/src/plugins/coreplugin/coreimpl.h index fbe5e644d4..5380b9bdaf 100644 --- a/src/plugins/coreplugin/coreimpl.h +++ b/src/plugins/coreplugin/coreimpl.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/coreplugin.cpp b/src/plugins/coreplugin/coreplugin.cpp index dd181a6d0a..9a426dbead 100644 --- a/src/plugins/coreplugin/coreplugin.cpp +++ b/src/plugins/coreplugin/coreplugin.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/coreplugin.h b/src/plugins/coreplugin/coreplugin.h index f9b3377e34..f14d3b1a74 100644 --- a/src/plugins/coreplugin/coreplugin.h +++ b/src/plugins/coreplugin/coreplugin.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/dialogs/ioptionspage.h b/src/plugins/coreplugin/dialogs/ioptionspage.h index 6571c77207..df38e3562a 100644 --- a/src/plugins/coreplugin/dialogs/ioptionspage.h +++ b/src/plugins/coreplugin/dialogs/ioptionspage.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/dialogs/iwizard.h b/src/plugins/coreplugin/dialogs/iwizard.h index 9250ca567b..53216a0ed3 100644 --- a/src/plugins/coreplugin/dialogs/iwizard.h +++ b/src/plugins/coreplugin/dialogs/iwizard.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/dialogs/newdialog.cpp b/src/plugins/coreplugin/dialogs/newdialog.cpp index 07924eaed7..a77d593541 100644 --- a/src/plugins/coreplugin/dialogs/newdialog.cpp +++ b/src/plugins/coreplugin/dialogs/newdialog.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/dialogs/newdialog.h b/src/plugins/coreplugin/dialogs/newdialog.h index 36f3f51aef..057d2e8269 100644 --- a/src/plugins/coreplugin/dialogs/newdialog.h +++ b/src/plugins/coreplugin/dialogs/newdialog.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/dialogs/openwithdialog.cpp b/src/plugins/coreplugin/dialogs/openwithdialog.cpp index 8f917d4ef4..35a5152b17 100644 --- a/src/plugins/coreplugin/dialogs/openwithdialog.cpp +++ b/src/plugins/coreplugin/dialogs/openwithdialog.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/dialogs/openwithdialog.h b/src/plugins/coreplugin/dialogs/openwithdialog.h index 2bcb0d0324..b4ff967508 100644 --- a/src/plugins/coreplugin/dialogs/openwithdialog.h +++ b/src/plugins/coreplugin/dialogs/openwithdialog.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp b/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp index 6362f7079c..36da081e2d 100644 --- a/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp +++ b/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/dialogs/saveitemsdialog.h b/src/plugins/coreplugin/dialogs/saveitemsdialog.h index 987b870b30..471c74b2b4 100644 --- a/src/plugins/coreplugin/dialogs/saveitemsdialog.h +++ b/src/plugins/coreplugin/dialogs/saveitemsdialog.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/dialogs/settingsdialog.cpp b/src/plugins/coreplugin/dialogs/settingsdialog.cpp index 0f9758b142..b4a8c2b8ea 100644 --- a/src/plugins/coreplugin/dialogs/settingsdialog.cpp +++ b/src/plugins/coreplugin/dialogs/settingsdialog.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/dialogs/settingsdialog.h b/src/plugins/coreplugin/dialogs/settingsdialog.h index 84c4b2c494..c277c85267 100644 --- a/src/plugins/coreplugin/dialogs/settingsdialog.h +++ b/src/plugins/coreplugin/dialogs/settingsdialog.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp index b5c98643b4..ec1c3975c4 100644 --- a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp +++ b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/dialogs/shortcutsettings.h b/src/plugins/coreplugin/dialogs/shortcutsettings.h index 58cb8fc81e..99d4a8fbbc 100644 --- a/src/plugins/coreplugin/dialogs/shortcutsettings.h +++ b/src/plugins/coreplugin/dialogs/shortcutsettings.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/editmode.cpp b/src/plugins/coreplugin/editmode.cpp index d61b6637c4..503c52ac8f 100644 --- a/src/plugins/coreplugin/editmode.cpp +++ b/src/plugins/coreplugin/editmode.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/editmode.h b/src/plugins/coreplugin/editmode.h index 98990f19f1..2f7555915d 100644 --- a/src/plugins/coreplugin/editmode.h +++ b/src/plugins/coreplugin/editmode.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/editormanager/editorgroup.cpp b/src/plugins/coreplugin/editormanager/editorgroup.cpp index 2e33f810e0..82c30db30f 100644 --- a/src/plugins/coreplugin/editormanager/editorgroup.cpp +++ b/src/plugins/coreplugin/editormanager/editorgroup.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/editormanager/editorgroup.h b/src/plugins/coreplugin/editormanager/editorgroup.h index aa87bcea8c..83eb6cf240 100644 --- a/src/plugins/coreplugin/editormanager/editorgroup.h +++ b/src/plugins/coreplugin/editormanager/editorgroup.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp index 44d05e3b68..cb911b1fd2 100644 --- a/src/plugins/coreplugin/editormanager/editormanager.cpp +++ b/src/plugins/coreplugin/editormanager/editormanager.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/editormanager/editormanager.h b/src/plugins/coreplugin/editormanager/editormanager.h index b9da2e055f..729ac7cd84 100644 --- a/src/plugins/coreplugin/editormanager/editormanager.h +++ b/src/plugins/coreplugin/editormanager/editormanager.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/editormanager/editorsplitter.cpp b/src/plugins/coreplugin/editormanager/editorsplitter.cpp index 48ec7e0e45..370cae409f 100644 --- a/src/plugins/coreplugin/editormanager/editorsplitter.cpp +++ b/src/plugins/coreplugin/editormanager/editorsplitter.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/editormanager/editorsplitter.h b/src/plugins/coreplugin/editormanager/editorsplitter.h index 5c0b7c3d0b..0a52aa7744 100644 --- a/src/plugins/coreplugin/editormanager/editorsplitter.h +++ b/src/plugins/coreplugin/editormanager/editorsplitter.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/editormanager/ieditor.h b/src/plugins/coreplugin/editormanager/ieditor.h index 1f087e67e9..02f65d94e0 100644 --- a/src/plugins/coreplugin/editormanager/ieditor.h +++ b/src/plugins/coreplugin/editormanager/ieditor.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/editormanager/ieditorfactory.h b/src/plugins/coreplugin/editormanager/ieditorfactory.h index ae8b2dca2d..c3a25162c7 100644 --- a/src/plugins/coreplugin/editormanager/ieditorfactory.h +++ b/src/plugins/coreplugin/editormanager/ieditorfactory.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/editormanager/openeditorsview.cpp b/src/plugins/coreplugin/editormanager/openeditorsview.cpp index 8fadf75306..a25e92ef0c 100644 --- a/src/plugins/coreplugin/editormanager/openeditorsview.cpp +++ b/src/plugins/coreplugin/editormanager/openeditorsview.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/editormanager/openeditorsview.h b/src/plugins/coreplugin/editormanager/openeditorsview.h index 9ad213ddc0..4aa9743e75 100644 --- a/src/plugins/coreplugin/editormanager/openeditorsview.h +++ b/src/plugins/coreplugin/editormanager/openeditorsview.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/editormanager/openeditorswindow.cpp b/src/plugins/coreplugin/editormanager/openeditorswindow.cpp index 5d2fa04502..b17b79c911 100644 --- a/src/plugins/coreplugin/editormanager/openeditorswindow.cpp +++ b/src/plugins/coreplugin/editormanager/openeditorswindow.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/editormanager/openeditorswindow.h b/src/plugins/coreplugin/editormanager/openeditorswindow.h index 2b16298652..270849fb1f 100644 --- a/src/plugins/coreplugin/editormanager/openeditorswindow.h +++ b/src/plugins/coreplugin/editormanager/openeditorswindow.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/editormanager/stackededitorgroup.cpp b/src/plugins/coreplugin/editormanager/stackededitorgroup.cpp index 4e95697856..6b46fa3b16 100644 --- a/src/plugins/coreplugin/editormanager/stackededitorgroup.cpp +++ b/src/plugins/coreplugin/editormanager/stackededitorgroup.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/editormanager/stackededitorgroup.h b/src/plugins/coreplugin/editormanager/stackededitorgroup.h index 40edfc0168..250e643c86 100644 --- a/src/plugins/coreplugin/editormanager/stackededitorgroup.h +++ b/src/plugins/coreplugin/editormanager/stackededitorgroup.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/fancyactionbar.cpp b/src/plugins/coreplugin/fancyactionbar.cpp index 401720f908..a4da55d393 100644 --- a/src/plugins/coreplugin/fancyactionbar.cpp +++ b/src/plugins/coreplugin/fancyactionbar.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/fancyactionbar.h b/src/plugins/coreplugin/fancyactionbar.h index caf3e47d25..e7946e8ed9 100644 --- a/src/plugins/coreplugin/fancyactionbar.h +++ b/src/plugins/coreplugin/fancyactionbar.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/fancytabwidget.cpp b/src/plugins/coreplugin/fancytabwidget.cpp index 159a79124a..c24e551c77 100644 --- a/src/plugins/coreplugin/fancytabwidget.cpp +++ b/src/plugins/coreplugin/fancytabwidget.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/fancytabwidget.h b/src/plugins/coreplugin/fancytabwidget.h index ae353e8e94..58a5979437 100644 --- a/src/plugins/coreplugin/fancytabwidget.h +++ b/src/plugins/coreplugin/fancytabwidget.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/fileiconprovider.cpp b/src/plugins/coreplugin/fileiconprovider.cpp index 571a49e8ed..772c826d3f 100644 --- a/src/plugins/coreplugin/fileiconprovider.cpp +++ b/src/plugins/coreplugin/fileiconprovider.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/fileiconprovider.h b/src/plugins/coreplugin/fileiconprovider.h index c2e91f513e..ce4939605a 100644 --- a/src/plugins/coreplugin/fileiconprovider.h +++ b/src/plugins/coreplugin/fileiconprovider.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/filemanager.cpp b/src/plugins/coreplugin/filemanager.cpp index 48ae15dd95..27276fbe14 100644 --- a/src/plugins/coreplugin/filemanager.cpp +++ b/src/plugins/coreplugin/filemanager.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/filemanager.h b/src/plugins/coreplugin/filemanager.h index b95063b8f5..817c0d2a5a 100644 --- a/src/plugins/coreplugin/filemanager.h +++ b/src/plugins/coreplugin/filemanager.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/findplaceholder.cpp b/src/plugins/coreplugin/findplaceholder.cpp index 002963e253..866b9eadcd 100644 --- a/src/plugins/coreplugin/findplaceholder.cpp +++ b/src/plugins/coreplugin/findplaceholder.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/findplaceholder.h b/src/plugins/coreplugin/findplaceholder.h index 519468312d..860b16a787 100644 --- a/src/plugins/coreplugin/findplaceholder.h +++ b/src/plugins/coreplugin/findplaceholder.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/flowlayout.cpp b/src/plugins/coreplugin/flowlayout.cpp index 294c5e00dd..c48190f9e2 100644 --- a/src/plugins/coreplugin/flowlayout.cpp +++ b/src/plugins/coreplugin/flowlayout.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/flowlayout.h b/src/plugins/coreplugin/flowlayout.h index 0423e20a8a..efdd3a7280 100644 --- a/src/plugins/coreplugin/flowlayout.h +++ b/src/plugins/coreplugin/flowlayout.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/generalsettings.cpp b/src/plugins/coreplugin/generalsettings.cpp index 220561b5a4..654f3eac6b 100644 --- a/src/plugins/coreplugin/generalsettings.cpp +++ b/src/plugins/coreplugin/generalsettings.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/generalsettings.h b/src/plugins/coreplugin/generalsettings.h index 3b6bbad33c..ead5693033 100644 --- a/src/plugins/coreplugin/generalsettings.h +++ b/src/plugins/coreplugin/generalsettings.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/icontext.h b/src/plugins/coreplugin/icontext.h index 343b438922..3a45cfa412 100644 --- a/src/plugins/coreplugin/icontext.h +++ b/src/plugins/coreplugin/icontext.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/icore.h b/src/plugins/coreplugin/icore.h index b205b6a727..fe9b3b3ba9 100644 --- a/src/plugins/coreplugin/icore.h +++ b/src/plugins/coreplugin/icore.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/icorelistener.h b/src/plugins/coreplugin/icorelistener.h index 6945381deb..c0aab3b1aa 100644 --- a/src/plugins/coreplugin/icorelistener.h +++ b/src/plugins/coreplugin/icorelistener.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/ifile.h b/src/plugins/coreplugin/ifile.h index d060ef420d..a6ecdfbcb0 100644 --- a/src/plugins/coreplugin/ifile.h +++ b/src/plugins/coreplugin/ifile.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/ifilefactory.h b/src/plugins/coreplugin/ifilefactory.h index 1618b463b6..d208d447f6 100644 --- a/src/plugins/coreplugin/ifilefactory.h +++ b/src/plugins/coreplugin/ifilefactory.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/ifilewizardextension.h b/src/plugins/coreplugin/ifilewizardextension.h index e582790423..6e2c36c759 100644 --- a/src/plugins/coreplugin/ifilewizardextension.h +++ b/src/plugins/coreplugin/ifilewizardextension.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/imode.h b/src/plugins/coreplugin/imode.h index 336f38bb46..58602c083b 100644 --- a/src/plugins/coreplugin/imode.h +++ b/src/plugins/coreplugin/imode.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/inavigationwidgetfactory.cpp b/src/plugins/coreplugin/inavigationwidgetfactory.cpp index 2de8e72fbe..885277434d 100644 --- a/src/plugins/coreplugin/inavigationwidgetfactory.cpp +++ b/src/plugins/coreplugin/inavigationwidgetfactory.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/inavigationwidgetfactory.h b/src/plugins/coreplugin/inavigationwidgetfactory.h index e858d2024c..a8f1dbbe42 100644 --- a/src/plugins/coreplugin/inavigationwidgetfactory.h +++ b/src/plugins/coreplugin/inavigationwidgetfactory.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/ioutputpane.h b/src/plugins/coreplugin/ioutputpane.h index cf7424a638..44d2d09291 100644 --- a/src/plugins/coreplugin/ioutputpane.h +++ b/src/plugins/coreplugin/ioutputpane.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/iversioncontrol.h b/src/plugins/coreplugin/iversioncontrol.h index 0962c5537e..4e82731b77 100644 --- a/src/plugins/coreplugin/iversioncontrol.h +++ b/src/plugins/coreplugin/iversioncontrol.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/iview.h b/src/plugins/coreplugin/iview.h index b3bb00d6b4..fb472b7347 100644 --- a/src/plugins/coreplugin/iview.h +++ b/src/plugins/coreplugin/iview.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp index 651e1d7383..2a9fff0f4e 100644 --- a/src/plugins/coreplugin/mainwindow.cpp +++ b/src/plugins/coreplugin/mainwindow.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/mainwindow.h b/src/plugins/coreplugin/mainwindow.h index a8edd08997..57338b3127 100644 --- a/src/plugins/coreplugin/mainwindow.h +++ b/src/plugins/coreplugin/mainwindow.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/manhattanstyle.cpp b/src/plugins/coreplugin/manhattanstyle.cpp index 1b018c66d1..4f41be3fc8 100644 --- a/src/plugins/coreplugin/manhattanstyle.cpp +++ b/src/plugins/coreplugin/manhattanstyle.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/manhattanstyle.h b/src/plugins/coreplugin/manhattanstyle.h index f3ac4bf521..991d976a79 100644 --- a/src/plugins/coreplugin/manhattanstyle.h +++ b/src/plugins/coreplugin/manhattanstyle.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/messagemanager.cpp b/src/plugins/coreplugin/messagemanager.cpp index b8ef34afe8..081dfb6832 100644 --- a/src/plugins/coreplugin/messagemanager.cpp +++ b/src/plugins/coreplugin/messagemanager.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/messagemanager.h b/src/plugins/coreplugin/messagemanager.h index 8b638befea..6e28b0a7e3 100644 --- a/src/plugins/coreplugin/messagemanager.h +++ b/src/plugins/coreplugin/messagemanager.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/messageoutputwindow.cpp b/src/plugins/coreplugin/messageoutputwindow.cpp index 0cce9101d4..8833507ff5 100644 --- a/src/plugins/coreplugin/messageoutputwindow.cpp +++ b/src/plugins/coreplugin/messageoutputwindow.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/messageoutputwindow.h b/src/plugins/coreplugin/messageoutputwindow.h index 2e162453e3..44bf29ca1c 100644 --- a/src/plugins/coreplugin/messageoutputwindow.h +++ b/src/plugins/coreplugin/messageoutputwindow.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/mimedatabase.cpp b/src/plugins/coreplugin/mimedatabase.cpp index 26e6858c98..abca6a8e51 100644 --- a/src/plugins/coreplugin/mimedatabase.cpp +++ b/src/plugins/coreplugin/mimedatabase.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/mimedatabase.h b/src/plugins/coreplugin/mimedatabase.h index e15539c4af..2f43be45cd 100644 --- a/src/plugins/coreplugin/mimedatabase.h +++ b/src/plugins/coreplugin/mimedatabase.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/minisplitter.cpp b/src/plugins/coreplugin/minisplitter.cpp index 3acb5aed82..1270a9ccf3 100644 --- a/src/plugins/coreplugin/minisplitter.cpp +++ b/src/plugins/coreplugin/minisplitter.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/minisplitter.h b/src/plugins/coreplugin/minisplitter.h index c13539a539..0a2beaf17a 100644 --- a/src/plugins/coreplugin/minisplitter.h +++ b/src/plugins/coreplugin/minisplitter.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/modemanager.cpp b/src/plugins/coreplugin/modemanager.cpp index 31221a343c..2e1713d05f 100644 --- a/src/plugins/coreplugin/modemanager.cpp +++ b/src/plugins/coreplugin/modemanager.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/modemanager.h b/src/plugins/coreplugin/modemanager.h index cf415f13a8..d3b328c29e 100644 --- a/src/plugins/coreplugin/modemanager.h +++ b/src/plugins/coreplugin/modemanager.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/navigationwidget.cpp b/src/plugins/coreplugin/navigationwidget.cpp index c5189e60ef..9bbb4323d2 100644 --- a/src/plugins/coreplugin/navigationwidget.cpp +++ b/src/plugins/coreplugin/navigationwidget.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/navigationwidget.h b/src/plugins/coreplugin/navigationwidget.h index 7ab27e28dd..77dbf43ece 100644 --- a/src/plugins/coreplugin/navigationwidget.h +++ b/src/plugins/coreplugin/navigationwidget.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/outputpane.cpp b/src/plugins/coreplugin/outputpane.cpp index 11c0a1c4a0..b9cd825e24 100644 --- a/src/plugins/coreplugin/outputpane.cpp +++ b/src/plugins/coreplugin/outputpane.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/outputpane.h b/src/plugins/coreplugin/outputpane.h index ba838378ef..096567a8a6 100644 --- a/src/plugins/coreplugin/outputpane.h +++ b/src/plugins/coreplugin/outputpane.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/plugindialog.cpp b/src/plugins/coreplugin/plugindialog.cpp index 3855ddc6d2..829c28e9c3 100644 --- a/src/plugins/coreplugin/plugindialog.cpp +++ b/src/plugins/coreplugin/plugindialog.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/plugindialog.h b/src/plugins/coreplugin/plugindialog.h index d5e6e11597..c264978918 100644 --- a/src/plugins/coreplugin/plugindialog.h +++ b/src/plugins/coreplugin/plugindialog.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/progressmanager/futureprogress.cpp b/src/plugins/coreplugin/progressmanager/futureprogress.cpp index e47c3d8382..476a80a366 100644 --- a/src/plugins/coreplugin/progressmanager/futureprogress.cpp +++ b/src/plugins/coreplugin/progressmanager/futureprogress.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/progressmanager/futureprogress.h b/src/plugins/coreplugin/progressmanager/futureprogress.h index 22cef0ecc5..8b286dbf21 100644 --- a/src/plugins/coreplugin/progressmanager/futureprogress.h +++ b/src/plugins/coreplugin/progressmanager/futureprogress.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/progressmanager/progressmanager.cpp b/src/plugins/coreplugin/progressmanager/progressmanager.cpp index be851f5267..aaa5f4406c 100644 --- a/src/plugins/coreplugin/progressmanager/progressmanager.cpp +++ b/src/plugins/coreplugin/progressmanager/progressmanager.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/progressmanager/progressmanager.h b/src/plugins/coreplugin/progressmanager/progressmanager.h index 9844047127..7df78fe26b 100644 --- a/src/plugins/coreplugin/progressmanager/progressmanager.h +++ b/src/plugins/coreplugin/progressmanager/progressmanager.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/progressmanager/progressmanagerinterface.h b/src/plugins/coreplugin/progressmanager/progressmanagerinterface.h index 66d612d843..8bb55cc96d 100644 --- a/src/plugins/coreplugin/progressmanager/progressmanagerinterface.h +++ b/src/plugins/coreplugin/progressmanager/progressmanagerinterface.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/progressmanager/progresspie.cpp b/src/plugins/coreplugin/progressmanager/progresspie.cpp index f3aac39970..620b369c54 100644 --- a/src/plugins/coreplugin/progressmanager/progresspie.cpp +++ b/src/plugins/coreplugin/progressmanager/progresspie.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/progressmanager/progresspie.h b/src/plugins/coreplugin/progressmanager/progresspie.h index 787b838ada..1914b51b13 100644 --- a/src/plugins/coreplugin/progressmanager/progresspie.h +++ b/src/plugins/coreplugin/progressmanager/progresspie.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/progressmanager/progressview.cpp b/src/plugins/coreplugin/progressmanager/progressview.cpp index c589b4b689..a4e686d494 100644 --- a/src/plugins/coreplugin/progressmanager/progressview.cpp +++ b/src/plugins/coreplugin/progressmanager/progressview.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/progressmanager/progressview.h b/src/plugins/coreplugin/progressmanager/progressview.h index 39191c7708..455362009c 100644 --- a/src/plugins/coreplugin/progressmanager/progressview.h +++ b/src/plugins/coreplugin/progressmanager/progressview.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/rightpane.cpp b/src/plugins/coreplugin/rightpane.cpp index 1465164d18..389afbced9 100644 --- a/src/plugins/coreplugin/rightpane.cpp +++ b/src/plugins/coreplugin/rightpane.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/rightpane.h b/src/plugins/coreplugin/rightpane.h index c542c85f4c..84739ab4e6 100644 --- a/src/plugins/coreplugin/rightpane.h +++ b/src/plugins/coreplugin/rightpane.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/scriptmanager/metatypedeclarations.h b/src/plugins/coreplugin/scriptmanager/metatypedeclarations.h index aa4ab9a4f5..6431e42651 100644 --- a/src/plugins/coreplugin/scriptmanager/metatypedeclarations.h +++ b/src/plugins/coreplugin/scriptmanager/metatypedeclarations.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp b/src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp index 81e0f77b56..03809fdf30 100644 --- a/src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp +++ b/src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h b/src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h index 4efa9cc8a6..c7eae4a6ed 100644 --- a/src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h +++ b/src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/scriptmanager/scriptmanager.cpp b/src/plugins/coreplugin/scriptmanager/scriptmanager.cpp index a3761a17fe..084888c4dd 100644 --- a/src/plugins/coreplugin/scriptmanager/scriptmanager.cpp +++ b/src/plugins/coreplugin/scriptmanager/scriptmanager.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/scriptmanager/scriptmanager.h b/src/plugins/coreplugin/scriptmanager/scriptmanager.h index 06ef0ed3d6..305da45ca3 100644 --- a/src/plugins/coreplugin/scriptmanager/scriptmanager.h +++ b/src/plugins/coreplugin/scriptmanager/scriptmanager.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/scriptmanager/scriptmanagerinterface.h b/src/plugins/coreplugin/scriptmanager/scriptmanagerinterface.h index 22ed62af2b..df145822e2 100644 --- a/src/plugins/coreplugin/scriptmanager/scriptmanagerinterface.h +++ b/src/plugins/coreplugin/scriptmanager/scriptmanagerinterface.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/sidebar.cpp b/src/plugins/coreplugin/sidebar.cpp index 0ef66fc809..36f744769f 100644 --- a/src/plugins/coreplugin/sidebar.cpp +++ b/src/plugins/coreplugin/sidebar.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/sidebar.h b/src/plugins/coreplugin/sidebar.h index 566342fa4e..dd8e5727c1 100644 --- a/src/plugins/coreplugin/sidebar.h +++ b/src/plugins/coreplugin/sidebar.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/styleanimator.cpp b/src/plugins/coreplugin/styleanimator.cpp index 8ca453278b..fa8ccd93de 100644 --- a/src/plugins/coreplugin/styleanimator.cpp +++ b/src/plugins/coreplugin/styleanimator.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/styleanimator.h b/src/plugins/coreplugin/styleanimator.h index 24e137dfbe..f4b6e9f95c 100644 --- a/src/plugins/coreplugin/styleanimator.h +++ b/src/plugins/coreplugin/styleanimator.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/stylehelper.cpp b/src/plugins/coreplugin/stylehelper.cpp index 23769937bf..9fcb5180de 100644 --- a/src/plugins/coreplugin/stylehelper.cpp +++ b/src/plugins/coreplugin/stylehelper.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/stylehelper.h b/src/plugins/coreplugin/stylehelper.h index 2a3cf3f54b..ec46f9a1c5 100644 --- a/src/plugins/coreplugin/stylehelper.h +++ b/src/plugins/coreplugin/stylehelper.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/tabpositionindicator.cpp b/src/plugins/coreplugin/tabpositionindicator.cpp index 2a4a267adb..2de5da922b 100644 --- a/src/plugins/coreplugin/tabpositionindicator.cpp +++ b/src/plugins/coreplugin/tabpositionindicator.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/tabpositionindicator.h b/src/plugins/coreplugin/tabpositionindicator.h index 1434248305..4c5290596f 100644 --- a/src/plugins/coreplugin/tabpositionindicator.h +++ b/src/plugins/coreplugin/tabpositionindicator.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/uniqueidmanager.cpp b/src/plugins/coreplugin/uniqueidmanager.cpp index 6199180c7f..b06d6a7e59 100644 --- a/src/plugins/coreplugin/uniqueidmanager.cpp +++ b/src/plugins/coreplugin/uniqueidmanager.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/uniqueidmanager.h b/src/plugins/coreplugin/uniqueidmanager.h index e740ab8fe6..1aa8489685 100644 --- a/src/plugins/coreplugin/uniqueidmanager.h +++ b/src/plugins/coreplugin/uniqueidmanager.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/variablemanager.cpp b/src/plugins/coreplugin/variablemanager.cpp index 44263e044a..9a5c9dd783 100644 --- a/src/plugins/coreplugin/variablemanager.cpp +++ b/src/plugins/coreplugin/variablemanager.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/variablemanager.h b/src/plugins/coreplugin/variablemanager.h index a148551d9f..10a0efde9d 100644 --- a/src/plugins/coreplugin/variablemanager.h +++ b/src/plugins/coreplugin/variablemanager.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/vcsmanager.cpp b/src/plugins/coreplugin/vcsmanager.cpp index 5980879ab1..c2f18a0b1c 100644 --- a/src/plugins/coreplugin/vcsmanager.cpp +++ b/src/plugins/coreplugin/vcsmanager.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/vcsmanager.h b/src/plugins/coreplugin/vcsmanager.h index a3afca96d6..753db77380 100644 --- a/src/plugins/coreplugin/vcsmanager.h +++ b/src/plugins/coreplugin/vcsmanager.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/versiondialog.cpp b/src/plugins/coreplugin/versiondialog.cpp index e534a0d1ea..4fdb3166cf 100644 --- a/src/plugins/coreplugin/versiondialog.cpp +++ b/src/plugins/coreplugin/versiondialog.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/versiondialog.h b/src/plugins/coreplugin/versiondialog.h index d53adab9ab..c7ba26db0e 100644 --- a/src/plugins/coreplugin/versiondialog.h +++ b/src/plugins/coreplugin/versiondialog.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/viewmanager.cpp b/src/plugins/coreplugin/viewmanager.cpp index b7b59f048a..5032d45b4d 100644 --- a/src/plugins/coreplugin/viewmanager.cpp +++ b/src/plugins/coreplugin/viewmanager.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/viewmanager.h b/src/plugins/coreplugin/viewmanager.h index 2405b57666..c22e68d891 100644 --- a/src/plugins/coreplugin/viewmanager.h +++ b/src/plugins/coreplugin/viewmanager.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/viewmanagerinterface.h b/src/plugins/coreplugin/viewmanagerinterface.h index ddff06984a..0eb21187cc 100644 --- a/src/plugins/coreplugin/viewmanagerinterface.h +++ b/src/plugins/coreplugin/viewmanagerinterface.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/welcomemode.cpp b/src/plugins/coreplugin/welcomemode.cpp index e90a4db6bb..be5dd62429 100644 --- a/src/plugins/coreplugin/welcomemode.cpp +++ b/src/plugins/coreplugin/welcomemode.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/coreplugin/welcomemode.h b/src/plugins/coreplugin/welcomemode.h index f69b8226a7..05ba96c3ee 100644 --- a/src/plugins/coreplugin/welcomemode.h +++ b/src/plugins/coreplugin/welcomemode.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/cpaster/CodePaster.pluginspec b/src/plugins/cpaster/CodePaster.pluginspec index 7a1be0b876..7f3e1261af 100644 --- a/src/plugins/cpaster/CodePaster.pluginspec +++ b/src/plugins/cpaster/CodePaster.pluginspec @@ -1,7 +1,7 @@ <plugin name="CodePaster" version="0.9.1" compatVersion="0.9.1"> <vendor>Nokia Corporation</vendor> <copyright>(C) 2008 Nokia Corporation</copyright> - <license>Nokia Technology Preview License Agreement</license> + <license>Nokia Beta Version License</license> <description>Codepaster plugin for pushing/fetching diff from server</description> <url>http://www.trolltech.com/</url> <dependencyList> diff --git a/src/plugins/cpaster/cpasterplugin.cpp b/src/plugins/cpaster/cpasterplugin.cpp index 2a48088918..548c48be7d 100644 --- a/src/plugins/cpaster/cpasterplugin.cpp +++ b/src/plugins/cpaster/cpasterplugin.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/cpaster/cpasterplugin.h b/src/plugins/cpaster/cpasterplugin.h index 3231fe48d9..9940df0840 100644 --- a/src/plugins/cpaster/cpasterplugin.h +++ b/src/plugins/cpaster/cpasterplugin.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/cpaster/settingspage.cpp b/src/plugins/cpaster/settingspage.cpp index cc4d911725..af35e7e576 100644 --- a/src/plugins/cpaster/settingspage.cpp +++ b/src/plugins/cpaster/settingspage.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/cpaster/settingspage.h b/src/plugins/cpaster/settingspage.h index 9830b97cca..9f2b4b25f7 100644 --- a/src/plugins/cpaster/settingspage.h +++ b/src/plugins/cpaster/settingspage.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/cppeditor/CppEditor.pluginspec b/src/plugins/cppeditor/CppEditor.pluginspec index 119f0461a6..992f655d95 100644 --- a/src/plugins/cppeditor/CppEditor.pluginspec +++ b/src/plugins/cppeditor/CppEditor.pluginspec @@ -1,7 +1,7 @@ <plugin name="CppEditor" version="0.9.1" compatVersion="0.9.1"> <vendor>Nokia Corporation</vendor> <copyright>(C) 2008 Nokia Corporation</copyright> - <license>Nokia Technology Preview License Agreement</license> + <license>Nokia Beta Version License</license> <description>C/C++ editor component.</description> <url>http://www.trolltech.com/</url> <dependencyList> diff --git a/src/plugins/cppeditor/CppEditor.tpa b/src/plugins/cppeditor/CppEditor.tpa deleted file mode 100644 index 17e530152a..0000000000 --- a/src/plugins/cppeditor/CppEditor.tpa +++ /dev/null @@ -1,16 +0,0 @@ -<tpa> - <pluginName>CppEditor</pluginName> - <author>Trolltech AS</author> - <version>1.0</version> - <extendsInterfaceList> - <extendsInterface> - <name>EditorFactoryInterface</name> - </extendsInterface> - <extendsInterface> - <name>WizardInterface</name> - </extendsInterface> - <extendsInterface> - <name>OptionsPageInterface</name> - </extendsInterface> - </extendsInterfaceList> -</tpa> diff --git a/src/plugins/cppeditor/cppclasswizard.cpp b/src/plugins/cppeditor/cppclasswizard.cpp index 7babfc45ad..4ecb56b884 100644 --- a/src/plugins/cppeditor/cppclasswizard.cpp +++ b/src/plugins/cppeditor/cppclasswizard.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/cppeditor/cppclasswizard.h b/src/plugins/cppeditor/cppclasswizard.h index b0850d6928..177d8a1fbb 100644 --- a/src/plugins/cppeditor/cppclasswizard.h +++ b/src/plugins/cppeditor/cppclasswizard.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp index 1feece042d..f97106a1c4 100644 --- a/src/plugins/cppeditor/cppeditor.cpp +++ b/src/plugins/cppeditor/cppeditor.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/cppeditor/cppeditor.h b/src/plugins/cppeditor/cppeditor.h index 2dd88d3499..3667b5d6f7 100644 --- a/src/plugins/cppeditor/cppeditor.h +++ b/src/plugins/cppeditor/cppeditor.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/cppeditor/cppeditor_global.h b/src/plugins/cppeditor/cppeditor_global.h index 68adb513b6..c1d8f32db7 100644 --- a/src/plugins/cppeditor/cppeditor_global.h +++ b/src/plugins/cppeditor/cppeditor_global.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/cppeditor/cppeditoractionhandler.cpp b/src/plugins/cppeditor/cppeditoractionhandler.cpp index f68a1cd1c0..4eb4543a67 100644 --- a/src/plugins/cppeditor/cppeditoractionhandler.cpp +++ b/src/plugins/cppeditor/cppeditoractionhandler.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/cppeditor/cppeditoractionhandler.h b/src/plugins/cppeditor/cppeditoractionhandler.h index a3514fa60b..6a0391c1e8 100644 --- a/src/plugins/cppeditor/cppeditoractionhandler.h +++ b/src/plugins/cppeditor/cppeditoractionhandler.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/cppeditor/cppeditorconstants.h b/src/plugins/cppeditor/cppeditorconstants.h index a89d69f5b5..96359b0bb6 100644 --- a/src/plugins/cppeditor/cppeditorconstants.h +++ b/src/plugins/cppeditor/cppeditorconstants.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/cppeditor/cppeditorenums.h b/src/plugins/cppeditor/cppeditorenums.h index f8e3dbe781..07398bac9d 100644 --- a/src/plugins/cppeditor/cppeditorenums.h +++ b/src/plugins/cppeditor/cppeditorenums.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/cppeditor/cppfilewizard.cpp b/src/plugins/cppeditor/cppfilewizard.cpp index d5f834b91f..df464aa576 100644 --- a/src/plugins/cppeditor/cppfilewizard.cpp +++ b/src/plugins/cppeditor/cppfilewizard.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/cppeditor/cppfilewizard.h b/src/plugins/cppeditor/cppfilewizard.h index 1e2e0b3324..adb94d911f 100644 --- a/src/plugins/cppeditor/cppfilewizard.h +++ b/src/plugins/cppeditor/cppfilewizard.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/cppeditor/cpphighlighter.cpp b/src/plugins/cppeditor/cpphighlighter.cpp index e8b804321a..0eb3b67e69 100644 --- a/src/plugins/cppeditor/cpphighlighter.cpp +++ b/src/plugins/cppeditor/cpphighlighter.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/cppeditor/cpphighlighter.h b/src/plugins/cppeditor/cpphighlighter.h index 0e31dc466b..3df54c26ac 100644 --- a/src/plugins/cppeditor/cpphighlighter.h +++ b/src/plugins/cppeditor/cpphighlighter.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/cppeditor/cpphoverhandler.cpp b/src/plugins/cppeditor/cpphoverhandler.cpp index 439fc2ad96..3ffff7701d 100644 --- a/src/plugins/cppeditor/cpphoverhandler.cpp +++ b/src/plugins/cppeditor/cpphoverhandler.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/cppeditor/cppplugin.cpp b/src/plugins/cppeditor/cppplugin.cpp index 4031f80439..c30bc97f29 100644 --- a/src/plugins/cppeditor/cppplugin.cpp +++ b/src/plugins/cppeditor/cppplugin.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/cppeditor/cppplugin.h b/src/plugins/cppeditor/cppplugin.h index 91ccafcdb2..42dae09c6f 100644 --- a/src/plugins/cppeditor/cppplugin.h +++ b/src/plugins/cppeditor/cppplugin.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/cpptools/CppTools.pluginspec b/src/plugins/cpptools/CppTools.pluginspec index ca4a8a0e52..08690446e2 100644 --- a/src/plugins/cpptools/CppTools.pluginspec +++ b/src/plugins/cpptools/CppTools.pluginspec @@ -1,7 +1,7 @@ <plugin name="CppTools" version="0.9.1" compatVersion="0.9.1"> <vendor>Nokia Corporation</vendor> <copyright>(C) 2008 Nokia Corporation</copyright> - <license>Nokia Technology Preview License Agreement</license> + <license>Nokia Beta Version License</license> <description>Tools for analyzing C/C++ code.</description> <url>http://www.trolltech.com/</url> <dependencyList> diff --git a/src/plugins/cpptools/cppclassesfilter.cpp b/src/plugins/cpptools/cppclassesfilter.cpp index 6aa6734fca..04c3bffd87 100644 --- a/src/plugins/cpptools/cppclassesfilter.cpp +++ b/src/plugins/cpptools/cppclassesfilter.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/cpptools/cppclassesfilter.h b/src/plugins/cpptools/cppclassesfilter.h index ba936eab86..9cf52ac682 100644 --- a/src/plugins/cpptools/cppclassesfilter.h +++ b/src/plugins/cpptools/cppclassesfilter.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/cpptools/cppcodecompletion.cpp b/src/plugins/cpptools/cppcodecompletion.cpp index 09d950a305..1e54a2ae09 100644 --- a/src/plugins/cpptools/cppcodecompletion.cpp +++ b/src/plugins/cpptools/cppcodecompletion.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/cpptools/cppcodecompletion.h b/src/plugins/cpptools/cppcodecompletion.h index 57f9983e0c..baf278e71d 100644 --- a/src/plugins/cpptools/cppcodecompletion.h +++ b/src/plugins/cpptools/cppcodecompletion.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/cpptools/cppfunctionsfilter.cpp b/src/plugins/cpptools/cppfunctionsfilter.cpp index 61bb8e2d00..3bf2137dff 100644 --- a/src/plugins/cpptools/cppfunctionsfilter.cpp +++ b/src/plugins/cpptools/cppfunctionsfilter.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/cpptools/cppfunctionsfilter.h b/src/plugins/cpptools/cppfunctionsfilter.h index 6e48d65b26..f8476001d7 100644 --- a/src/plugins/cpptools/cppfunctionsfilter.h +++ b/src/plugins/cpptools/cppfunctionsfilter.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp index bc5d72c097..6dad51a643 100644 --- a/src/plugins/cpptools/cppmodelmanager.cpp +++ b/src/plugins/cpptools/cppmodelmanager.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/cpptools/cppmodelmanager.h b/src/plugins/cpptools/cppmodelmanager.h index 990d019ad7..570ee58f45 100644 --- a/src/plugins/cpptools/cppmodelmanager.h +++ b/src/plugins/cpptools/cppmodelmanager.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/cpptools/cppmodelmanagerinterface.h b/src/plugins/cpptools/cppmodelmanagerinterface.h index 6dc0da67ca..0247c9c514 100644 --- a/src/plugins/cpptools/cppmodelmanagerinterface.h +++ b/src/plugins/cpptools/cppmodelmanagerinterface.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/cpptools/cppquickopenfilter.cpp b/src/plugins/cpptools/cppquickopenfilter.cpp index ac69c9cc6d..03bd8d78bb 100644 --- a/src/plugins/cpptools/cppquickopenfilter.cpp +++ b/src/plugins/cpptools/cppquickopenfilter.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/cpptools/cppquickopenfilter.h b/src/plugins/cpptools/cppquickopenfilter.h index 12eaacb3f9..b867194f68 100644 --- a/src/plugins/cpptools/cppquickopenfilter.h +++ b/src/plugins/cpptools/cppquickopenfilter.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/cpptools/cpptools_global.h b/src/plugins/cpptools/cpptools_global.h index bbb7b0c764..7b63a15b81 100644 --- a/src/plugins/cpptools/cpptools_global.h +++ b/src/plugins/cpptools/cpptools_global.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/cpptools/cpptoolsconstants.h b/src/plugins/cpptools/cpptoolsconstants.h index 0eadabbd4a..8279eef501 100644 --- a/src/plugins/cpptools/cpptoolsconstants.h +++ b/src/plugins/cpptools/cpptoolsconstants.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/cpptools/cpptoolseditorsupport.cpp b/src/plugins/cpptools/cpptoolseditorsupport.cpp index fbca4c1a07..73e34e4113 100644 --- a/src/plugins/cpptools/cpptoolseditorsupport.cpp +++ b/src/plugins/cpptools/cpptoolseditorsupport.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/cpptools/cpptoolseditorsupport.h b/src/plugins/cpptools/cpptoolseditorsupport.h index 4fb6c14071..042e5dcd1c 100644 --- a/src/plugins/cpptools/cpptoolseditorsupport.h +++ b/src/plugins/cpptools/cpptoolseditorsupport.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/cpptools/cpptoolsplugin.cpp b/src/plugins/cpptools/cpptoolsplugin.cpp index 764fc250b0..4195fbee33 100644 --- a/src/plugins/cpptools/cpptoolsplugin.cpp +++ b/src/plugins/cpptools/cpptoolsplugin.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/cpptools/cpptoolsplugin.h b/src/plugins/cpptools/cpptoolsplugin.h index 8760e6a66f..39af36e86f 100644 --- a/src/plugins/cpptools/cpptoolsplugin.h +++ b/src/plugins/cpptools/cpptoolsplugin.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/cpptools/searchsymbols.cpp b/src/plugins/cpptools/searchsymbols.cpp index 2669ea7bc7..1d555fd626 100644 --- a/src/plugins/cpptools/searchsymbols.cpp +++ b/src/plugins/cpptools/searchsymbols.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/cpptools/searchsymbols.h b/src/plugins/cpptools/searchsymbols.h index 494455f6d8..e3cba1f30f 100644 --- a/src/plugins/cpptools/searchsymbols.h +++ b/src/plugins/cpptools/searchsymbols.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/debugger/Debugger.pluginspec b/src/plugins/debugger/Debugger.pluginspec index d68c17517e..399ac3c231 100644 --- a/src/plugins/debugger/Debugger.pluginspec +++ b/src/plugins/debugger/Debugger.pluginspec @@ -1,7 +1,7 @@ <plugin name="Debugger" version="0.9.1" compatVersion="0.9.1"> <vendor>Nokia Corporation</vendor> <copyright>(C) 2008 Nokia Corporation</copyright> - <license>Nokia Technology Preview License Agreement</license> + <license>Nokia Beta Version License</license> <description>Debugger integration.</description> <url>http://www.trolltech.com/</url> <dependencyList> diff --git a/src/plugins/debugger/attachexternaldialog.cpp b/src/plugins/debugger/attachexternaldialog.cpp index f5d2101cc9..c60130e656 100644 --- a/src/plugins/debugger/attachexternaldialog.cpp +++ b/src/plugins/debugger/attachexternaldialog.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/debugger/attachexternaldialog.h b/src/plugins/debugger/attachexternaldialog.h index b64691ef80..4970fa7925 100644 --- a/src/plugins/debugger/attachexternaldialog.h +++ b/src/plugins/debugger/attachexternaldialog.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/debugger/attachremotedialog.cpp b/src/plugins/debugger/attachremotedialog.cpp index a409ceba03..ffe2117423 100644 --- a/src/plugins/debugger/attachremotedialog.cpp +++ b/src/plugins/debugger/attachremotedialog.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/debugger/attachremotedialog.h b/src/plugins/debugger/attachremotedialog.h index 00177c89f2..5e0bee9349 100644 --- a/src/plugins/debugger/attachremotedialog.h +++ b/src/plugins/debugger/attachremotedialog.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp index e27aa5ec41..7f8d48da73 100644 --- a/src/plugins/debugger/breakhandler.cpp +++ b/src/plugins/debugger/breakhandler.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/debugger/breakhandler.h b/src/plugins/debugger/breakhandler.h index 95743f6df5..9d4c82ec20 100644 --- a/src/plugins/debugger/breakhandler.h +++ b/src/plugins/debugger/breakhandler.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/debugger/breakwindow.cpp b/src/plugins/debugger/breakwindow.cpp index d393a3b21c..c287f69dea 100644 --- a/src/plugins/debugger/breakwindow.cpp +++ b/src/plugins/debugger/breakwindow.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/debugger/breakwindow.h b/src/plugins/debugger/breakwindow.h index 8b45c8f121..1db2175e8b 100644 --- a/src/plugins/debugger/breakwindow.h +++ b/src/plugins/debugger/breakwindow.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/debugger/debuggerconstants.h b/src/plugins/debugger/debuggerconstants.h index a94fff8b59..5215870976 100644 --- a/src/plugins/debugger/debuggerconstants.h +++ b/src/plugins/debugger/debuggerconstants.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/debugger/debuggermanager.cpp b/src/plugins/debugger/debuggermanager.cpp index 4981f19979..ae32033b0d 100644 --- a/src/plugins/debugger/debuggermanager.cpp +++ b/src/plugins/debugger/debuggermanager.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/debugger/debuggermanager.h b/src/plugins/debugger/debuggermanager.h index 64dee6957f..4ae7e66a87 100644 --- a/src/plugins/debugger/debuggermanager.h +++ b/src/plugins/debugger/debuggermanager.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/debugger/debuggeroutputwindow.cpp b/src/plugins/debugger/debuggeroutputwindow.cpp index cfcd8df36d..6818ee9620 100644 --- a/src/plugins/debugger/debuggeroutputwindow.cpp +++ b/src/plugins/debugger/debuggeroutputwindow.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/debugger/debuggeroutputwindow.h b/src/plugins/debugger/debuggeroutputwindow.h index 0b2fd53fd5..d530d501e4 100644 --- a/src/plugins/debugger/debuggeroutputwindow.h +++ b/src/plugins/debugger/debuggeroutputwindow.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index 0d0cf13c62..0f50ea461a 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/debugger/debuggerplugin.h b/src/plugins/debugger/debuggerplugin.h index ebf12b5e12..6dbc64ee74 100644 --- a/src/plugins/debugger/debuggerplugin.h +++ b/src/plugins/debugger/debuggerplugin.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/debugger/debuggerrunner.cpp b/src/plugins/debugger/debuggerrunner.cpp index ddf21ad652..e3e8728fde 100644 --- a/src/plugins/debugger/debuggerrunner.cpp +++ b/src/plugins/debugger/debuggerrunner.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/debugger/debuggerrunner.h b/src/plugins/debugger/debuggerrunner.h index 8b9c6ce2b1..94ccddf8d1 100644 --- a/src/plugins/debugger/debuggerrunner.h +++ b/src/plugins/debugger/debuggerrunner.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/debugger/disassemblerhandler.cpp b/src/plugins/debugger/disassemblerhandler.cpp index 2ab255b29a..c3ddd5fa50 100644 --- a/src/plugins/debugger/disassemblerhandler.cpp +++ b/src/plugins/debugger/disassemblerhandler.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/debugger/disassemblerhandler.h b/src/plugins/debugger/disassemblerhandler.h index f5f6e1c440..0074be9217 100644 --- a/src/plugins/debugger/disassemblerhandler.h +++ b/src/plugins/debugger/disassemblerhandler.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/debugger/disassemblerwindow.cpp b/src/plugins/debugger/disassemblerwindow.cpp index 2a3dc7a99a..f23cd1b7a9 100644 --- a/src/plugins/debugger/disassemblerwindow.cpp +++ b/src/plugins/debugger/disassemblerwindow.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/debugger/disassemblerwindow.h b/src/plugins/debugger/disassemblerwindow.h index 7e2e91fc84..28b49eb93d 100644 --- a/src/plugins/debugger/disassemblerwindow.h +++ b/src/plugins/debugger/disassemblerwindow.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/debugger/gdbengine.cpp b/src/plugins/debugger/gdbengine.cpp index 5f7367b2e4..710bee9aee 100644 --- a/src/plugins/debugger/gdbengine.cpp +++ b/src/plugins/debugger/gdbengine.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/debugger/gdbengine.h b/src/plugins/debugger/gdbengine.h index 6b3cbb15fe..434a110a45 100644 --- a/src/plugins/debugger/gdbengine.h +++ b/src/plugins/debugger/gdbengine.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/debugger/gdbmi.cpp b/src/plugins/debugger/gdbmi.cpp index f14bb752e3..5f20b21731 100644 --- a/src/plugins/debugger/gdbmi.cpp +++ b/src/plugins/debugger/gdbmi.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/debugger/gdbmi.h b/src/plugins/debugger/gdbmi.h index f5395b555d..dbe2ef73c3 100644 --- a/src/plugins/debugger/gdbmi.h +++ b/src/plugins/debugger/gdbmi.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/debugger/gdboptionpage.cpp b/src/plugins/debugger/gdboptionpage.cpp index 7d6742e958..efbb959fcf 100644 --- a/src/plugins/debugger/gdboptionpage.cpp +++ b/src/plugins/debugger/gdboptionpage.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/debugger/gdboptionpage.h b/src/plugins/debugger/gdboptionpage.h index d306e03e20..bb48d9e349 100644 --- a/src/plugins/debugger/gdboptionpage.h +++ b/src/plugins/debugger/gdboptionpage.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/debugger/gdbtypemacros.cpp b/src/plugins/debugger/gdbtypemacros.cpp index 89178af268..26d7aebf44 100644 --- a/src/plugins/debugger/gdbtypemacros.cpp +++ b/src/plugins/debugger/gdbtypemacros.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/debugger/idebuggerengine.h b/src/plugins/debugger/idebuggerengine.h index 8c7f2d2b2e..5ab4ce066b 100644 --- a/src/plugins/debugger/idebuggerengine.h +++ b/src/plugins/debugger/idebuggerengine.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/debugger/imports.h b/src/plugins/debugger/imports.h index f780f31300..644067d4f3 100644 --- a/src/plugins/debugger/imports.h +++ b/src/plugins/debugger/imports.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/debugger/mode.cpp b/src/plugins/debugger/mode.cpp index 234f09c207..4499414858 100644 --- a/src/plugins/debugger/mode.cpp +++ b/src/plugins/debugger/mode.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/debugger/mode.h b/src/plugins/debugger/mode.h index 8aa2c69bbf..2d64ca6f07 100644 --- a/src/plugins/debugger/mode.h +++ b/src/plugins/debugger/mode.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/debugger/moduleshandler.cpp b/src/plugins/debugger/moduleshandler.cpp index 80d9060f7b..782fb6f9f7 100644 --- a/src/plugins/debugger/moduleshandler.cpp +++ b/src/plugins/debugger/moduleshandler.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/debugger/moduleshandler.h b/src/plugins/debugger/moduleshandler.h index efd8aa9a49..9c7a3570b7 100644 --- a/src/plugins/debugger/moduleshandler.h +++ b/src/plugins/debugger/moduleshandler.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/debugger/moduleswindow.cpp b/src/plugins/debugger/moduleswindow.cpp index 3ae127a034..1e2d2c492c 100644 --- a/src/plugins/debugger/moduleswindow.cpp +++ b/src/plugins/debugger/moduleswindow.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/debugger/moduleswindow.h b/src/plugins/debugger/moduleswindow.h index 1d9309c0bb..e2b9b57e56 100644 --- a/src/plugins/debugger/moduleswindow.h +++ b/src/plugins/debugger/moduleswindow.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/debugger/procinterrupt.cpp b/src/plugins/debugger/procinterrupt.cpp index c227de81ce..801dbbc8dc 100644 --- a/src/plugins/debugger/procinterrupt.cpp +++ b/src/plugins/debugger/procinterrupt.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/debugger/procinterrupt.h b/src/plugins/debugger/procinterrupt.h index 960b6e0021..9af88d3357 100644 --- a/src/plugins/debugger/procinterrupt.h +++ b/src/plugins/debugger/procinterrupt.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/debugger/registerhandler.cpp b/src/plugins/debugger/registerhandler.cpp index 09beeb006f..b37fe752e8 100644 --- a/src/plugins/debugger/registerhandler.cpp +++ b/src/plugins/debugger/registerhandler.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/debugger/registerhandler.h b/src/plugins/debugger/registerhandler.h index b80a9122a9..0b580d22d9 100644 --- a/src/plugins/debugger/registerhandler.h +++ b/src/plugins/debugger/registerhandler.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/debugger/registerwindow.cpp b/src/plugins/debugger/registerwindow.cpp index 0a9aac613e..1721aa09fb 100644 --- a/src/plugins/debugger/registerwindow.cpp +++ b/src/plugins/debugger/registerwindow.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/debugger/registerwindow.h b/src/plugins/debugger/registerwindow.h index 00629b2077..773ee93108 100644 --- a/src/plugins/debugger/registerwindow.h +++ b/src/plugins/debugger/registerwindow.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/debugger/scriptengine.cpp b/src/plugins/debugger/scriptengine.cpp index e6387bfdda..14b0d8a49d 100644 --- a/src/plugins/debugger/scriptengine.cpp +++ b/src/plugins/debugger/scriptengine.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/debugger/scriptengine.h b/src/plugins/debugger/scriptengine.h index 1c160a1ea3..8330826ef8 100644 --- a/src/plugins/debugger/scriptengine.h +++ b/src/plugins/debugger/scriptengine.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/debugger/stackhandler.cpp b/src/plugins/debugger/stackhandler.cpp index fd70e1e1ab..85abf6f748 100644 --- a/src/plugins/debugger/stackhandler.cpp +++ b/src/plugins/debugger/stackhandler.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/debugger/stackhandler.h b/src/plugins/debugger/stackhandler.h index 16d77583af..53c941881e 100644 --- a/src/plugins/debugger/stackhandler.h +++ b/src/plugins/debugger/stackhandler.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/debugger/stackwindow.cpp b/src/plugins/debugger/stackwindow.cpp index a079b54c13..2ef86a3d3b 100644 --- a/src/plugins/debugger/stackwindow.cpp +++ b/src/plugins/debugger/stackwindow.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/debugger/stackwindow.h b/src/plugins/debugger/stackwindow.h index f1dffcf7b7..7955b7f4eb 100644 --- a/src/plugins/debugger/stackwindow.h +++ b/src/plugins/debugger/stackwindow.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/debugger/startexternaldialog.cpp b/src/plugins/debugger/startexternaldialog.cpp index cca92ff3a3..b8a5a59691 100644 --- a/src/plugins/debugger/startexternaldialog.cpp +++ b/src/plugins/debugger/startexternaldialog.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/debugger/startexternaldialog.h b/src/plugins/debugger/startexternaldialog.h index b71a514776..3cfe4c5420 100644 --- a/src/plugins/debugger/startexternaldialog.h +++ b/src/plugins/debugger/startexternaldialog.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/debugger/threadswindow.cpp b/src/plugins/debugger/threadswindow.cpp index 354f1cba3e..99cb74d93b 100644 --- a/src/plugins/debugger/threadswindow.cpp +++ b/src/plugins/debugger/threadswindow.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/debugger/threadswindow.h b/src/plugins/debugger/threadswindow.h index 7d4f6c59b0..373bb0804e 100644 --- a/src/plugins/debugger/threadswindow.h +++ b/src/plugins/debugger/threadswindow.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp index 5328a171ae..59e37f2acb 100644 --- a/src/plugins/debugger/watchhandler.cpp +++ b/src/plugins/debugger/watchhandler.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/debugger/watchhandler.h b/src/plugins/debugger/watchhandler.h index f27e167dc1..4ac2218a47 100644 --- a/src/plugins/debugger/watchhandler.h +++ b/src/plugins/debugger/watchhandler.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/debugger/watchwindow.cpp b/src/plugins/debugger/watchwindow.cpp index f49b7073ae..fae7353bc4 100644 --- a/src/plugins/debugger/watchwindow.cpp +++ b/src/plugins/debugger/watchwindow.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/debugger/watchwindow.h b/src/plugins/debugger/watchwindow.h index c292bebb5f..4b38b5eb4a 100644 --- a/src/plugins/debugger/watchwindow.h +++ b/src/plugins/debugger/watchwindow.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/designer/Designer.pluginspec b/src/plugins/designer/Designer.pluginspec index d1df125dbe..bc57324c4f 100644 --- a/src/plugins/designer/Designer.pluginspec +++ b/src/plugins/designer/Designer.pluginspec @@ -1,7 +1,7 @@ <plugin name="Designer" version="0.9.1" compatVersion="0.9.1"> <vendor>Nokia Corporation</vendor> <copyright>(C) 2008 Nokia Corporation</copyright> - <license>Nokia Technology Preview License Agreement</license> + <license>Nokia Beta Version License</license> <description>Qt Designer integration.</description> <url>http://www.trolltech.com/</url> <dependencyList> diff --git a/src/plugins/designer/cpp/formclasswizard.cpp b/src/plugins/designer/cpp/formclasswizard.cpp index d1ce928547..be21968a58 100644 --- a/src/plugins/designer/cpp/formclasswizard.cpp +++ b/src/plugins/designer/cpp/formclasswizard.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/designer/cpp/formclasswizard.h b/src/plugins/designer/cpp/formclasswizard.h index 749ab86137..028ed199cc 100644 --- a/src/plugins/designer/cpp/formclasswizard.h +++ b/src/plugins/designer/cpp/formclasswizard.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/designer/cpp/formclasswizarddialog.cpp b/src/plugins/designer/cpp/formclasswizarddialog.cpp index 345309d45c..3250961d63 100644 --- a/src/plugins/designer/cpp/formclasswizarddialog.cpp +++ b/src/plugins/designer/cpp/formclasswizarddialog.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/designer/cpp/formclasswizarddialog.h b/src/plugins/designer/cpp/formclasswizarddialog.h index cdb1f60d17..f4f3d947cc 100644 --- a/src/plugins/designer/cpp/formclasswizarddialog.h +++ b/src/plugins/designer/cpp/formclasswizarddialog.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/designer/cpp/formclasswizardpage.cpp b/src/plugins/designer/cpp/formclasswizardpage.cpp index eac7271b40..3a0e006592 100644 --- a/src/plugins/designer/cpp/formclasswizardpage.cpp +++ b/src/plugins/designer/cpp/formclasswizardpage.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/designer/cpp/formclasswizardpage.h b/src/plugins/designer/cpp/formclasswizardpage.h index c0b53040c6..b5270fa42d 100644 --- a/src/plugins/designer/cpp/formclasswizardpage.h +++ b/src/plugins/designer/cpp/formclasswizardpage.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/designer/cpp/formclasswizardparameters.cpp b/src/plugins/designer/cpp/formclasswizardparameters.cpp index 10dda881db..19fdd7f352 100644 --- a/src/plugins/designer/cpp/formclasswizardparameters.cpp +++ b/src/plugins/designer/cpp/formclasswizardparameters.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/designer/cpp/formclasswizardparameters.h b/src/plugins/designer/cpp/formclasswizardparameters.h index d72b8c5c2c..169ff2446b 100644 --- a/src/plugins/designer/cpp/formclasswizardparameters.h +++ b/src/plugins/designer/cpp/formclasswizardparameters.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/designer/designerconstants.h b/src/plugins/designer/designerconstants.h index 2a30a8ea4f..f2458816d2 100644 --- a/src/plugins/designer/designerconstants.h +++ b/src/plugins/designer/designerconstants.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/designer/editorwidget.cpp b/src/plugins/designer/editorwidget.cpp index 794db9e0cb..a6654411ac 100644 --- a/src/plugins/designer/editorwidget.cpp +++ b/src/plugins/designer/editorwidget.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/designer/editorwidget.h b/src/plugins/designer/editorwidget.h index a687f714c5..e144f48698 100644 --- a/src/plugins/designer/editorwidget.h +++ b/src/plugins/designer/editorwidget.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/designer/formeditorfactory.cpp b/src/plugins/designer/formeditorfactory.cpp index 4c69966fdf..684ad07e8a 100644 --- a/src/plugins/designer/formeditorfactory.cpp +++ b/src/plugins/designer/formeditorfactory.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/designer/formeditorfactory.h b/src/plugins/designer/formeditorfactory.h index ae565f70c3..8de03dc4e5 100644 --- a/src/plugins/designer/formeditorfactory.h +++ b/src/plugins/designer/formeditorfactory.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/designer/formeditorplugin.cpp b/src/plugins/designer/formeditorplugin.cpp index 0c3dbb4d6e..3f1895e0fe 100644 --- a/src/plugins/designer/formeditorplugin.cpp +++ b/src/plugins/designer/formeditorplugin.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/designer/formeditorplugin.h b/src/plugins/designer/formeditorplugin.h index 9967cf3984..fdcdfdb84f 100644 --- a/src/plugins/designer/formeditorplugin.h +++ b/src/plugins/designer/formeditorplugin.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/designer/formeditorw.cpp b/src/plugins/designer/formeditorw.cpp index 01f159f991..b0274ad27e 100644 --- a/src/plugins/designer/formeditorw.cpp +++ b/src/plugins/designer/formeditorw.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/designer/formeditorw.h b/src/plugins/designer/formeditorw.h index 5eb0348bc8..8263fbb622 100644 --- a/src/plugins/designer/formeditorw.h +++ b/src/plugins/designer/formeditorw.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/designer/formtemplatewizardpage.cpp b/src/plugins/designer/formtemplatewizardpage.cpp index 1d57381796..e6ed5a1da5 100644 --- a/src/plugins/designer/formtemplatewizardpage.cpp +++ b/src/plugins/designer/formtemplatewizardpage.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/designer/formtemplatewizardpage.h b/src/plugins/designer/formtemplatewizardpage.h index 93bd4bcf42..d123b52998 100644 --- a/src/plugins/designer/formtemplatewizardpage.h +++ b/src/plugins/designer/formtemplatewizardpage.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/designer/formwindoweditor.cpp b/src/plugins/designer/formwindoweditor.cpp index 86c69dd51a..9bc3340299 100644 --- a/src/plugins/designer/formwindoweditor.cpp +++ b/src/plugins/designer/formwindoweditor.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/designer/formwindoweditor.h b/src/plugins/designer/formwindoweditor.h index dbeaeae2fd..518f3e6348 100644 --- a/src/plugins/designer/formwindoweditor.h +++ b/src/plugins/designer/formwindoweditor.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/designer/formwindowfile.cpp b/src/plugins/designer/formwindowfile.cpp index c7681848ae..b5a145736d 100644 --- a/src/plugins/designer/formwindowfile.cpp +++ b/src/plugins/designer/formwindowfile.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/designer/formwindowfile.h b/src/plugins/designer/formwindowfile.h index 8425d56e05..54468c388f 100644 --- a/src/plugins/designer/formwindowfile.h +++ b/src/plugins/designer/formwindowfile.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/designer/formwindowhost.cpp b/src/plugins/designer/formwindowhost.cpp index 5cbc5c882d..c54ed91142 100644 --- a/src/plugins/designer/formwindowhost.cpp +++ b/src/plugins/designer/formwindowhost.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/designer/formwindowhost.h b/src/plugins/designer/formwindowhost.h index 8f0bc17aa6..fc31d65847 100644 --- a/src/plugins/designer/formwindowhost.h +++ b/src/plugins/designer/formwindowhost.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/designer/formwizard.cpp b/src/plugins/designer/formwizard.cpp index 0aa877f05b..5c3f84a834 100644 --- a/src/plugins/designer/formwizard.cpp +++ b/src/plugins/designer/formwizard.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/designer/formwizard.h b/src/plugins/designer/formwizard.h index 7eb53a629f..e4274a8a7b 100644 --- a/src/plugins/designer/formwizard.h +++ b/src/plugins/designer/formwizard.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/designer/formwizarddialog.cpp b/src/plugins/designer/formwizarddialog.cpp index e813d73748..958d627503 100644 --- a/src/plugins/designer/formwizarddialog.cpp +++ b/src/plugins/designer/formwizarddialog.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/designer/formwizarddialog.h b/src/plugins/designer/formwizarddialog.h index b537947618..234d3ce42b 100644 --- a/src/plugins/designer/formwizarddialog.h +++ b/src/plugins/designer/formwizarddialog.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/designer/settingsmanager.cpp b/src/plugins/designer/settingsmanager.cpp index 1f2305de14..56ae6f0236 100644 --- a/src/plugins/designer/settingsmanager.cpp +++ b/src/plugins/designer/settingsmanager.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/designer/settingsmanager.h b/src/plugins/designer/settingsmanager.h index 795a61ddfa..30bb51dd31 100644 --- a/src/plugins/designer/settingsmanager.h +++ b/src/plugins/designer/settingsmanager.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/designer/settingspage.cpp b/src/plugins/designer/settingspage.cpp index 269c6a1169..7e0952ae76 100644 --- a/src/plugins/designer/settingspage.cpp +++ b/src/plugins/designer/settingspage.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/designer/settingspage.h b/src/plugins/designer/settingspage.h index f794afa634..397bb36b3a 100644 --- a/src/plugins/designer/settingspage.h +++ b/src/plugins/designer/settingspage.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/designer/workbenchintegration.cpp b/src/plugins/designer/workbenchintegration.cpp index 80f727a95f..8483c2f1d9 100644 --- a/src/plugins/designer/workbenchintegration.cpp +++ b/src/plugins/designer/workbenchintegration.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/designer/workbenchintegration.h b/src/plugins/designer/workbenchintegration.h index 30d88fb7bf..10732865b0 100644 --- a/src/plugins/designer/workbenchintegration.h +++ b/src/plugins/designer/workbenchintegration.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/find/Find.pluginspec b/src/plugins/find/Find.pluginspec index 13f712235b..2dd9dba1a8 100644 --- a/src/plugins/find/Find.pluginspec +++ b/src/plugins/find/Find.pluginspec @@ -1,7 +1,7 @@ <plugin name="Find" version="0.9.1" compatVersion="0.9.1"> <vendor>Nokia Corporation</vendor> <copyright>(C) 2008 Nokia Corporation</copyright> - <license>Nokia Technology Preview License Agreement</license> + <license>Nokia Beta Version License</license> <description>Provides the find widget and the hooks for find implementations.</description> <url>http://www.trolltech.com/</url> <dependencyList> diff --git a/src/plugins/find/basetextfind.cpp b/src/plugins/find/basetextfind.cpp index d6a2e9997e..8b83975cb4 100644 --- a/src/plugins/find/basetextfind.cpp +++ b/src/plugins/find/basetextfind.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/find/basetextfind.h b/src/plugins/find/basetextfind.h index ed8435981c..aa1fe59ec2 100644 --- a/src/plugins/find/basetextfind.h +++ b/src/plugins/find/basetextfind.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/find/currentdocumentfind.cpp b/src/plugins/find/currentdocumentfind.cpp index 59d05919cf..26ed8dd049 100644 --- a/src/plugins/find/currentdocumentfind.cpp +++ b/src/plugins/find/currentdocumentfind.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/find/currentdocumentfind.h b/src/plugins/find/currentdocumentfind.h index 815182e88c..6951cee5e7 100644 --- a/src/plugins/find/currentdocumentfind.h +++ b/src/plugins/find/currentdocumentfind.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/find/find_global.h b/src/plugins/find/find_global.h index 800b7cccce..c6c0ac5b10 100644 --- a/src/plugins/find/find_global.h +++ b/src/plugins/find/find_global.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ #ifndef FIND_GLOBAL_H diff --git a/src/plugins/find/findplugin.cpp b/src/plugins/find/findplugin.cpp index 766c435a50..0bf2ec4fdb 100644 --- a/src/plugins/find/findplugin.cpp +++ b/src/plugins/find/findplugin.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/find/findplugin.h b/src/plugins/find/findplugin.h index 538797f516..4a38079137 100644 --- a/src/plugins/find/findplugin.h +++ b/src/plugins/find/findplugin.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/find/findtoolbar.cpp b/src/plugins/find/findtoolbar.cpp index f87d9bf9e0..d11768499a 100644 --- a/src/plugins/find/findtoolbar.cpp +++ b/src/plugins/find/findtoolbar.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/find/findtoolbar.h b/src/plugins/find/findtoolbar.h index 4eeb4f8a2d..a0055bc18c 100644 --- a/src/plugins/find/findtoolbar.h +++ b/src/plugins/find/findtoolbar.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/find/findtoolwindow.cpp b/src/plugins/find/findtoolwindow.cpp index 6b1ac69deb..b448e47ba9 100644 --- a/src/plugins/find/findtoolwindow.cpp +++ b/src/plugins/find/findtoolwindow.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/find/findtoolwindow.h b/src/plugins/find/findtoolwindow.h index 71d3200b3c..bbb82cdd27 100644 --- a/src/plugins/find/findtoolwindow.h +++ b/src/plugins/find/findtoolwindow.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/find/ifindfilter.h b/src/plugins/find/ifindfilter.h index 057b56acd4..2fc7b5f02a 100644 --- a/src/plugins/find/ifindfilter.h +++ b/src/plugins/find/ifindfilter.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/find/ifindsupport.h b/src/plugins/find/ifindsupport.h index 6bf5ede776..532568471f 100644 --- a/src/plugins/find/ifindsupport.h +++ b/src/plugins/find/ifindsupport.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/find/searchresulttreeitemdelegate.cpp b/src/plugins/find/searchresulttreeitemdelegate.cpp index 6be35f71b8..920e006503 100644 --- a/src/plugins/find/searchresulttreeitemdelegate.cpp +++ b/src/plugins/find/searchresulttreeitemdelegate.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/find/searchresulttreeitemdelegate.h b/src/plugins/find/searchresulttreeitemdelegate.h index a79db17383..37e2413aab 100644 --- a/src/plugins/find/searchresulttreeitemdelegate.h +++ b/src/plugins/find/searchresulttreeitemdelegate.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/find/searchresulttreeitemroles.h b/src/plugins/find/searchresulttreeitemroles.h index a1998cdeaa..b6affc361f 100644 --- a/src/plugins/find/searchresulttreeitemroles.h +++ b/src/plugins/find/searchresulttreeitemroles.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/find/searchresulttreeitems.cpp b/src/plugins/find/searchresulttreeitems.cpp index a098350005..b73adf506b 100644 --- a/src/plugins/find/searchresulttreeitems.cpp +++ b/src/plugins/find/searchresulttreeitems.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/find/searchresulttreeitems.h b/src/plugins/find/searchresulttreeitems.h index 0dd6b88676..7154ed1e46 100644 --- a/src/plugins/find/searchresulttreeitems.h +++ b/src/plugins/find/searchresulttreeitems.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/find/searchresulttreemodel.cpp b/src/plugins/find/searchresulttreemodel.cpp index f99e9d8e45..0cabff4999 100644 --- a/src/plugins/find/searchresulttreemodel.cpp +++ b/src/plugins/find/searchresulttreemodel.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/find/searchresulttreemodel.h b/src/plugins/find/searchresulttreemodel.h index 5a1518d9f0..c12196b306 100644 --- a/src/plugins/find/searchresulttreemodel.h +++ b/src/plugins/find/searchresulttreemodel.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/find/searchresulttreeview.cpp b/src/plugins/find/searchresulttreeview.cpp index 6cd0f41c1f..15ce04b74f 100644 --- a/src/plugins/find/searchresulttreeview.cpp +++ b/src/plugins/find/searchresulttreeview.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/find/searchresulttreeview.h b/src/plugins/find/searchresulttreeview.h index 578e57d9e4..9c69c95190 100644 --- a/src/plugins/find/searchresulttreeview.h +++ b/src/plugins/find/searchresulttreeview.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/find/searchresultwindow.cpp b/src/plugins/find/searchresultwindow.cpp index d9b040f80f..ffbc1ba4e5 100644 --- a/src/plugins/find/searchresultwindow.cpp +++ b/src/plugins/find/searchresultwindow.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/find/searchresultwindow.h b/src/plugins/find/searchresultwindow.h index 7d616b1b11..82b8867128 100644 --- a/src/plugins/find/searchresultwindow.h +++ b/src/plugins/find/searchresultwindow.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/find/textfindconstants.h b/src/plugins/find/textfindconstants.h index 86d74b7b3d..a5ac526b9d 100644 --- a/src/plugins/find/textfindconstants.h +++ b/src/plugins/find/textfindconstants.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/git/ScmGit.pluginspec b/src/plugins/git/ScmGit.pluginspec index 1f511448a0..53f6184b80 100644 --- a/src/plugins/git/ScmGit.pluginspec +++ b/src/plugins/git/ScmGit.pluginspec @@ -1,7 +1,7 @@ <plugin name="ScmGit" version="0.9.1" compatVersion="0.9.1"> <vendor>Nokia Corporation</vendor> <copyright>(C) 2008 Nokia Corporation</copyright> - <license>Nokia Technology Preview License Agreement</license> + <license>Nokia Beta Version License</license> <description>Git integration.</description> <url>http://www.trolltech.com/</url> <dependencyList> diff --git a/src/plugins/git/annotationhighlighter.cpp b/src/plugins/git/annotationhighlighter.cpp index 9c85deff13..6fff26f6bf 100644 --- a/src/plugins/git/annotationhighlighter.cpp +++ b/src/plugins/git/annotationhighlighter.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/git/annotationhighlighter.h b/src/plugins/git/annotationhighlighter.h index ebc8f199f9..336942178c 100644 --- a/src/plugins/git/annotationhighlighter.h +++ b/src/plugins/git/annotationhighlighter.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/git/changeselectiondialog.cpp b/src/plugins/git/changeselectiondialog.cpp index 46eab385ac..cd520aba70 100644 --- a/src/plugins/git/changeselectiondialog.cpp +++ b/src/plugins/git/changeselectiondialog.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/git/changeselectiondialog.h b/src/plugins/git/changeselectiondialog.h index 7ccb439a8a..cef4478e83 100644 --- a/src/plugins/git/changeselectiondialog.h +++ b/src/plugins/git/changeselectiondialog.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/git/commitdata.cpp b/src/plugins/git/commitdata.cpp index 7ea937233c..8b96fe23c9 100644 --- a/src/plugins/git/commitdata.cpp +++ b/src/plugins/git/commitdata.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/git/commitdata.h b/src/plugins/git/commitdata.h index b535168f6f..a1dc05ef42 100644 --- a/src/plugins/git/commitdata.h +++ b/src/plugins/git/commitdata.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 466307b4de..3113ebf3f8 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h index eb42b27efc..2ae6c3f583 100644 --- a/src/plugins/git/gitclient.h +++ b/src/plugins/git/gitclient.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/git/gitconstants.h b/src/plugins/git/gitconstants.h index 9867624913..6719221f4c 100644 --- a/src/plugins/git/gitconstants.h +++ b/src/plugins/git/gitconstants.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/git/giteditor.cpp b/src/plugins/git/giteditor.cpp index a92e14eea1..e45029d1aa 100644 --- a/src/plugins/git/giteditor.cpp +++ b/src/plugins/git/giteditor.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/git/giteditor.h b/src/plugins/git/giteditor.h index 1ef4b34c02..23a6953dd1 100644 --- a/src/plugins/git/giteditor.h +++ b/src/plugins/git/giteditor.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/git/gitoutputwindow.cpp b/src/plugins/git/gitoutputwindow.cpp index fbaed2c841..a1d76e7553 100644 --- a/src/plugins/git/gitoutputwindow.cpp +++ b/src/plugins/git/gitoutputwindow.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/git/gitoutputwindow.h b/src/plugins/git/gitoutputwindow.h index af5a5027bb..898381a3d9 100644 --- a/src/plugins/git/gitoutputwindow.h +++ b/src/plugins/git/gitoutputwindow.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp index f7647fb2d1..dc18fe088e 100644 --- a/src/plugins/git/gitplugin.cpp +++ b/src/plugins/git/gitplugin.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/git/gitplugin.h b/src/plugins/git/gitplugin.h index adff899e50..5e15a52a87 100644 --- a/src/plugins/git/gitplugin.h +++ b/src/plugins/git/gitplugin.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/git/gitsettings.cpp b/src/plugins/git/gitsettings.cpp index f4473e1fd9..dff3312918 100644 --- a/src/plugins/git/gitsettings.cpp +++ b/src/plugins/git/gitsettings.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/git/gitsettings.h b/src/plugins/git/gitsettings.h index 1b07f44379..6b012f36f6 100644 --- a/src/plugins/git/gitsettings.h +++ b/src/plugins/git/gitsettings.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/git/gitsubmiteditor.cpp b/src/plugins/git/gitsubmiteditor.cpp index db854f3e3c..fe93a0c6ad 100644 --- a/src/plugins/git/gitsubmiteditor.cpp +++ b/src/plugins/git/gitsubmiteditor.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/git/gitsubmiteditor.h b/src/plugins/git/gitsubmiteditor.h index 4219f5ae3d..8199384d07 100644 --- a/src/plugins/git/gitsubmiteditor.h +++ b/src/plugins/git/gitsubmiteditor.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/git/gitsubmiteditorwidget.cpp b/src/plugins/git/gitsubmiteditorwidget.cpp index e9110f8fbe..312738968f 100644 --- a/src/plugins/git/gitsubmiteditorwidget.cpp +++ b/src/plugins/git/gitsubmiteditorwidget.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/git/gitsubmiteditorwidget.h b/src/plugins/git/gitsubmiteditorwidget.h index 06a96cb534..8763dd8a59 100644 --- a/src/plugins/git/gitsubmiteditorwidget.h +++ b/src/plugins/git/gitsubmiteditorwidget.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/git/gitversioncontrol.cpp b/src/plugins/git/gitversioncontrol.cpp index 5f403ef2b5..0dcf99af20 100644 --- a/src/plugins/git/gitversioncontrol.cpp +++ b/src/plugins/git/gitversioncontrol.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/git/gitversioncontrol.h b/src/plugins/git/gitversioncontrol.h index e12e773671..ac72e4c9bf 100644 --- a/src/plugins/git/gitversioncontrol.h +++ b/src/plugins/git/gitversioncontrol.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/git/settingspage.cpp b/src/plugins/git/settingspage.cpp index 7f0581fc3c..037176b52d 100644 --- a/src/plugins/git/settingspage.cpp +++ b/src/plugins/git/settingspage.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/git/settingspage.h b/src/plugins/git/settingspage.h index c1f1403c4c..e5cce4d34a 100644 --- a/src/plugins/git/settingspage.h +++ b/src/plugins/git/settingspage.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/helloworld/HelloWorld.pluginspec b/src/plugins/helloworld/HelloWorld.pluginspec index 9cd262ca4d..dab4cbfd3c 100644 --- a/src/plugins/helloworld/HelloWorld.pluginspec +++ b/src/plugins/helloworld/HelloWorld.pluginspec @@ -1,7 +1,7 @@ <plugin name="HelloWorld" version="0.9.1" compatVersion="0.9.1"> <vendor>Nokia Corporation</vendor> <copyright>(C) 2008 Nokia Corporation</copyright> - <license>Nokia Technology Preview License Agreement</license> + <license>Nokia Beta Version License</license> <description>Hello World sample plugin.</description> <url>http://www.trolltech.com/</url> <dependencyList> diff --git a/src/plugins/helloworld/helloworldplugin.cpp b/src/plugins/helloworld/helloworldplugin.cpp index 9b1c9ea2f3..296c00454e 100644 --- a/src/plugins/helloworld/helloworldplugin.cpp +++ b/src/plugins/helloworld/helloworldplugin.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/helloworld/helloworldplugin.h b/src/plugins/helloworld/helloworldplugin.h index 877087ec60..b598cc7523 100644 --- a/src/plugins/helloworld/helloworldplugin.h +++ b/src/plugins/helloworld/helloworldplugin.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/helloworld/helloworldwindow.cpp b/src/plugins/helloworld/helloworldwindow.cpp index 03fb45c8bf..5524d32274 100644 --- a/src/plugins/helloworld/helloworldwindow.cpp +++ b/src/plugins/helloworld/helloworldwindow.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/helloworld/helloworldwindow.h b/src/plugins/helloworld/helloworldwindow.h index 9c38a5d0c3..82c0018656 100644 --- a/src/plugins/helloworld/helloworldwindow.h +++ b/src/plugins/helloworld/helloworldwindow.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/help/Help.pluginspec b/src/plugins/help/Help.pluginspec index b60b320827..dfd438522a 100644 --- a/src/plugins/help/Help.pluginspec +++ b/src/plugins/help/Help.pluginspec @@ -1,7 +1,7 @@ <plugin name="Help" version="0.9.1" compatVersion="0.9.1"> <vendor>Nokia Corporation</vendor> <copyright>(C) 2008 Nokia Corporation</copyright> - <license>Nokia Technology Preview License Agreement</license> + <license>Nokia Beta Version License</license> <description>Help system.</description> <url>http://www.trolltech.com/</url> <dependencyList> diff --git a/src/plugins/help/centralwidget.cpp b/src/plugins/help/centralwidget.cpp index 8e21024299..a263f36111 100644 --- a/src/plugins/help/centralwidget.cpp +++ b/src/plugins/help/centralwidget.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/help/centralwidget.h b/src/plugins/help/centralwidget.h index 0ca15ce5c5..41db97a283 100644 --- a/src/plugins/help/centralwidget.h +++ b/src/plugins/help/centralwidget.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/help/contentstoolwindow.cpp b/src/plugins/help/contentstoolwindow.cpp index 3c14d7f1b8..ef90a09344 100644 --- a/src/plugins/help/contentstoolwindow.cpp +++ b/src/plugins/help/contentstoolwindow.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/help/contentstoolwindow.h b/src/plugins/help/contentstoolwindow.h index 4c13827523..a6eabc156b 100644 --- a/src/plugins/help/contentstoolwindow.h +++ b/src/plugins/help/contentstoolwindow.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/help/docsettingspage.cpp b/src/plugins/help/docsettingspage.cpp index fe01a3acbb..65fd2669b4 100644 --- a/src/plugins/help/docsettingspage.cpp +++ b/src/plugins/help/docsettingspage.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/help/docsettingspage.h b/src/plugins/help/docsettingspage.h index 93b518a7f4..1e74ae5404 100644 --- a/src/plugins/help/docsettingspage.h +++ b/src/plugins/help/docsettingspage.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/help/filtersettingspage.cpp b/src/plugins/help/filtersettingspage.cpp index 0325cb0a20..73a5f615d3 100644 --- a/src/plugins/help/filtersettingspage.cpp +++ b/src/plugins/help/filtersettingspage.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/help/filtersettingspage.h b/src/plugins/help/filtersettingspage.h index 6458fd65b1..6eb12df181 100644 --- a/src/plugins/help/filtersettingspage.h +++ b/src/plugins/help/filtersettingspage.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/help/help_global.h b/src/plugins/help/help_global.h index e0d66c58ec..bac0cd4afd 100644 --- a/src/plugins/help/help_global.h +++ b/src/plugins/help/help_global.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/help/helpengine.cpp b/src/plugins/help/helpengine.cpp index 44501d25ab..d6e4e667fc 100644 --- a/src/plugins/help/helpengine.cpp +++ b/src/plugins/help/helpengine.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/help/helpengine.h b/src/plugins/help/helpengine.h index e3cb08a151..a6f2f1d5e5 100644 --- a/src/plugins/help/helpengine.h +++ b/src/plugins/help/helpengine.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/help/helpfindsupport.cpp b/src/plugins/help/helpfindsupport.cpp index a26032ec2f..78a867701e 100644 --- a/src/plugins/help/helpfindsupport.cpp +++ b/src/plugins/help/helpfindsupport.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/help/helpfindsupport.h b/src/plugins/help/helpfindsupport.h index a2105dfe29..602bc6b712 100644 --- a/src/plugins/help/helpfindsupport.h +++ b/src/plugins/help/helpfindsupport.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/help/helpindexfilter.cpp b/src/plugins/help/helpindexfilter.cpp index 989ed18f2a..489e2aed1e 100644 --- a/src/plugins/help/helpindexfilter.cpp +++ b/src/plugins/help/helpindexfilter.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/help/helpindexfilter.h b/src/plugins/help/helpindexfilter.h index 0e4e2743de..74438ee54d 100644 --- a/src/plugins/help/helpindexfilter.h +++ b/src/plugins/help/helpindexfilter.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/help/helpmode.cpp b/src/plugins/help/helpmode.cpp index f206773f35..ee334af42e 100644 --- a/src/plugins/help/helpmode.cpp +++ b/src/plugins/help/helpmode.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/help/helpmode.h b/src/plugins/help/helpmode.h index 458b7dc5c4..85edcf26da 100644 --- a/src/plugins/help/helpmode.h +++ b/src/plugins/help/helpmode.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp index 972ab7d6a6..bdc98b66ee 100644 --- a/src/plugins/help/helpplugin.cpp +++ b/src/plugins/help/helpplugin.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/help/helpplugin.h b/src/plugins/help/helpplugin.h index 5f50b48a56..40ff127e5b 100644 --- a/src/plugins/help/helpplugin.h +++ b/src/plugins/help/helpplugin.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/help/indextoolwindow.cpp b/src/plugins/help/indextoolwindow.cpp index 07a4ee68ce..b6086cdea2 100644 --- a/src/plugins/help/indextoolwindow.cpp +++ b/src/plugins/help/indextoolwindow.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/help/indextoolwindow.h b/src/plugins/help/indextoolwindow.h index 6792ca5b92..d891ec0cb1 100644 --- a/src/plugins/help/indextoolwindow.h +++ b/src/plugins/help/indextoolwindow.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/help/searchwidget.cpp b/src/plugins/help/searchwidget.cpp index c40595e4ab..bbb3a9692a 100644 --- a/src/plugins/help/searchwidget.cpp +++ b/src/plugins/help/searchwidget.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/help/searchwidget.h b/src/plugins/help/searchwidget.h index 09b73c2679..a565491b78 100644 --- a/src/plugins/help/searchwidget.h +++ b/src/plugins/help/searchwidget.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/perforce/Perforce.pluginspec b/src/plugins/perforce/Perforce.pluginspec index 367b3afd79..496e420c36 100644 --- a/src/plugins/perforce/Perforce.pluginspec +++ b/src/plugins/perforce/Perforce.pluginspec @@ -1,7 +1,7 @@ <plugin name="Perforce" version="0.9.1" compatVersion="0.9.1"> <vendor>Nokia Corporation</vendor> <copyright>(C) 2008 Nokia Corporation</copyright> - <license>Nokia Technology Preview License Agreement</license> + <license>Nokia Beta Version License</license> <description>Perforce integration.</description> <url>http://www.trolltech.com/</url> <dependencyList> diff --git a/src/plugins/perforce/annotationhighlighter.cpp b/src/plugins/perforce/annotationhighlighter.cpp index 196f8ef715..289157df66 100644 --- a/src/plugins/perforce/annotationhighlighter.cpp +++ b/src/plugins/perforce/annotationhighlighter.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/perforce/annotationhighlighter.h b/src/plugins/perforce/annotationhighlighter.h index 3d6119d402..574d2781f5 100644 --- a/src/plugins/perforce/annotationhighlighter.h +++ b/src/plugins/perforce/annotationhighlighter.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/perforce/changenumberdialog.cpp b/src/plugins/perforce/changenumberdialog.cpp index 86823969b4..e310953d37 100644 --- a/src/plugins/perforce/changenumberdialog.cpp +++ b/src/plugins/perforce/changenumberdialog.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/perforce/changenumberdialog.h b/src/plugins/perforce/changenumberdialog.h index c7fdaeee33..9432f9ad0d 100644 --- a/src/plugins/perforce/changenumberdialog.h +++ b/src/plugins/perforce/changenumberdialog.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/perforce/p4.h b/src/plugins/perforce/p4.h index 5e9eca1f3e..bc93ac18d8 100644 --- a/src/plugins/perforce/p4.h +++ b/src/plugins/perforce/p4.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/perforce/pendingchangesdialog.cpp b/src/plugins/perforce/pendingchangesdialog.cpp index 92b3ec56e5..fd1b1b98aa 100644 --- a/src/plugins/perforce/pendingchangesdialog.cpp +++ b/src/plugins/perforce/pendingchangesdialog.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/perforce/pendingchangesdialog.h b/src/plugins/perforce/pendingchangesdialog.h index 7e0b0cdddc..d6f88efd7e 100644 --- a/src/plugins/perforce/pendingchangesdialog.h +++ b/src/plugins/perforce/pendingchangesdialog.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/perforce/perforceconstants.h b/src/plugins/perforce/perforceconstants.h index 95c9f64ca6..4a755b32c4 100644 --- a/src/plugins/perforce/perforceconstants.h +++ b/src/plugins/perforce/perforceconstants.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/perforce/perforceeditor.cpp b/src/plugins/perforce/perforceeditor.cpp index 845f8b0f74..5a0b1d2340 100644 --- a/src/plugins/perforce/perforceeditor.cpp +++ b/src/plugins/perforce/perforceeditor.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/perforce/perforceeditor.h b/src/plugins/perforce/perforceeditor.h index de35d213a8..335bf8b382 100644 --- a/src/plugins/perforce/perforceeditor.h +++ b/src/plugins/perforce/perforceeditor.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/perforce/perforceoutputwindow.cpp b/src/plugins/perforce/perforceoutputwindow.cpp index a228e2b586..235f7da9cc 100644 --- a/src/plugins/perforce/perforceoutputwindow.cpp +++ b/src/plugins/perforce/perforceoutputwindow.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/perforce/perforceoutputwindow.h b/src/plugins/perforce/perforceoutputwindow.h index b666d078ab..9f825ae166 100644 --- a/src/plugins/perforce/perforceoutputwindow.h +++ b/src/plugins/perforce/perforceoutputwindow.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp index c609c35bf0..88783eb40c 100644 --- a/src/plugins/perforce/perforceplugin.cpp +++ b/src/plugins/perforce/perforceplugin.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/perforce/perforceplugin.h b/src/plugins/perforce/perforceplugin.h index 11301853b9..cf37ed339e 100644 --- a/src/plugins/perforce/perforceplugin.h +++ b/src/plugins/perforce/perforceplugin.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/perforce/perforcesettings.cpp b/src/plugins/perforce/perforcesettings.cpp index 6384f85e52..cdb4012be0 100644 --- a/src/plugins/perforce/perforcesettings.cpp +++ b/src/plugins/perforce/perforcesettings.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/perforce/perforcesettings.h b/src/plugins/perforce/perforcesettings.h index 416620f761..726f7f44ef 100644 --- a/src/plugins/perforce/perforcesettings.h +++ b/src/plugins/perforce/perforcesettings.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/perforce/perforcesubmiteditor.cpp b/src/plugins/perforce/perforcesubmiteditor.cpp index 035ffe2462..6aa74f95fb 100644 --- a/src/plugins/perforce/perforcesubmiteditor.cpp +++ b/src/plugins/perforce/perforcesubmiteditor.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/perforce/perforcesubmiteditor.h b/src/plugins/perforce/perforcesubmiteditor.h index cc308122b0..0f44332a69 100644 --- a/src/plugins/perforce/perforcesubmiteditor.h +++ b/src/plugins/perforce/perforcesubmiteditor.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/perforce/perforcesubmiteditorwidget.cpp b/src/plugins/perforce/perforcesubmiteditorwidget.cpp index c88556e4fe..05d14327f3 100644 --- a/src/plugins/perforce/perforcesubmiteditorwidget.cpp +++ b/src/plugins/perforce/perforcesubmiteditorwidget.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/perforce/perforcesubmiteditorwidget.h b/src/plugins/perforce/perforcesubmiteditorwidget.h index 68c00a5896..6d1a8dea43 100644 --- a/src/plugins/perforce/perforcesubmiteditorwidget.h +++ b/src/plugins/perforce/perforcesubmiteditorwidget.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/perforce/perforceversioncontrol.cpp b/src/plugins/perforce/perforceversioncontrol.cpp index 98379024bc..0b2814dbe1 100644 --- a/src/plugins/perforce/perforceversioncontrol.cpp +++ b/src/plugins/perforce/perforceversioncontrol.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/perforce/perforceversioncontrol.h b/src/plugins/perforce/perforceversioncontrol.h index 0e8a1ea653..6d92fc9b0f 100644 --- a/src/plugins/perforce/perforceversioncontrol.h +++ b/src/plugins/perforce/perforceversioncontrol.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/perforce/settingspage.cpp b/src/plugins/perforce/settingspage.cpp index b5cbd7fa00..18fec0f846 100644 --- a/src/plugins/perforce/settingspage.cpp +++ b/src/plugins/perforce/settingspage.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/perforce/settingspage.h b/src/plugins/perforce/settingspage.h index 23e9681257..e13dab5343 100644 --- a/src/plugins/perforce/settingspage.h +++ b/src/plugins/perforce/settingspage.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/perforce/workbenchclientuser.cpp b/src/plugins/perforce/workbenchclientuser.cpp index 9d7fe5574c..d148a47a88 100644 --- a/src/plugins/perforce/workbenchclientuser.cpp +++ b/src/plugins/perforce/workbenchclientuser.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/perforce/workbenchclientuser.h b/src/plugins/perforce/workbenchclientuser.h index 85e3908cc9..a924decabd 100644 --- a/src/plugins/perforce/workbenchclientuser.h +++ b/src/plugins/perforce/workbenchclientuser.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/ProjectExplorer.pluginspec b/src/plugins/projectexplorer/ProjectExplorer.pluginspec index 1673c3f399..a60bbdf294 100644 --- a/src/plugins/projectexplorer/ProjectExplorer.pluginspec +++ b/src/plugins/projectexplorer/ProjectExplorer.pluginspec @@ -1,7 +1,7 @@ <plugin name="ProjectExplorer" version="0.9.1" compatVersion="0.9.1"> <vendor>Nokia Corporation</vendor> <copyright>(C) 2008 Nokia Corporation</copyright> - <license>Nokia Technology Preview License Agreement</license> + <license>Nokia Beta Version License</license> <description>ProjectExplorer framework that can be extended with different kind of project types.</description> <url>http://www.trolltech.com/</url> <dependencyList> diff --git a/src/plugins/projectexplorer/ProjectExplorerInterfaces b/src/plugins/projectexplorer/ProjectExplorerInterfaces index 6f1c8840fe..10d0b81910 100644 --- a/src/plugins/projectexplorer/ProjectExplorerInterfaces +++ b/src/plugins/projectexplorer/ProjectExplorerInterfaces @@ -1,3 +1,36 @@ +/*************************************************************************** +** +** This file is part of Qt Creator +** +** Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies). +** +** Contact: Qt Software Information (qt-info@nokia.com) +** +** +** Non-Open Source Usage +** +** Licensees may use this file in accordance with the Qt Beta Version +** License Agreement, Agreement version 2.2 provided with the Software or, +** alternatively, in accordance with the terms contained in a written +** agreement between you and Nokia. +** +** GNU General Public License Usage +** +** Alternatively, this file may be used under the terms of the GNU General +** Public License versions 2.0 or 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the packaging +** of this file. Please review the following information to ensure GNU +** General Public Licensing requirements will be met: +** +** http://www.fsf.org/licensing/licenses/info/GPLv2.html and +** http://www.gnu.org/copyleft/gpl.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt GPL Exception +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. +** +***************************************************************************/ + #include "projectexplorer/buildparserinterface.h" #include "projectexplorer/projectexplorerconstants.h" #include "projectexplorer/project.h" diff --git a/src/plugins/projectexplorer/abstractprocess.h b/src/plugins/projectexplorer/abstractprocess.h index 12e263ff62..d1a1c64438 100644 --- a/src/plugins/projectexplorer/abstractprocess.h +++ b/src/plugins/projectexplorer/abstractprocess.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/abstractprocessstep.cpp b/src/plugins/projectexplorer/abstractprocessstep.cpp index 965a8b4c0c..11dfa6d760 100644 --- a/src/plugins/projectexplorer/abstractprocessstep.cpp +++ b/src/plugins/projectexplorer/abstractprocessstep.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/abstractprocessstep.h b/src/plugins/projectexplorer/abstractprocessstep.h index e5d40343bb..9c1756c0d7 100644 --- a/src/plugins/projectexplorer/abstractprocessstep.h +++ b/src/plugins/projectexplorer/abstractprocessstep.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/allprojectsfilter.cpp b/src/plugins/projectexplorer/allprojectsfilter.cpp index 059b41e730..b94edbef25 100644 --- a/src/plugins/projectexplorer/allprojectsfilter.cpp +++ b/src/plugins/projectexplorer/allprojectsfilter.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/allprojectsfilter.h b/src/plugins/projectexplorer/allprojectsfilter.h index 448483c7a7..45e8105ecc 100644 --- a/src/plugins/projectexplorer/allprojectsfilter.h +++ b/src/plugins/projectexplorer/allprojectsfilter.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/allprojectsfind.cpp b/src/plugins/projectexplorer/allprojectsfind.cpp index a7832ca679..c5bf77fba4 100644 --- a/src/plugins/projectexplorer/allprojectsfind.cpp +++ b/src/plugins/projectexplorer/allprojectsfind.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/allprojectsfind.h b/src/plugins/projectexplorer/allprojectsfind.h index 77fb2e78eb..8479a1dfc5 100644 --- a/src/plugins/projectexplorer/allprojectsfind.h +++ b/src/plugins/projectexplorer/allprojectsfind.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/applicationlauncher.h b/src/plugins/projectexplorer/applicationlauncher.h index 049b689f44..93b51e8b25 100644 --- a/src/plugins/projectexplorer/applicationlauncher.h +++ b/src/plugins/projectexplorer/applicationlauncher.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/applicationlauncher_win.cpp b/src/plugins/projectexplorer/applicationlauncher_win.cpp index 4d0221b087..c511d350f2 100644 --- a/src/plugins/projectexplorer/applicationlauncher_win.cpp +++ b/src/plugins/projectexplorer/applicationlauncher_win.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/applicationlauncher_x11.cpp b/src/plugins/projectexplorer/applicationlauncher_x11.cpp index 7042c152d2..5891a64739 100644 --- a/src/plugins/projectexplorer/applicationlauncher_x11.cpp +++ b/src/plugins/projectexplorer/applicationlauncher_x11.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/applicationrunconfiguration.cpp b/src/plugins/projectexplorer/applicationrunconfiguration.cpp index 88bbd64116..1f923160b3 100644 --- a/src/plugins/projectexplorer/applicationrunconfiguration.cpp +++ b/src/plugins/projectexplorer/applicationrunconfiguration.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/applicationrunconfiguration.h b/src/plugins/projectexplorer/applicationrunconfiguration.h index 5915f9b7a2..d6bfb4d894 100644 --- a/src/plugins/projectexplorer/applicationrunconfiguration.h +++ b/src/plugins/projectexplorer/applicationrunconfiguration.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/buildconfiguration.cpp b/src/plugins/projectexplorer/buildconfiguration.cpp index c960cb0e34..2fdda571c0 100644 --- a/src/plugins/projectexplorer/buildconfiguration.cpp +++ b/src/plugins/projectexplorer/buildconfiguration.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/buildconfiguration.h b/src/plugins/projectexplorer/buildconfiguration.h index b3ccc8adc9..8bb01d1590 100644 --- a/src/plugins/projectexplorer/buildconfiguration.h +++ b/src/plugins/projectexplorer/buildconfiguration.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/buildmanager.cpp b/src/plugins/projectexplorer/buildmanager.cpp index c6f386fa41..933987441d 100644 --- a/src/plugins/projectexplorer/buildmanager.cpp +++ b/src/plugins/projectexplorer/buildmanager.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/buildmanager.h b/src/plugins/projectexplorer/buildmanager.h index 2c7a443720..248d6ae927 100644 --- a/src/plugins/projectexplorer/buildmanager.h +++ b/src/plugins/projectexplorer/buildmanager.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/buildparserinterface.cpp b/src/plugins/projectexplorer/buildparserinterface.cpp index 57bf588ca8..57a069ea72 100644 --- a/src/plugins/projectexplorer/buildparserinterface.cpp +++ b/src/plugins/projectexplorer/buildparserinterface.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/buildparserinterface.h b/src/plugins/projectexplorer/buildparserinterface.h index 217ce0bcaf..2fd92d8682 100644 --- a/src/plugins/projectexplorer/buildparserinterface.h +++ b/src/plugins/projectexplorer/buildparserinterface.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/buildprogress.cpp b/src/plugins/projectexplorer/buildprogress.cpp index 7c893bb9ce..afc228e460 100644 --- a/src/plugins/projectexplorer/buildprogress.cpp +++ b/src/plugins/projectexplorer/buildprogress.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/buildprogress.h b/src/plugins/projectexplorer/buildprogress.h index 12f2ff36da..11c5293a7c 100644 --- a/src/plugins/projectexplorer/buildprogress.h +++ b/src/plugins/projectexplorer/buildprogress.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/buildsettingspropertiespage.cpp b/src/plugins/projectexplorer/buildsettingspropertiespage.cpp index 2c1434534b..8a42ec1273 100644 --- a/src/plugins/projectexplorer/buildsettingspropertiespage.cpp +++ b/src/plugins/projectexplorer/buildsettingspropertiespage.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/buildsettingspropertiespage.h b/src/plugins/projectexplorer/buildsettingspropertiespage.h index 07e398dfc0..0417198049 100644 --- a/src/plugins/projectexplorer/buildsettingspropertiespage.h +++ b/src/plugins/projectexplorer/buildsettingspropertiespage.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/buildstep.cpp b/src/plugins/projectexplorer/buildstep.cpp index ef1dec4d2c..c6f25fc96d 100644 --- a/src/plugins/projectexplorer/buildstep.cpp +++ b/src/plugins/projectexplorer/buildstep.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/buildstep.h b/src/plugins/projectexplorer/buildstep.h index 47f13bd3a6..93c2fac2e4 100644 --- a/src/plugins/projectexplorer/buildstep.h +++ b/src/plugins/projectexplorer/buildstep.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/buildstepspage.cpp b/src/plugins/projectexplorer/buildstepspage.cpp index a0e103ebca..5986de549a 100644 --- a/src/plugins/projectexplorer/buildstepspage.cpp +++ b/src/plugins/projectexplorer/buildstepspage.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/buildstepspage.h b/src/plugins/projectexplorer/buildstepspage.h index c612c9ca5f..ef1e47d964 100644 --- a/src/plugins/projectexplorer/buildstepspage.h +++ b/src/plugins/projectexplorer/buildstepspage.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/compileoutputwindow.cpp b/src/plugins/projectexplorer/compileoutputwindow.cpp index 8b50f3e4fa..72ecf9893e 100644 --- a/src/plugins/projectexplorer/compileoutputwindow.cpp +++ b/src/plugins/projectexplorer/compileoutputwindow.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/compileoutputwindow.h b/src/plugins/projectexplorer/compileoutputwindow.h index 0ec2958f25..655752cdd3 100644 --- a/src/plugins/projectexplorer/compileoutputwindow.h +++ b/src/plugins/projectexplorer/compileoutputwindow.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/consoleprocess.h b/src/plugins/projectexplorer/consoleprocess.h index 28e24b92f9..51519fae38 100644 --- a/src/plugins/projectexplorer/consoleprocess.h +++ b/src/plugins/projectexplorer/consoleprocess.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/consoleprocess_unix.cpp b/src/plugins/projectexplorer/consoleprocess_unix.cpp index f50db814bc..eb5f88121c 100644 --- a/src/plugins/projectexplorer/consoleprocess_unix.cpp +++ b/src/plugins/projectexplorer/consoleprocess_unix.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/consoleprocess_win.cpp b/src/plugins/projectexplorer/consoleprocess_win.cpp index 7e3a5d0a9c..17e280e3ad 100644 --- a/src/plugins/projectexplorer/consoleprocess_win.cpp +++ b/src/plugins/projectexplorer/consoleprocess_win.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/currentprojectfilter.cpp b/src/plugins/projectexplorer/currentprojectfilter.cpp index 084bb4690d..4de19f9be5 100644 --- a/src/plugins/projectexplorer/currentprojectfilter.cpp +++ b/src/plugins/projectexplorer/currentprojectfilter.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/currentprojectfilter.h b/src/plugins/projectexplorer/currentprojectfilter.h index 3e5d216632..c52f9f605f 100644 --- a/src/plugins/projectexplorer/currentprojectfilter.h +++ b/src/plugins/projectexplorer/currentprojectfilter.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/currentprojectfind.cpp b/src/plugins/projectexplorer/currentprojectfind.cpp index bcef3183b9..d0221cc980 100644 --- a/src/plugins/projectexplorer/currentprojectfind.cpp +++ b/src/plugins/projectexplorer/currentprojectfind.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/currentprojectfind.h b/src/plugins/projectexplorer/currentprojectfind.h index 37577a2a95..d44171d761 100644 --- a/src/plugins/projectexplorer/currentprojectfind.h +++ b/src/plugins/projectexplorer/currentprojectfind.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp b/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp index c52b86f488..f2b9c66ced 100644 --- a/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp +++ b/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/customexecutablerunconfiguration.h b/src/plugins/projectexplorer/customexecutablerunconfiguration.h index 5d15009c02..bcf3fef091 100644 --- a/src/plugins/projectexplorer/customexecutablerunconfiguration.h +++ b/src/plugins/projectexplorer/customexecutablerunconfiguration.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/dependenciesdialog.cpp b/src/plugins/projectexplorer/dependenciesdialog.cpp index 0fc776dcb1..de7cee85f8 100644 --- a/src/plugins/projectexplorer/dependenciesdialog.cpp +++ b/src/plugins/projectexplorer/dependenciesdialog.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/dependenciesdialog.h b/src/plugins/projectexplorer/dependenciesdialog.h index bcb635dada..3b815369ab 100644 --- a/src/plugins/projectexplorer/dependenciesdialog.h +++ b/src/plugins/projectexplorer/dependenciesdialog.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/directoryproject.cpp b/src/plugins/projectexplorer/directoryproject.cpp index 7134763854..042d1ecaa9 100644 --- a/src/plugins/projectexplorer/directoryproject.cpp +++ b/src/plugins/projectexplorer/directoryproject.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/editorconfiguration.cpp b/src/plugins/projectexplorer/editorconfiguration.cpp index d2a016ef2b..a836c4d9a0 100644 --- a/src/plugins/projectexplorer/editorconfiguration.cpp +++ b/src/plugins/projectexplorer/editorconfiguration.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/editorconfiguration.h b/src/plugins/projectexplorer/editorconfiguration.h index a968008a57..d01fb8b719 100644 --- a/src/plugins/projectexplorer/editorconfiguration.h +++ b/src/plugins/projectexplorer/editorconfiguration.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/editorsettingspropertiespage.cpp b/src/plugins/projectexplorer/editorsettingspropertiespage.cpp index e969079aca..f62bc485b9 100644 --- a/src/plugins/projectexplorer/editorsettingspropertiespage.cpp +++ b/src/plugins/projectexplorer/editorsettingspropertiespage.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/editorsettingspropertiespage.h b/src/plugins/projectexplorer/editorsettingspropertiespage.h index df9936fe0e..caaad115f9 100644 --- a/src/plugins/projectexplorer/editorsettingspropertiespage.h +++ b/src/plugins/projectexplorer/editorsettingspropertiespage.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/environment.cpp b/src/plugins/projectexplorer/environment.cpp index b428ed3a92..9220564bba 100644 --- a/src/plugins/projectexplorer/environment.cpp +++ b/src/plugins/projectexplorer/environment.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/environment.h b/src/plugins/projectexplorer/environment.h index 3f7e68ea72..ba3aa9f161 100644 --- a/src/plugins/projectexplorer/environment.h +++ b/src/plugins/projectexplorer/environment.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/environmenteditmodel.cpp b/src/plugins/projectexplorer/environmenteditmodel.cpp index d881a2e6db..caa5e57140 100644 --- a/src/plugins/projectexplorer/environmenteditmodel.cpp +++ b/src/plugins/projectexplorer/environmenteditmodel.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/environmenteditmodel.h b/src/plugins/projectexplorer/environmenteditmodel.h index 4f20652027..070703cab1 100644 --- a/src/plugins/projectexplorer/environmenteditmodel.h +++ b/src/plugins/projectexplorer/environmenteditmodel.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/foldernavigationwidget.cpp b/src/plugins/projectexplorer/foldernavigationwidget.cpp index 3a59aca76c..75a92945dd 100644 --- a/src/plugins/projectexplorer/foldernavigationwidget.cpp +++ b/src/plugins/projectexplorer/foldernavigationwidget.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/foldernavigationwidget.h b/src/plugins/projectexplorer/foldernavigationwidget.h index 82e4493eec..f88bdd6d79 100644 --- a/src/plugins/projectexplorer/foldernavigationwidget.h +++ b/src/plugins/projectexplorer/foldernavigationwidget.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/iprojectmanager.h b/src/plugins/projectexplorer/iprojectmanager.h index 42d439e597..3455375a0f 100644 --- a/src/plugins/projectexplorer/iprojectmanager.h +++ b/src/plugins/projectexplorer/iprojectmanager.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/iprojectproperties.h b/src/plugins/projectexplorer/iprojectproperties.h index f3f13927bc..0a4d762f33 100644 --- a/src/plugins/projectexplorer/iprojectproperties.h +++ b/src/plugins/projectexplorer/iprojectproperties.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/metatypedeclarations.h b/src/plugins/projectexplorer/metatypedeclarations.h index e7c3576ffe..5ec03977a9 100644 --- a/src/plugins/projectexplorer/metatypedeclarations.h +++ b/src/plugins/projectexplorer/metatypedeclarations.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/nodesvisitor.cpp b/src/plugins/projectexplorer/nodesvisitor.cpp index c2574f36f9..4ebe7913ef 100644 --- a/src/plugins/projectexplorer/nodesvisitor.cpp +++ b/src/plugins/projectexplorer/nodesvisitor.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/nodesvisitor.h b/src/plugins/projectexplorer/nodesvisitor.h index 86c3a77270..f489ab9584 100644 --- a/src/plugins/projectexplorer/nodesvisitor.h +++ b/src/plugins/projectexplorer/nodesvisitor.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/outputwindow.cpp b/src/plugins/projectexplorer/outputwindow.cpp index 81a9f29245..a1a3b1dc96 100644 --- a/src/plugins/projectexplorer/outputwindow.cpp +++ b/src/plugins/projectexplorer/outputwindow.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/outputwindow.h b/src/plugins/projectexplorer/outputwindow.h index 69bd4ef972..6e7431f2b6 100644 --- a/src/plugins/projectexplorer/outputwindow.h +++ b/src/plugins/projectexplorer/outputwindow.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/persistentsettings.cpp b/src/plugins/projectexplorer/persistentsettings.cpp index 0939dc1785..c8b38f1139 100644 --- a/src/plugins/projectexplorer/persistentsettings.cpp +++ b/src/plugins/projectexplorer/persistentsettings.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/persistentsettings.h b/src/plugins/projectexplorer/persistentsettings.h index a1bb19b833..011a61e28b 100644 --- a/src/plugins/projectexplorer/persistentsettings.h +++ b/src/plugins/projectexplorer/persistentsettings.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/pluginfilefactory.cpp b/src/plugins/projectexplorer/pluginfilefactory.cpp index 723d5dbaf5..09630139a4 100644 --- a/src/plugins/projectexplorer/pluginfilefactory.cpp +++ b/src/plugins/projectexplorer/pluginfilefactory.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/pluginfilefactory.h b/src/plugins/projectexplorer/pluginfilefactory.h index 5d3dc6b1f1..ff6527713f 100644 --- a/src/plugins/projectexplorer/pluginfilefactory.h +++ b/src/plugins/projectexplorer/pluginfilefactory.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/processstep.cpp b/src/plugins/projectexplorer/processstep.cpp index f2e2a8ac54..3d8b11665c 100644 --- a/src/plugins/projectexplorer/processstep.cpp +++ b/src/plugins/projectexplorer/processstep.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/processstep.h b/src/plugins/projectexplorer/processstep.h index 0cee08d071..11b40ba9af 100644 --- a/src/plugins/projectexplorer/processstep.h +++ b/src/plugins/projectexplorer/processstep.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/project.cpp b/src/plugins/projectexplorer/project.cpp index 2aaed472dd..7945ddefe4 100644 --- a/src/plugins/projectexplorer/project.cpp +++ b/src/plugins/projectexplorer/project.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/project.h b/src/plugins/projectexplorer/project.h index 0d05234bd8..2ad175e48c 100644 --- a/src/plugins/projectexplorer/project.h +++ b/src/plugins/projectexplorer/project.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index 25cdf99b7d..dd3cd836cc 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/projectexplorer.h b/src/plugins/projectexplorer/projectexplorer.h index 9cce2c87f5..fa6f34602c 100644 --- a/src/plugins/projectexplorer/projectexplorer.h +++ b/src/plugins/projectexplorer/projectexplorer.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/projectexplorer_export.h b/src/plugins/projectexplorer/projectexplorer_export.h index 43475aeb4f..ff288b1d17 100644 --- a/src/plugins/projectexplorer/projectexplorer_export.h +++ b/src/plugins/projectexplorer/projectexplorer_export.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/projectexplorerconstants.h b/src/plugins/projectexplorer/projectexplorerconstants.h index 11a3cf5c27..3f937823ef 100644 --- a/src/plugins/projectexplorer/projectexplorerconstants.h +++ b/src/plugins/projectexplorer/projectexplorerconstants.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/projectfilewizardextension.cpp b/src/plugins/projectexplorer/projectfilewizardextension.cpp index 7445d4799c..5f9b5f4926 100644 --- a/src/plugins/projectexplorer/projectfilewizardextension.cpp +++ b/src/plugins/projectexplorer/projectfilewizardextension.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/projectfilewizardextension.h b/src/plugins/projectexplorer/projectfilewizardextension.h index 8a59127256..6e777cf19e 100644 --- a/src/plugins/projectexplorer/projectfilewizardextension.h +++ b/src/plugins/projectexplorer/projectfilewizardextension.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/projectmodels.cpp b/src/plugins/projectexplorer/projectmodels.cpp index 823244578e..81a35c9b65 100644 --- a/src/plugins/projectexplorer/projectmodels.cpp +++ b/src/plugins/projectexplorer/projectmodels.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/projectmodels.h b/src/plugins/projectexplorer/projectmodels.h index 35c575fe94..2cdf1e6f4d 100644 --- a/src/plugins/projectexplorer/projectmodels.h +++ b/src/plugins/projectexplorer/projectmodels.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/projectnodes.cpp b/src/plugins/projectexplorer/projectnodes.cpp index 7c85aae6ae..a3f1b30752 100644 --- a/src/plugins/projectexplorer/projectnodes.cpp +++ b/src/plugins/projectexplorer/projectnodes.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/projectnodes.h b/src/plugins/projectexplorer/projectnodes.h index 14297df8be..e45cfbc9c0 100644 --- a/src/plugins/projectexplorer/projectnodes.h +++ b/src/plugins/projectexplorer/projectnodes.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/projecttreewidget.cpp b/src/plugins/projectexplorer/projecttreewidget.cpp index 8ddfd2404b..49d8ff3070 100644 --- a/src/plugins/projectexplorer/projecttreewidget.cpp +++ b/src/plugins/projectexplorer/projecttreewidget.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ @@ -240,8 +240,7 @@ void ProjectTreeWidget::setCurrentItem(Node *node, Project *project) void ProjectTreeWidget::handleCurrentItemChange(const QModelIndex ¤t) { Node *node = m_model->nodeForIndex(current); - QTC_ASSERT(node, return); - + // node might be 0. that's okay bool autoSync = autoSynchronization(); setAutoSynchronization(false); m_explorer->setCurrentNode(node); diff --git a/src/plugins/projectexplorer/projecttreewidget.h b/src/plugins/projectexplorer/projecttreewidget.h index 85dc9801ab..91f83ca3a6 100644 --- a/src/plugins/projectexplorer/projecttreewidget.h +++ b/src/plugins/projectexplorer/projecttreewidget.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/projectwindow.cpp b/src/plugins/projectexplorer/projectwindow.cpp index e673238742..b02839a4c5 100644 --- a/src/plugins/projectexplorer/projectwindow.cpp +++ b/src/plugins/projectexplorer/projectwindow.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/projectwindow.h b/src/plugins/projectexplorer/projectwindow.h index e5e2dc4a81..8bd5469422 100644 --- a/src/plugins/projectexplorer/projectwindow.h +++ b/src/plugins/projectexplorer/projectwindow.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/projectwizardpage.cpp b/src/plugins/projectexplorer/projectwizardpage.cpp index f7022158bc..a2d544393a 100644 --- a/src/plugins/projectexplorer/projectwizardpage.cpp +++ b/src/plugins/projectexplorer/projectwizardpage.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/projectwizardpage.h b/src/plugins/projectexplorer/projectwizardpage.h index bc86bb6fa7..e076a3f0a3 100644 --- a/src/plugins/projectexplorer/projectwizardpage.h +++ b/src/plugins/projectexplorer/projectwizardpage.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/removefiledialog.cpp b/src/plugins/projectexplorer/removefiledialog.cpp index 32f573b5f6..c08075f0e5 100644 --- a/src/plugins/projectexplorer/removefiledialog.cpp +++ b/src/plugins/projectexplorer/removefiledialog.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/removefiledialog.h b/src/plugins/projectexplorer/removefiledialog.h index 7c43774d8b..3e9ac432c3 100644 --- a/src/plugins/projectexplorer/removefiledialog.h +++ b/src/plugins/projectexplorer/removefiledialog.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp index 8c83e2c407..fc897a2f9f 100644 --- a/src/plugins/projectexplorer/runconfiguration.cpp +++ b/src/plugins/projectexplorer/runconfiguration.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/runconfiguration.h b/src/plugins/projectexplorer/runconfiguration.h index def848765d..c7cf2519bf 100644 --- a/src/plugins/projectexplorer/runconfiguration.h +++ b/src/plugins/projectexplorer/runconfiguration.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/runsettingspropertiespage.cpp b/src/plugins/projectexplorer/runsettingspropertiespage.cpp index ce26ce4da9..2d20ba3b67 100644 --- a/src/plugins/projectexplorer/runsettingspropertiespage.cpp +++ b/src/plugins/projectexplorer/runsettingspropertiespage.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/runsettingspropertiespage.h b/src/plugins/projectexplorer/runsettingspropertiespage.h index c3882eaefb..1f22bae7e7 100644 --- a/src/plugins/projectexplorer/runsettingspropertiespage.h +++ b/src/plugins/projectexplorer/runsettingspropertiespage.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/scriptwrappers.cpp b/src/plugins/projectexplorer/scriptwrappers.cpp index d026636017..8737853133 100644 --- a/src/plugins/projectexplorer/scriptwrappers.cpp +++ b/src/plugins/projectexplorer/scriptwrappers.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/scriptwrappers.h b/src/plugins/projectexplorer/scriptwrappers.h index 2c8f3b42c1..05ef55420a 100644 --- a/src/plugins/projectexplorer/scriptwrappers.h +++ b/src/plugins/projectexplorer/scriptwrappers.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/session.cpp b/src/plugins/projectexplorer/session.cpp index 89716ce3f6..e6461e302a 100644 --- a/src/plugins/projectexplorer/session.cpp +++ b/src/plugins/projectexplorer/session.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/session.h b/src/plugins/projectexplorer/session.h index d07316f07a..b44202f9a6 100644 --- a/src/plugins/projectexplorer/session.h +++ b/src/plugins/projectexplorer/session.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/sessiondialog.cpp b/src/plugins/projectexplorer/sessiondialog.cpp index b264ac11a9..0ce134edfb 100644 --- a/src/plugins/projectexplorer/sessiondialog.cpp +++ b/src/plugins/projectexplorer/sessiondialog.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/sessiondialog.h b/src/plugins/projectexplorer/sessiondialog.h index b06704e959..07aa28a008 100644 --- a/src/plugins/projectexplorer/sessiondialog.h +++ b/src/plugins/projectexplorer/sessiondialog.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/taskwindow.cpp b/src/plugins/projectexplorer/taskwindow.cpp index 2e3131e36f..b702bb98bd 100644 --- a/src/plugins/projectexplorer/taskwindow.cpp +++ b/src/plugins/projectexplorer/taskwindow.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/taskwindow.h b/src/plugins/projectexplorer/taskwindow.h index a3bdf47621..48b8de1eb1 100644 --- a/src/plugins/projectexplorer/taskwindow.h +++ b/src/plugins/projectexplorer/taskwindow.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/winguiprocess.cpp b/src/plugins/projectexplorer/winguiprocess.cpp index d8231cea70..13663e622f 100644 --- a/src/plugins/projectexplorer/winguiprocess.cpp +++ b/src/plugins/projectexplorer/winguiprocess.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/projectexplorer/winguiprocess.h b/src/plugins/projectexplorer/winguiprocess.h index ffaefea8cb..02ab6d9ff6 100644 --- a/src/plugins/projectexplorer/winguiprocess.h +++ b/src/plugins/projectexplorer/winguiprocess.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qhelpproject/qhelpproject.cpp b/src/plugins/qhelpproject/qhelpproject.cpp index 478b232981..4bdfaf38cf 100644 --- a/src/plugins/qhelpproject/qhelpproject.cpp +++ b/src/plugins/qhelpproject/qhelpproject.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qhelpproject/qhelpproject.h b/src/plugins/qhelpproject/qhelpproject.h index 275b21f527..bd9d2540b5 100644 --- a/src/plugins/qhelpproject/qhelpproject.h +++ b/src/plugins/qhelpproject/qhelpproject.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qhelpproject/qhelpprojectitems.cpp b/src/plugins/qhelpproject/qhelpprojectitems.cpp index 4d39139c44..1dad289404 100644 --- a/src/plugins/qhelpproject/qhelpprojectitems.cpp +++ b/src/plugins/qhelpproject/qhelpprojectitems.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qhelpproject/qhelpprojectitems.h b/src/plugins/qhelpproject/qhelpprojectitems.h index e920de2e8c..ca6f793d81 100644 --- a/src/plugins/qhelpproject/qhelpprojectitems.h +++ b/src/plugins/qhelpproject/qhelpprojectitems.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qhelpproject/qhelpprojectmanager.cpp b/src/plugins/qhelpproject/qhelpprojectmanager.cpp index 015a6705ef..88870e675e 100644 --- a/src/plugins/qhelpproject/qhelpprojectmanager.cpp +++ b/src/plugins/qhelpproject/qhelpprojectmanager.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qhelpproject/qhelpprojectmanager.h b/src/plugins/qhelpproject/qhelpprojectmanager.h index 56a9f21d55..571d39c328 100644 --- a/src/plugins/qhelpproject/qhelpprojectmanager.h +++ b/src/plugins/qhelpproject/qhelpprojectmanager.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec b/src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec index 8e16623886..c5d09426de 100644 --- a/src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec +++ b/src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec @@ -1,7 +1,7 @@ <plugin name="Qt4ProjectManager" version="0.9.1" compatVersion="0.9.1"> <vendor>Nokia Corporation</vendor> <copyright>(C) 2008 Nokia Corporation</copyright> - <license>Nokia Technology Preview License Agreement</license> + <license>Nokia Beta Version License</license> <description>Provides project type for Qt 4 pro files and tools.</description> <url>http://www.trolltech.com/</url> <dependencyList> diff --git a/src/plugins/qt4projectmanager/applicationlauncher.h b/src/plugins/qt4projectmanager/applicationlauncher.h index bb580ab10d..6f5aec1a14 100644 --- a/src/plugins/qt4projectmanager/applicationlauncher.h +++ b/src/plugins/qt4projectmanager/applicationlauncher.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/buildoptionspage.cpp b/src/plugins/qt4projectmanager/buildoptionspage.cpp index 088af5fcd5..5258776456 100644 --- a/src/plugins/qt4projectmanager/buildoptionspage.cpp +++ b/src/plugins/qt4projectmanager/buildoptionspage.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/buildparserfactory.cpp b/src/plugins/qt4projectmanager/buildparserfactory.cpp index b7a5602024..34a62305f6 100644 --- a/src/plugins/qt4projectmanager/buildparserfactory.cpp +++ b/src/plugins/qt4projectmanager/buildparserfactory.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/buildparserfactory.h b/src/plugins/qt4projectmanager/buildparserfactory.h index 269d0d7743..1c96b053ba 100644 --- a/src/plugins/qt4projectmanager/buildparserfactory.h +++ b/src/plugins/qt4projectmanager/buildparserfactory.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/cesdkhandler.cpp b/src/plugins/qt4projectmanager/cesdkhandler.cpp index 25200c3ab2..c4b5f5e22a 100644 --- a/src/plugins/qt4projectmanager/cesdkhandler.cpp +++ b/src/plugins/qt4projectmanager/cesdkhandler.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/cesdkhandler.h b/src/plugins/qt4projectmanager/cesdkhandler.h index f830564add..d3e5bf4a03 100644 --- a/src/plugins/qt4projectmanager/cesdkhandler.h +++ b/src/plugins/qt4projectmanager/cesdkhandler.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/deployhelper.cpp b/src/plugins/qt4projectmanager/deployhelper.cpp index cf48604ad2..807725751a 100644 --- a/src/plugins/qt4projectmanager/deployhelper.cpp +++ b/src/plugins/qt4projectmanager/deployhelper.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/deployhelper.h b/src/plugins/qt4projectmanager/deployhelper.h index 381353babc..49626f887d 100644 --- a/src/plugins/qt4projectmanager/deployhelper.h +++ b/src/plugins/qt4projectmanager/deployhelper.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/directorywatcher.cpp b/src/plugins/qt4projectmanager/directorywatcher.cpp index daf4783483..3434b0284d 100644 --- a/src/plugins/qt4projectmanager/directorywatcher.cpp +++ b/src/plugins/qt4projectmanager/directorywatcher.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/directorywatcher.h b/src/plugins/qt4projectmanager/directorywatcher.h index b529ec07e7..af73a131f0 100644 --- a/src/plugins/qt4projectmanager/directorywatcher.h +++ b/src/plugins/qt4projectmanager/directorywatcher.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/embeddedpropertiespage.cpp b/src/plugins/qt4projectmanager/embeddedpropertiespage.cpp index 1689a1bad5..61d9ff0bc3 100644 --- a/src/plugins/qt4projectmanager/embeddedpropertiespage.cpp +++ b/src/plugins/qt4projectmanager/embeddedpropertiespage.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/embeddedpropertiespage.h b/src/plugins/qt4projectmanager/embeddedpropertiespage.h index 238117a3d5..93b7bae4ca 100644 --- a/src/plugins/qt4projectmanager/embeddedpropertiespage.h +++ b/src/plugins/qt4projectmanager/embeddedpropertiespage.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/gccparser.cpp b/src/plugins/qt4projectmanager/gccparser.cpp index a208fc6305..52187715fb 100644 --- a/src/plugins/qt4projectmanager/gccparser.cpp +++ b/src/plugins/qt4projectmanager/gccparser.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/gccparser.h b/src/plugins/qt4projectmanager/gccparser.h index aca5bc36e4..76e2b11b31 100644 --- a/src/plugins/qt4projectmanager/gccparser.h +++ b/src/plugins/qt4projectmanager/gccparser.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/gccpreprocessor.cpp b/src/plugins/qt4projectmanager/gccpreprocessor.cpp index 79d16d47e0..a946377873 100644 --- a/src/plugins/qt4projectmanager/gccpreprocessor.cpp +++ b/src/plugins/qt4projectmanager/gccpreprocessor.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/gccpreprocessor.h b/src/plugins/qt4projectmanager/gccpreprocessor.h index a99cfbb7a3..484dee0b53 100644 --- a/src/plugins/qt4projectmanager/gccpreprocessor.h +++ b/src/plugins/qt4projectmanager/gccpreprocessor.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/gdbmacrosbuildstep.cpp b/src/plugins/qt4projectmanager/gdbmacrosbuildstep.cpp index 79795676d7..584d443e3e 100644 --- a/src/plugins/qt4projectmanager/gdbmacrosbuildstep.cpp +++ b/src/plugins/qt4projectmanager/gdbmacrosbuildstep.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/gdbmacrosbuildstep.h b/src/plugins/qt4projectmanager/gdbmacrosbuildstep.h index 61226a4154..f5aa55d22e 100644 --- a/src/plugins/qt4projectmanager/gdbmacrosbuildstep.h +++ b/src/plugins/qt4projectmanager/gdbmacrosbuildstep.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/headerpath.h b/src/plugins/qt4projectmanager/headerpath.h index cb99c60707..74012f8975 100644 --- a/src/plugins/qt4projectmanager/headerpath.h +++ b/src/plugins/qt4projectmanager/headerpath.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/makestep.cpp b/src/plugins/qt4projectmanager/makestep.cpp index 55ef402fb9..71fc51f796 100644 --- a/src/plugins/qt4projectmanager/makestep.cpp +++ b/src/plugins/qt4projectmanager/makestep.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/makestep.h b/src/plugins/qt4projectmanager/makestep.h index 617125e34e..ad066d23c4 100644 --- a/src/plugins/qt4projectmanager/makestep.h +++ b/src/plugins/qt4projectmanager/makestep.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/msvcenvironment.cpp b/src/plugins/qt4projectmanager/msvcenvironment.cpp index 48d751f0f2..dcfc15e10c 100644 --- a/src/plugins/qt4projectmanager/msvcenvironment.cpp +++ b/src/plugins/qt4projectmanager/msvcenvironment.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/msvcenvironment.h b/src/plugins/qt4projectmanager/msvcenvironment.h index 85b4150f9a..b1aef04e1c 100644 --- a/src/plugins/qt4projectmanager/msvcenvironment.h +++ b/src/plugins/qt4projectmanager/msvcenvironment.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/msvcparser.cpp b/src/plugins/qt4projectmanager/msvcparser.cpp index ed7e4eacf4..7ef3d7c955 100644 --- a/src/plugins/qt4projectmanager/msvcparser.cpp +++ b/src/plugins/qt4projectmanager/msvcparser.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/msvcparser.h b/src/plugins/qt4projectmanager/msvcparser.h index d19ee77d81..4811c90773 100644 --- a/src/plugins/qt4projectmanager/msvcparser.h +++ b/src/plugins/qt4projectmanager/msvcparser.h @@ -1,4 +1,4 @@ -/*************************************************************************** +/*************************************************************************** ** ** This file is part of Qt Creator ** @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/profilecache.h b/src/plugins/qt4projectmanager/profilecache.h index cc31702be5..eef60ee562 100644 --- a/src/plugins/qt4projectmanager/profilecache.h +++ b/src/plugins/qt4projectmanager/profilecache.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/profileeditor.cpp b/src/plugins/qt4projectmanager/profileeditor.cpp index 0542f4a091..ddcb0b4252 100644 --- a/src/plugins/qt4projectmanager/profileeditor.cpp +++ b/src/plugins/qt4projectmanager/profileeditor.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/profileeditor.h b/src/plugins/qt4projectmanager/profileeditor.h index de52d8a032..36017aa6eb 100644 --- a/src/plugins/qt4projectmanager/profileeditor.h +++ b/src/plugins/qt4projectmanager/profileeditor.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/profileeditorfactory.cpp b/src/plugins/qt4projectmanager/profileeditorfactory.cpp index 2ad95e995a..a18fda7b5d 100644 --- a/src/plugins/qt4projectmanager/profileeditorfactory.cpp +++ b/src/plugins/qt4projectmanager/profileeditorfactory.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/profileeditorfactory.h b/src/plugins/qt4projectmanager/profileeditorfactory.h index 4f6909ae69..f73edc8f47 100644 --- a/src/plugins/qt4projectmanager/profileeditorfactory.h +++ b/src/plugins/qt4projectmanager/profileeditorfactory.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/profilehighlighter.cpp b/src/plugins/qt4projectmanager/profilehighlighter.cpp index a21f0a7f5b..9033813037 100644 --- a/src/plugins/qt4projectmanager/profilehighlighter.cpp +++ b/src/plugins/qt4projectmanager/profilehighlighter.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/profilehighlighter.h b/src/plugins/qt4projectmanager/profilehighlighter.h index b4ad5a7224..7dd2ccd5a9 100644 --- a/src/plugins/qt4projectmanager/profilehighlighter.h +++ b/src/plugins/qt4projectmanager/profilehighlighter.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/profilereader.cpp b/src/plugins/qt4projectmanager/profilereader.cpp index 2b4c817928..a8069b54a7 100644 --- a/src/plugins/qt4projectmanager/profilereader.cpp +++ b/src/plugins/qt4projectmanager/profilereader.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/profilereader.h b/src/plugins/qt4projectmanager/profilereader.h index ace8886604..81e0ad2f94 100644 --- a/src/plugins/qt4projectmanager/profilereader.h +++ b/src/plugins/qt4projectmanager/profilereader.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/projectloadwizard.cpp b/src/plugins/qt4projectmanager/projectloadwizard.cpp index 9a75d2e9dd..62bef9bcc6 100644 --- a/src/plugins/qt4projectmanager/projectloadwizard.cpp +++ b/src/plugins/qt4projectmanager/projectloadwizard.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/projectloadwizard.h b/src/plugins/qt4projectmanager/projectloadwizard.h index c205b84510..71dae75bf2 100644 --- a/src/plugins/qt4projectmanager/projectloadwizard.h +++ b/src/plugins/qt4projectmanager/projectloadwizard.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/qmakebuildstepfactory.cpp b/src/plugins/qt4projectmanager/qmakebuildstepfactory.cpp index 4bf3b8ee98..f6c422b9a0 100644 --- a/src/plugins/qt4projectmanager/qmakebuildstepfactory.cpp +++ b/src/plugins/qt4projectmanager/qmakebuildstepfactory.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/qmakebuildstepfactory.h b/src/plugins/qt4projectmanager/qmakebuildstepfactory.h index 3e06f864ca..2766701eab 100644 --- a/src/plugins/qt4projectmanager/qmakebuildstepfactory.h +++ b/src/plugins/qt4projectmanager/qmakebuildstepfactory.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/qmakestep.cpp b/src/plugins/qt4projectmanager/qmakestep.cpp index 85852f0188..fcb07fcf8a 100644 --- a/src/plugins/qt4projectmanager/qmakestep.cpp +++ b/src/plugins/qt4projectmanager/qmakestep.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/qmakestep.h b/src/plugins/qt4projectmanager/qmakestep.h index af9bf743dd..4431e59bfb 100644 --- a/src/plugins/qt4projectmanager/qmakestep.h +++ b/src/plugins/qt4projectmanager/qmakestep.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/qt4buildconfigwidget.cpp b/src/plugins/qt4projectmanager/qt4buildconfigwidget.cpp index 75ea55097c..2ee2d0f8bc 100644 --- a/src/plugins/qt4projectmanager/qt4buildconfigwidget.cpp +++ b/src/plugins/qt4projectmanager/qt4buildconfigwidget.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/qt4buildconfigwidget.h b/src/plugins/qt4projectmanager/qt4buildconfigwidget.h index 5a14376d00..622ce98be2 100644 --- a/src/plugins/qt4projectmanager/qt4buildconfigwidget.h +++ b/src/plugins/qt4projectmanager/qt4buildconfigwidget.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/qt4buildenvironmentwidget.cpp b/src/plugins/qt4projectmanager/qt4buildenvironmentwidget.cpp index 84ae6744a4..f0195cfd84 100644 --- a/src/plugins/qt4projectmanager/qt4buildenvironmentwidget.cpp +++ b/src/plugins/qt4projectmanager/qt4buildenvironmentwidget.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/qt4buildenvironmentwidget.h b/src/plugins/qt4projectmanager/qt4buildenvironmentwidget.h index d5adbd8e6c..1218607f5c 100644 --- a/src/plugins/qt4projectmanager/qt4buildenvironmentwidget.h +++ b/src/plugins/qt4projectmanager/qt4buildenvironmentwidget.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp index b5549dadf0..03765104ca 100644 --- a/src/plugins/qt4projectmanager/qt4nodes.cpp +++ b/src/plugins/qt4projectmanager/qt4nodes.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/qt4nodes.h b/src/plugins/qt4projectmanager/qt4nodes.h index 6b858bc525..487177c84a 100644 --- a/src/plugins/qt4projectmanager/qt4nodes.h +++ b/src/plugins/qt4projectmanager/qt4nodes.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp index ceedf098c4..2a7fd0c242 100644 --- a/src/plugins/qt4projectmanager/qt4project.cpp +++ b/src/plugins/qt4projectmanager/qt4project.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/qt4project.h b/src/plugins/qt4projectmanager/qt4project.h index 2a236a84c6..a70669f49f 100644 --- a/src/plugins/qt4projectmanager/qt4project.h +++ b/src/plugins/qt4projectmanager/qt4project.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.cpp b/src/plugins/qt4projectmanager/qt4projectmanager.cpp index 2e1281682e..7e83418eaa 100644 --- a/src/plugins/qt4projectmanager/qt4projectmanager.cpp +++ b/src/plugins/qt4projectmanager/qt4projectmanager.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.h b/src/plugins/qt4projectmanager/qt4projectmanager.h index de33def6e6..c6eb4127d7 100644 --- a/src/plugins/qt4projectmanager/qt4projectmanager.h +++ b/src/plugins/qt4projectmanager/qt4projectmanager.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h b/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h index bce80c7713..251f47dcf1 100644 --- a/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h +++ b/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerenums.h b/src/plugins/qt4projectmanager/qt4projectmanagerenums.h index 7f16692cef..247dae0117 100644 --- a/src/plugins/qt4projectmanager/qt4projectmanagerenums.h +++ b/src/plugins/qt4projectmanager/qt4projectmanagerenums.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp index 14affc5f07..debb89dae4 100644 --- a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp +++ b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.h b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.h index 207bc02bef..ee46f1f6aa 100644 --- a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.h +++ b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp index 2c0b4f3469..f9a5053fbb 100644 --- a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp +++ b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/qt4runconfiguration.h b/src/plugins/qt4projectmanager/qt4runconfiguration.h index cd2cae85c0..9e28979143 100644 --- a/src/plugins/qt4projectmanager/qt4runconfiguration.h +++ b/src/plugins/qt4projectmanager/qt4runconfiguration.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp index 246d4737bd..2df7899464 100644 --- a/src/plugins/qt4projectmanager/qtversionmanager.cpp +++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/qtversionmanager.h b/src/plugins/qt4projectmanager/qtversionmanager.h index d13ba7c3e0..164e40c6d8 100644 --- a/src/plugins/qt4projectmanager/qtversionmanager.h +++ b/src/plugins/qt4projectmanager/qtversionmanager.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/speinfo.cpp b/src/plugins/qt4projectmanager/speinfo.cpp index 58c69769bd..fefce92e55 100644 --- a/src/plugins/qt4projectmanager/speinfo.cpp +++ b/src/plugins/qt4projectmanager/speinfo.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/speinfo.h b/src/plugins/qt4projectmanager/speinfo.h index 1da8f8502b..46ac60372a 100644 --- a/src/plugins/qt4projectmanager/speinfo.h +++ b/src/plugins/qt4projectmanager/speinfo.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/wizards/consoleappwizard.cpp b/src/plugins/qt4projectmanager/wizards/consoleappwizard.cpp index a49d077d7c..2be52a0a8d 100644 --- a/src/plugins/qt4projectmanager/wizards/consoleappwizard.cpp +++ b/src/plugins/qt4projectmanager/wizards/consoleappwizard.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/wizards/consoleappwizard.h b/src/plugins/qt4projectmanager/wizards/consoleappwizard.h index aecf20b667..ffb398d1e7 100644 --- a/src/plugins/qt4projectmanager/wizards/consoleappwizard.h +++ b/src/plugins/qt4projectmanager/wizards/consoleappwizard.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/wizards/consoleappwizarddialog.cpp b/src/plugins/qt4projectmanager/wizards/consoleappwizarddialog.cpp index 1090673284..7a1bf47a4c 100644 --- a/src/plugins/qt4projectmanager/wizards/consoleappwizarddialog.cpp +++ b/src/plugins/qt4projectmanager/wizards/consoleappwizarddialog.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/wizards/consoleappwizarddialog.h b/src/plugins/qt4projectmanager/wizards/consoleappwizarddialog.h index 8e44923557..e8ba72a557 100644 --- a/src/plugins/qt4projectmanager/wizards/consoleappwizarddialog.h +++ b/src/plugins/qt4projectmanager/wizards/consoleappwizarddialog.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/wizards/filespage.cpp b/src/plugins/qt4projectmanager/wizards/filespage.cpp index 58391a7395..73d5438ffe 100644 --- a/src/plugins/qt4projectmanager/wizards/filespage.cpp +++ b/src/plugins/qt4projectmanager/wizards/filespage.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/wizards/filespage.h b/src/plugins/qt4projectmanager/wizards/filespage.h index d670dabbec..f84812425b 100644 --- a/src/plugins/qt4projectmanager/wizards/filespage.h +++ b/src/plugins/qt4projectmanager/wizards/filespage.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp b/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp index 28712aa4b6..1df3a0ba1a 100644 --- a/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp +++ b/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/wizards/guiappwizard.h b/src/plugins/qt4projectmanager/wizards/guiappwizard.h index 6f25688dc8..f3098e1750 100644 --- a/src/plugins/qt4projectmanager/wizards/guiappwizard.h +++ b/src/plugins/qt4projectmanager/wizards/guiappwizard.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp b/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp index 621a3b6ba9..1c52570467 100644 --- a/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp +++ b/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.h b/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.h index 1ca5b76ec7..4092fee5da 100644 --- a/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.h +++ b/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/wizards/libraryparameters.cpp b/src/plugins/qt4projectmanager/wizards/libraryparameters.cpp index 15e52ce68a..16887d1030 100644 --- a/src/plugins/qt4projectmanager/wizards/libraryparameters.cpp +++ b/src/plugins/qt4projectmanager/wizards/libraryparameters.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/wizards/libraryparameters.h b/src/plugins/qt4projectmanager/wizards/libraryparameters.h index 470443bd29..e02eaa32bb 100644 --- a/src/plugins/qt4projectmanager/wizards/libraryparameters.h +++ b/src/plugins/qt4projectmanager/wizards/libraryparameters.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/wizards/librarywizard.cpp b/src/plugins/qt4projectmanager/wizards/librarywizard.cpp index 30e7add344..ff6639ad48 100644 --- a/src/plugins/qt4projectmanager/wizards/librarywizard.cpp +++ b/src/plugins/qt4projectmanager/wizards/librarywizard.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/wizards/librarywizard.h b/src/plugins/qt4projectmanager/wizards/librarywizard.h index 94732e5fb6..6e2eb72588 100644 --- a/src/plugins/qt4projectmanager/wizards/librarywizard.h +++ b/src/plugins/qt4projectmanager/wizards/librarywizard.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/wizards/librarywizarddialog.cpp b/src/plugins/qt4projectmanager/wizards/librarywizarddialog.cpp index c95bea8217..96f0fd86e5 100644 --- a/src/plugins/qt4projectmanager/wizards/librarywizarddialog.cpp +++ b/src/plugins/qt4projectmanager/wizards/librarywizarddialog.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/wizards/librarywizarddialog.h b/src/plugins/qt4projectmanager/wizards/librarywizarddialog.h index a95dce6986..8472df61fe 100644 --- a/src/plugins/qt4projectmanager/wizards/librarywizarddialog.h +++ b/src/plugins/qt4projectmanager/wizards/librarywizarddialog.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/wizards/modulespage.cpp b/src/plugins/qt4projectmanager/wizards/modulespage.cpp index 7e11c50de9..959936f124 100644 --- a/src/plugins/qt4projectmanager/wizards/modulespage.cpp +++ b/src/plugins/qt4projectmanager/wizards/modulespage.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/wizards/modulespage.h b/src/plugins/qt4projectmanager/wizards/modulespage.h index 34552fa6b2..fdb63202f8 100644 --- a/src/plugins/qt4projectmanager/wizards/modulespage.h +++ b/src/plugins/qt4projectmanager/wizards/modulespage.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/wizards/qtprojectparameters.cpp b/src/plugins/qt4projectmanager/wizards/qtprojectparameters.cpp index eca41422ad..cab7b56b46 100644 --- a/src/plugins/qt4projectmanager/wizards/qtprojectparameters.cpp +++ b/src/plugins/qt4projectmanager/wizards/qtprojectparameters.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/wizards/qtprojectparameters.h b/src/plugins/qt4projectmanager/wizards/qtprojectparameters.h index 1b5186526f..e8146557f2 100644 --- a/src/plugins/qt4projectmanager/wizards/qtprojectparameters.h +++ b/src/plugins/qt4projectmanager/wizards/qtprojectparameters.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/wizards/qtwizard.cpp b/src/plugins/qt4projectmanager/wizards/qtwizard.cpp index 86c9c2a790..831e0e908d 100644 --- a/src/plugins/qt4projectmanager/wizards/qtwizard.cpp +++ b/src/plugins/qt4projectmanager/wizards/qtwizard.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qt4projectmanager/wizards/qtwizard.h b/src/plugins/qt4projectmanager/wizards/qtwizard.h index 1ae6ce0dd5..1b4f1a6074 100644 --- a/src/plugins/qt4projectmanager/wizards/qtwizard.h +++ b/src/plugins/qt4projectmanager/wizards/qtwizard.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qtestlib/qtestlibplugin.cpp b/src/plugins/qtestlib/qtestlibplugin.cpp index bf60d7d54f..a1889ef20d 100644 --- a/src/plugins/qtestlib/qtestlibplugin.cpp +++ b/src/plugins/qtestlib/qtestlibplugin.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qtestlib/qtestlibplugin.h b/src/plugins/qtestlib/qtestlibplugin.h index bbb4bb2683..d2f3ad850d 100644 --- a/src/plugins/qtestlib/qtestlibplugin.h +++ b/src/plugins/qtestlib/qtestlibplugin.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qtscripteditor/QtScriptEditor.pluginspec b/src/plugins/qtscripteditor/QtScriptEditor.pluginspec index 3e70cf5568..f303e35e45 100644 --- a/src/plugins/qtscripteditor/QtScriptEditor.pluginspec +++ b/src/plugins/qtscripteditor/QtScriptEditor.pluginspec @@ -1,7 +1,7 @@ <plugin name="QtScriptEditor" version="0.9.1" compatVersion="0.9.1"> <vendor>Nokia Corporation</vendor> <copyright>(C) 2008 Nokia Corporation</copyright> - <license>Nokia Technology Preview License Agreement</license> + <license>Nokia Beta Version License</license> <description>Editor for QtScript.</description> <url>http://www.trolltech.com/</url> <dependencyList> diff --git a/src/plugins/qtscripteditor/qtscripteditor.cpp b/src/plugins/qtscripteditor/qtscripteditor.cpp index 673c7a02fd..39ba4f0d94 100644 --- a/src/plugins/qtscripteditor/qtscripteditor.cpp +++ b/src/plugins/qtscripteditor/qtscripteditor.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qtscripteditor/qtscripteditor.h b/src/plugins/qtscripteditor/qtscripteditor.h index 1964ddea85..73e34fc527 100644 --- a/src/plugins/qtscripteditor/qtscripteditor.h +++ b/src/plugins/qtscripteditor/qtscripteditor.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qtscripteditor/qtscripteditoractionhandler.cpp b/src/plugins/qtscripteditor/qtscripteditoractionhandler.cpp index 971ea9d491..f51d8a8329 100644 --- a/src/plugins/qtscripteditor/qtscripteditoractionhandler.cpp +++ b/src/plugins/qtscripteditor/qtscripteditoractionhandler.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qtscripteditor/qtscripteditoractionhandler.h b/src/plugins/qtscripteditor/qtscripteditoractionhandler.h index e5fb11c136..3e21889bdf 100644 --- a/src/plugins/qtscripteditor/qtscripteditoractionhandler.h +++ b/src/plugins/qtscripteditor/qtscripteditoractionhandler.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qtscripteditor/qtscripteditorconstants.h b/src/plugins/qtscripteditor/qtscripteditorconstants.h index 9998dd4c27..da6b694864 100644 --- a/src/plugins/qtscripteditor/qtscripteditorconstants.h +++ b/src/plugins/qtscripteditor/qtscripteditorconstants.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qtscripteditor/qtscripteditorfactory.cpp b/src/plugins/qtscripteditor/qtscripteditorfactory.cpp index e8e7f64018..e63c9d16c4 100644 --- a/src/plugins/qtscripteditor/qtscripteditorfactory.cpp +++ b/src/plugins/qtscripteditor/qtscripteditorfactory.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qtscripteditor/qtscripteditorfactory.h b/src/plugins/qtscripteditor/qtscripteditorfactory.h index c8442daea3..b2bfee27e2 100644 --- a/src/plugins/qtscripteditor/qtscripteditorfactory.h +++ b/src/plugins/qtscripteditor/qtscripteditorfactory.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qtscripteditor/qtscripteditorplugin.cpp b/src/plugins/qtscripteditor/qtscripteditorplugin.cpp index 9f724d4d09..d03692b9d6 100644 --- a/src/plugins/qtscripteditor/qtscripteditorplugin.cpp +++ b/src/plugins/qtscripteditor/qtscripteditorplugin.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qtscripteditor/qtscripteditorplugin.h b/src/plugins/qtscripteditor/qtscripteditorplugin.h index cd7a336564..d1ab725b64 100644 --- a/src/plugins/qtscripteditor/qtscripteditorplugin.h +++ b/src/plugins/qtscripteditor/qtscripteditorplugin.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qtscripteditor/qtscripthighlighter.cpp b/src/plugins/qtscripteditor/qtscripthighlighter.cpp index 0e7cd342cb..66bb3c88fa 100644 --- a/src/plugins/qtscripteditor/qtscripthighlighter.cpp +++ b/src/plugins/qtscripteditor/qtscripthighlighter.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/qtscripteditor/qtscripthighlighter.h b/src/plugins/qtscripteditor/qtscripthighlighter.h index 374116e089..e1b6019486 100644 --- a/src/plugins/qtscripteditor/qtscripthighlighter.h +++ b/src/plugins/qtscripteditor/qtscripthighlighter.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/quickopen/QuickOpen.pluginspec b/src/plugins/quickopen/QuickOpen.pluginspec index 3c92b9cbf8..088f2affc9 100644 --- a/src/plugins/quickopen/QuickOpen.pluginspec +++ b/src/plugins/quickopen/QuickOpen.pluginspec @@ -1,7 +1,7 @@ <plugin name="QuickOpen" version="0.9.1" compatVersion="0.9.1"> <vendor>Nokia Corporation</vendor> <copyright>(C) 2008 Nokia Corporation</copyright> - <license>Nokia Technology Preview License Agreement</license> + <license>Nokia Beta Version License</license> <description>Provides the QuickOpen widget and the hooks for QuickOpen filter implementations.</description> <url>http://www.trolltech.com/</url> <dependencyList> diff --git a/src/plugins/quickopen/basefilefilter.cpp b/src/plugins/quickopen/basefilefilter.cpp index ca56535063..1909f4af03 100644 --- a/src/plugins/quickopen/basefilefilter.cpp +++ b/src/plugins/quickopen/basefilefilter.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/quickopen/basefilefilter.h b/src/plugins/quickopen/basefilefilter.h index e454b6b07e..883fc078e1 100644 --- a/src/plugins/quickopen/basefilefilter.h +++ b/src/plugins/quickopen/basefilefilter.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/quickopen/directoryfilter.cpp b/src/plugins/quickopen/directoryfilter.cpp index 30f7fc28fa..2948d990df 100644 --- a/src/plugins/quickopen/directoryfilter.cpp +++ b/src/plugins/quickopen/directoryfilter.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/quickopen/directoryfilter.h b/src/plugins/quickopen/directoryfilter.h index c283dfe33f..7df79ae700 100644 --- a/src/plugins/quickopen/directoryfilter.h +++ b/src/plugins/quickopen/directoryfilter.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/quickopen/directoryparser.cpp b/src/plugins/quickopen/directoryparser.cpp index 5a420e3505..dbafa92f63 100644 --- a/src/plugins/quickopen/directoryparser.cpp +++ b/src/plugins/quickopen/directoryparser.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/quickopen/directoryparser.h b/src/plugins/quickopen/directoryparser.h index 13a0cbc5ef..4a566e041d 100644 --- a/src/plugins/quickopen/directoryparser.h +++ b/src/plugins/quickopen/directoryparser.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/quickopen/filesystemfilter.cpp b/src/plugins/quickopen/filesystemfilter.cpp index 4631a8d934..77c66cd0d7 100644 --- a/src/plugins/quickopen/filesystemfilter.cpp +++ b/src/plugins/quickopen/filesystemfilter.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/quickopen/filesystemfilter.h b/src/plugins/quickopen/filesystemfilter.h index a404da038f..fbf8c57ed6 100644 --- a/src/plugins/quickopen/filesystemfilter.h +++ b/src/plugins/quickopen/filesystemfilter.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/quickopen/iquickopenfilter.cpp b/src/plugins/quickopen/iquickopenfilter.cpp index 82922e3ba2..adca7a71a4 100644 --- a/src/plugins/quickopen/iquickopenfilter.cpp +++ b/src/plugins/quickopen/iquickopenfilter.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/quickopen/iquickopenfilter.h b/src/plugins/quickopen/iquickopenfilter.h index d5591ac940..b06e2bb976 100644 --- a/src/plugins/quickopen/iquickopenfilter.h +++ b/src/plugins/quickopen/iquickopenfilter.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/quickopen/opendocumentsfilter.cpp b/src/plugins/quickopen/opendocumentsfilter.cpp index 0ee4ad8e98..d8039de874 100644 --- a/src/plugins/quickopen/opendocumentsfilter.cpp +++ b/src/plugins/quickopen/opendocumentsfilter.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/quickopen/opendocumentsfilter.h b/src/plugins/quickopen/opendocumentsfilter.h index 6957119727..4462810ff2 100644 --- a/src/plugins/quickopen/opendocumentsfilter.h +++ b/src/plugins/quickopen/opendocumentsfilter.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/quickopen/quickopen_global.h b/src/plugins/quickopen/quickopen_global.h index 5d0c896f56..d887df3829 100644 --- a/src/plugins/quickopen/quickopen_global.h +++ b/src/plugins/quickopen/quickopen_global.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/quickopen/quickopenconstants.h b/src/plugins/quickopen/quickopenconstants.h index 9cce426877..9a0d2be319 100644 --- a/src/plugins/quickopen/quickopenconstants.h +++ b/src/plugins/quickopen/quickopenconstants.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/quickopen/quickopenfiltersfilter.cpp b/src/plugins/quickopen/quickopenfiltersfilter.cpp index 519c56daec..6bff7a73ed 100644 --- a/src/plugins/quickopen/quickopenfiltersfilter.cpp +++ b/src/plugins/quickopen/quickopenfiltersfilter.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/quickopen/quickopenfiltersfilter.h b/src/plugins/quickopen/quickopenfiltersfilter.h index 2e3c1dc906..3c68d815c2 100644 --- a/src/plugins/quickopen/quickopenfiltersfilter.h +++ b/src/plugins/quickopen/quickopenfiltersfilter.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/quickopen/quickopenmanager.cpp b/src/plugins/quickopen/quickopenmanager.cpp index 1cabeb6bc2..b6e5cb9ccb 100644 --- a/src/plugins/quickopen/quickopenmanager.cpp +++ b/src/plugins/quickopen/quickopenmanager.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/quickopen/quickopenmanager.h b/src/plugins/quickopen/quickopenmanager.h index 72b85f72d5..52277d0e54 100644 --- a/src/plugins/quickopen/quickopenmanager.h +++ b/src/plugins/quickopen/quickopenmanager.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/quickopen/quickopenplugin.cpp b/src/plugins/quickopen/quickopenplugin.cpp index a2956eb3b5..d38502815d 100644 --- a/src/plugins/quickopen/quickopenplugin.cpp +++ b/src/plugins/quickopen/quickopenplugin.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/quickopen/quickopenplugin.h b/src/plugins/quickopen/quickopenplugin.h index 58220368b4..e87e8b313d 100644 --- a/src/plugins/quickopen/quickopenplugin.h +++ b/src/plugins/quickopen/quickopenplugin.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/quickopen/quickopentoolwindow.cpp b/src/plugins/quickopen/quickopentoolwindow.cpp index 9701923515..415e347a3a 100644 --- a/src/plugins/quickopen/quickopentoolwindow.cpp +++ b/src/plugins/quickopen/quickopentoolwindow.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/quickopen/quickopentoolwindow.h b/src/plugins/quickopen/quickopentoolwindow.h index b4bcbf9172..896c1ab1ed 100644 --- a/src/plugins/quickopen/quickopentoolwindow.h +++ b/src/plugins/quickopen/quickopentoolwindow.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/quickopen/settingspage.cpp b/src/plugins/quickopen/settingspage.cpp index d84253d2b1..c5ab95477b 100644 --- a/src/plugins/quickopen/settingspage.cpp +++ b/src/plugins/quickopen/settingspage.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/quickopen/settingspage.h b/src/plugins/quickopen/settingspage.h index 7acbdadf73..755763b2f6 100644 --- a/src/plugins/quickopen/settingspage.h +++ b/src/plugins/quickopen/settingspage.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/regexp/RegExp.pluginspec b/src/plugins/regexp/RegExp.pluginspec index 03d0900967..c284def7f3 100644 --- a/src/plugins/regexp/RegExp.pluginspec +++ b/src/plugins/regexp/RegExp.pluginspec @@ -1,7 +1,7 @@ <plugin name="RegExp" version="0.9.1" compatVersion="0.9.1"> <vendor>Nokia Corporation</vendor> <copyright>(C) 2008 Nokia Corporation</copyright> - <license>Nokia Technology Preview License Agreement</license> + <license>Nokia Beta Version License</license> <description>Regular Expression test widget.</description> <url>http://www.trolltech.com/</url> <dependencyList> diff --git a/src/plugins/regexp/regexpplugin.cpp b/src/plugins/regexp/regexpplugin.cpp index 42a8601821..42070682f9 100644 --- a/src/plugins/regexp/regexpplugin.cpp +++ b/src/plugins/regexp/regexpplugin.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/regexp/regexpplugin.h b/src/plugins/regexp/regexpplugin.h index 4a81ce347e..b4d8db227c 100644 --- a/src/plugins/regexp/regexpplugin.h +++ b/src/plugins/regexp/regexpplugin.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/regexp/regexpwindow.cpp b/src/plugins/regexp/regexpwindow.cpp index cfa245a1c4..418faaf4f2 100644 --- a/src/plugins/regexp/regexpwindow.cpp +++ b/src/plugins/regexp/regexpwindow.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/regexp/regexpwindow.h b/src/plugins/regexp/regexpwindow.h index 73ae07e3ab..f6c87d587b 100644 --- a/src/plugins/regexp/regexpwindow.h +++ b/src/plugins/regexp/regexpwindow.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/regexp/settings.cpp b/src/plugins/regexp/settings.cpp index d98795c375..b2d9a6ceaf 100644 --- a/src/plugins/regexp/settings.cpp +++ b/src/plugins/regexp/settings.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/regexp/settings.h b/src/plugins/regexp/settings.h index 1c1a8a6ce7..80d124db54 100644 --- a/src/plugins/regexp/settings.h +++ b/src/plugins/regexp/settings.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/resourceeditor/ResourceEditor.pluginspec b/src/plugins/resourceeditor/ResourceEditor.pluginspec index cddde0b0d9..e46b249dbf 100644 --- a/src/plugins/resourceeditor/ResourceEditor.pluginspec +++ b/src/plugins/resourceeditor/ResourceEditor.pluginspec @@ -1,7 +1,7 @@ <plugin name="ResourceEditor" version="0.9.1" compatVersion="0.9.1"> <vendor>Nokia Corporation</vendor> <copyright>(C) 2008 Nokia Corporation</copyright> - <license>Nokia Technology Preview License Agreement</license> + <license>Nokia Beta Version License</license> <description>Editor for qrc files.</description> <url>http://www.trolltech.com/</url> <dependencyList> diff --git a/src/plugins/resourceeditor/resourceeditorconstants.h b/src/plugins/resourceeditor/resourceeditorconstants.h index 739afefee7..df5d97c756 100644 --- a/src/plugins/resourceeditor/resourceeditorconstants.h +++ b/src/plugins/resourceeditor/resourceeditorconstants.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/resourceeditor/resourceeditorfactory.cpp b/src/plugins/resourceeditor/resourceeditorfactory.cpp index a849bb0d20..64c1dc9cfc 100644 --- a/src/plugins/resourceeditor/resourceeditorfactory.cpp +++ b/src/plugins/resourceeditor/resourceeditorfactory.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/resourceeditor/resourceeditorfactory.h b/src/plugins/resourceeditor/resourceeditorfactory.h index e9b50af098..8d6ffa9df6 100644 --- a/src/plugins/resourceeditor/resourceeditorfactory.h +++ b/src/plugins/resourceeditor/resourceeditorfactory.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/resourceeditor/resourceeditorplugin.cpp b/src/plugins/resourceeditor/resourceeditorplugin.cpp index 44284f06fd..2d8c3370bf 100644 --- a/src/plugins/resourceeditor/resourceeditorplugin.cpp +++ b/src/plugins/resourceeditor/resourceeditorplugin.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/resourceeditor/resourceeditorplugin.h b/src/plugins/resourceeditor/resourceeditorplugin.h index 94c7f6054c..d646be712a 100644 --- a/src/plugins/resourceeditor/resourceeditorplugin.h +++ b/src/plugins/resourceeditor/resourceeditorplugin.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/resourceeditor/resourceeditorw.cpp b/src/plugins/resourceeditor/resourceeditorw.cpp index 7eefdcb772..652470cb87 100644 --- a/src/plugins/resourceeditor/resourceeditorw.cpp +++ b/src/plugins/resourceeditor/resourceeditorw.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/resourceeditor/resourceeditorw.h b/src/plugins/resourceeditor/resourceeditorw.h index ed21cde8a5..4aff0ae989 100644 --- a/src/plugins/resourceeditor/resourceeditorw.h +++ b/src/plugins/resourceeditor/resourceeditorw.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/resourceeditor/resourcewizard.cpp b/src/plugins/resourceeditor/resourcewizard.cpp index 838e1c079b..72e801b1ef 100644 --- a/src/plugins/resourceeditor/resourcewizard.cpp +++ b/src/plugins/resourceeditor/resourcewizard.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/resourceeditor/resourcewizard.h b/src/plugins/resourceeditor/resourcewizard.h index 5681f64051..0ddc677f2a 100644 --- a/src/plugins/resourceeditor/resourcewizard.h +++ b/src/plugins/resourceeditor/resourcewizard.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/snippets/Snippets.pluginspec b/src/plugins/snippets/Snippets.pluginspec index 362791eb16..9128dc76e9 100644 --- a/src/plugins/snippets/Snippets.pluginspec +++ b/src/plugins/snippets/Snippets.pluginspec @@ -1,7 +1,7 @@ <plugin name="Snippets" version="0.9.1" compatVersion="0.9.1"> <vendor>Nokia Corporation</vendor> <copyright>(C) 2008 Nokia Corporation</copyright> - <license>Nokia Technology Preview License Agreement</license> + <license>Nokia Beta Version License</license> <description>Code snippet plugin.</description> <url>http://www.trolltech.com/</url> <dependencyList> diff --git a/src/plugins/snippets/inputwidget.cpp b/src/plugins/snippets/inputwidget.cpp index 02abe97b37..27b89154e5 100644 --- a/src/plugins/snippets/inputwidget.cpp +++ b/src/plugins/snippets/inputwidget.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/snippets/inputwidget.h b/src/plugins/snippets/inputwidget.h index 59bf51c5e8..de8b164059 100644 --- a/src/plugins/snippets/inputwidget.h +++ b/src/plugins/snippets/inputwidget.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/snippets/snippetscompletion.cpp b/src/plugins/snippets/snippetscompletion.cpp index c09759e7f8..47a8fecc5d 100644 --- a/src/plugins/snippets/snippetscompletion.cpp +++ b/src/plugins/snippets/snippetscompletion.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/snippets/snippetscompletion.h b/src/plugins/snippets/snippetscompletion.h index 3bee53ff9d..4fb83a4881 100644 --- a/src/plugins/snippets/snippetscompletion.h +++ b/src/plugins/snippets/snippetscompletion.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/snippets/snippetspec.cpp b/src/plugins/snippets/snippetspec.cpp index 19980f879a..ca108d499a 100644 --- a/src/plugins/snippets/snippetspec.cpp +++ b/src/plugins/snippets/snippetspec.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/snippets/snippetspec.h b/src/plugins/snippets/snippetspec.h index edc5857814..f97ae89a7c 100644 --- a/src/plugins/snippets/snippetspec.h +++ b/src/plugins/snippets/snippetspec.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/snippets/snippetsplugin.cpp b/src/plugins/snippets/snippetsplugin.cpp index caef9bfcea..d46e773b73 100644 --- a/src/plugins/snippets/snippetsplugin.cpp +++ b/src/plugins/snippets/snippetsplugin.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/snippets/snippetsplugin.h b/src/plugins/snippets/snippetsplugin.h index 82af202d38..9c4e03463f 100644 --- a/src/plugins/snippets/snippetsplugin.h +++ b/src/plugins/snippets/snippetsplugin.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/snippets/snippetswindow.cpp b/src/plugins/snippets/snippetswindow.cpp index 866e753593..6a0f3a0a7d 100644 --- a/src/plugins/snippets/snippetswindow.cpp +++ b/src/plugins/snippets/snippetswindow.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/snippets/snippetswindow.h b/src/plugins/snippets/snippetswindow.h index e225e6fb4e..8c271a14db 100644 --- a/src/plugins/snippets/snippetswindow.h +++ b/src/plugins/snippets/snippetswindow.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/subversion/Subversion.pluginspec b/src/plugins/subversion/Subversion.pluginspec index f503ff1340..bddb93aba6 100644 --- a/src/plugins/subversion/Subversion.pluginspec +++ b/src/plugins/subversion/Subversion.pluginspec @@ -1,7 +1,7 @@ <plugin name="Subversion" version="0.9.1" compatVersion="0.9.1"> <vendor>Nokia Corporation</vendor> <copyright>(C) 2008 Nokia Corporation</copyright> - <license>Nokia Technology Preview License Agreement</license> + <license>Nokia Beta Version License</license> <description>Subversion integration.</description> <url>http://www.trolltech.com/</url> <dependencyList> diff --git a/src/plugins/subversion/annotationhighlighter.cpp b/src/plugins/subversion/annotationhighlighter.cpp index d8ec2f5932..919bb317ab 100644 --- a/src/plugins/subversion/annotationhighlighter.cpp +++ b/src/plugins/subversion/annotationhighlighter.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/subversion/annotationhighlighter.h b/src/plugins/subversion/annotationhighlighter.h index d822d4b65e..db9f658395 100644 --- a/src/plugins/subversion/annotationhighlighter.h +++ b/src/plugins/subversion/annotationhighlighter.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/subversion/changenumberdialog.cpp b/src/plugins/subversion/changenumberdialog.cpp index 70e8acf666..42a00c8059 100644 --- a/src/plugins/subversion/changenumberdialog.cpp +++ b/src/plugins/subversion/changenumberdialog.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/subversion/changenumberdialog.h b/src/plugins/subversion/changenumberdialog.h index 9a6be9fa04..9b857302c1 100644 --- a/src/plugins/subversion/changenumberdialog.h +++ b/src/plugins/subversion/changenumberdialog.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/subversion/settingspage.cpp b/src/plugins/subversion/settingspage.cpp index 4621928b96..e8c300c600 100644 --- a/src/plugins/subversion/settingspage.cpp +++ b/src/plugins/subversion/settingspage.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/subversion/settingspage.h b/src/plugins/subversion/settingspage.h index 8ac704f072..973a2824e0 100644 --- a/src/plugins/subversion/settingspage.h +++ b/src/plugins/subversion/settingspage.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/subversion/subversionconstants.h b/src/plugins/subversion/subversionconstants.h index 6b2e9d3416..1d385e560d 100644 --- a/src/plugins/subversion/subversionconstants.h +++ b/src/plugins/subversion/subversionconstants.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/subversion/subversioncontrol.cpp b/src/plugins/subversion/subversioncontrol.cpp index 56ad229954..a600f841f3 100644 --- a/src/plugins/subversion/subversioncontrol.cpp +++ b/src/plugins/subversion/subversioncontrol.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/subversion/subversioncontrol.h b/src/plugins/subversion/subversioncontrol.h index c4a2f8aa79..bcccef4548 100644 --- a/src/plugins/subversion/subversioncontrol.h +++ b/src/plugins/subversion/subversioncontrol.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/subversion/subversioneditor.cpp b/src/plugins/subversion/subversioneditor.cpp index 3552c0f9b4..44950872c2 100644 --- a/src/plugins/subversion/subversioneditor.cpp +++ b/src/plugins/subversion/subversioneditor.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/subversion/subversioneditor.h b/src/plugins/subversion/subversioneditor.h index b4133890fb..518c8e1b73 100644 --- a/src/plugins/subversion/subversioneditor.h +++ b/src/plugins/subversion/subversioneditor.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/subversion/subversionoutputwindow.cpp b/src/plugins/subversion/subversionoutputwindow.cpp index 8c3749ff5e..f8f4740b54 100644 --- a/src/plugins/subversion/subversionoutputwindow.cpp +++ b/src/plugins/subversion/subversionoutputwindow.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/subversion/subversionoutputwindow.h b/src/plugins/subversion/subversionoutputwindow.h index f201beac4f..130c26a781 100644 --- a/src/plugins/subversion/subversionoutputwindow.h +++ b/src/plugins/subversion/subversionoutputwindow.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp index 2865bb0f01..5f5200aab3 100644 --- a/src/plugins/subversion/subversionplugin.cpp +++ b/src/plugins/subversion/subversionplugin.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/subversion/subversionplugin.h b/src/plugins/subversion/subversionplugin.h index af77baa6ea..6c2c448241 100644 --- a/src/plugins/subversion/subversionplugin.h +++ b/src/plugins/subversion/subversionplugin.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/subversion/subversionsettings.cpp b/src/plugins/subversion/subversionsettings.cpp index 0fb800a533..3460739f4f 100644 --- a/src/plugins/subversion/subversionsettings.cpp +++ b/src/plugins/subversion/subversionsettings.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/subversion/subversionsettings.h b/src/plugins/subversion/subversionsettings.h index 4f4c073a03..1719016c59 100644 --- a/src/plugins/subversion/subversionsettings.h +++ b/src/plugins/subversion/subversionsettings.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/subversion/subversionsubmiteditor.cpp b/src/plugins/subversion/subversionsubmiteditor.cpp index 01aac80a2b..b1e97e676e 100644 --- a/src/plugins/subversion/subversionsubmiteditor.cpp +++ b/src/plugins/subversion/subversionsubmiteditor.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/subversion/subversionsubmiteditor.h b/src/plugins/subversion/subversionsubmiteditor.h index efb97dade2..c6bf0845eb 100644 --- a/src/plugins/subversion/subversionsubmiteditor.h +++ b/src/plugins/subversion/subversionsubmiteditor.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/texteditor/TextEditor.pluginspec b/src/plugins/texteditor/TextEditor.pluginspec index aaad622ea4..5c9506925c 100644 --- a/src/plugins/texteditor/TextEditor.pluginspec +++ b/src/plugins/texteditor/TextEditor.pluginspec @@ -1,7 +1,7 @@ <plugin name="TextEditor" version="0.9.1" compatVersion="0.9.1"> <vendor>Nokia Corporation</vendor> <copyright>(C) 2008 Nokia Corporation</copyright> - <license>Nokia Technology Preview License Agreement</license> + <license>Nokia Beta Version License</license> <description>Text editor framework and the implementation of the basic text editor.</description> <url>http://www.trolltech.com/</url> <dependencyList> diff --git a/src/plugins/texteditor/basefilefind.cpp b/src/plugins/texteditor/basefilefind.cpp index 4811e4e4c1..60072084c7 100644 --- a/src/plugins/texteditor/basefilefind.cpp +++ b/src/plugins/texteditor/basefilefind.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/texteditor/basefilefind.h b/src/plugins/texteditor/basefilefind.h index 0e3cce643b..e20a750330 100644 --- a/src/plugins/texteditor/basefilefind.h +++ b/src/plugins/texteditor/basefilefind.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/texteditor/basetextdocument.cpp b/src/plugins/texteditor/basetextdocument.cpp index 3758b13327..de6054cfa8 100644 --- a/src/plugins/texteditor/basetextdocument.cpp +++ b/src/plugins/texteditor/basetextdocument.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/texteditor/basetextdocument.h b/src/plugins/texteditor/basetextdocument.h index b945129c47..b54a45b888 100644 --- a/src/plugins/texteditor/basetextdocument.h +++ b/src/plugins/texteditor/basetextdocument.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp index ab8f87c5a8..48de83d5ef 100644 --- a/src/plugins/texteditor/basetexteditor.cpp +++ b/src/plugins/texteditor/basetexteditor.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/texteditor/basetexteditor.h b/src/plugins/texteditor/basetexteditor.h index 1d6444557e..7cdcafdf7f 100644 --- a/src/plugins/texteditor/basetexteditor.h +++ b/src/plugins/texteditor/basetexteditor.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/texteditor/basetexteditor_p.h b/src/plugins/texteditor/basetexteditor_p.h index 9f1e5a7eb6..2b58682385 100644 --- a/src/plugins/texteditor/basetexteditor_p.h +++ b/src/plugins/texteditor/basetexteditor_p.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/texteditor/basetextmark.cpp b/src/plugins/texteditor/basetextmark.cpp index d3ec41eb29..5d4c17ac9b 100644 --- a/src/plugins/texteditor/basetextmark.cpp +++ b/src/plugins/texteditor/basetextmark.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/texteditor/basetextmark.h b/src/plugins/texteditor/basetextmark.h index 3e1044d9a7..4010db3f6b 100644 --- a/src/plugins/texteditor/basetextmark.h +++ b/src/plugins/texteditor/basetextmark.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/texteditor/codecselector.cpp b/src/plugins/texteditor/codecselector.cpp index 3dcdf9f373..2c4138dbc7 100644 --- a/src/plugins/texteditor/codecselector.cpp +++ b/src/plugins/texteditor/codecselector.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/texteditor/codecselector.h b/src/plugins/texteditor/codecselector.h index 82ba9e515d..e221d279e6 100644 --- a/src/plugins/texteditor/codecselector.h +++ b/src/plugins/texteditor/codecselector.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/texteditor/completionsupport.cpp b/src/plugins/texteditor/completionsupport.cpp index e7f6a5879a..34648b4bb0 100644 --- a/src/plugins/texteditor/completionsupport.cpp +++ b/src/plugins/texteditor/completionsupport.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/texteditor/completionsupport.h b/src/plugins/texteditor/completionsupport.h index b43a71aa72..d35a1347d7 100644 --- a/src/plugins/texteditor/completionsupport.h +++ b/src/plugins/texteditor/completionsupport.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/texteditor/completionwidget.cpp b/src/plugins/texteditor/completionwidget.cpp index be2a2091c3..661cda0c32 100644 --- a/src/plugins/texteditor/completionwidget.cpp +++ b/src/plugins/texteditor/completionwidget.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/texteditor/completionwidget.h b/src/plugins/texteditor/completionwidget.h index db15d599dc..c1fb28fc1c 100644 --- a/src/plugins/texteditor/completionwidget.h +++ b/src/plugins/texteditor/completionwidget.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/texteditor/displaysettings.cpp b/src/plugins/texteditor/displaysettings.cpp index 1d4d7a697b..c3b3deb15f 100644 --- a/src/plugins/texteditor/displaysettings.cpp +++ b/src/plugins/texteditor/displaysettings.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/texteditor/displaysettings.h b/src/plugins/texteditor/displaysettings.h index ebf486dc4b..86a216f24c 100644 --- a/src/plugins/texteditor/displaysettings.h +++ b/src/plugins/texteditor/displaysettings.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/texteditor/findinfiles.cpp b/src/plugins/texteditor/findinfiles.cpp index a67dbebe11..ac2276ebed 100644 --- a/src/plugins/texteditor/findinfiles.cpp +++ b/src/plugins/texteditor/findinfiles.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/texteditor/findinfiles.h b/src/plugins/texteditor/findinfiles.h index 9aeaf57be8..dc1ee8e53f 100644 --- a/src/plugins/texteditor/findinfiles.h +++ b/src/plugins/texteditor/findinfiles.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/texteditor/fontsettings.cpp b/src/plugins/texteditor/fontsettings.cpp index 2818165417..2fcef19077 100644 --- a/src/plugins/texteditor/fontsettings.cpp +++ b/src/plugins/texteditor/fontsettings.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/texteditor/fontsettings.h b/src/plugins/texteditor/fontsettings.h index 486385565d..130719f47e 100644 --- a/src/plugins/texteditor/fontsettings.h +++ b/src/plugins/texteditor/fontsettings.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/texteditor/fontsettingspage.cpp b/src/plugins/texteditor/fontsettingspage.cpp index 0c6043a7c7..bdc86ca3e1 100644 --- a/src/plugins/texteditor/fontsettingspage.cpp +++ b/src/plugins/texteditor/fontsettingspage.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/texteditor/fontsettingspage.h b/src/plugins/texteditor/fontsettingspage.h index 3a9c280c8a..dd1711cfce 100644 --- a/src/plugins/texteditor/fontsettingspage.h +++ b/src/plugins/texteditor/fontsettingspage.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/texteditor/generalsettingspage.cpp b/src/plugins/texteditor/generalsettingspage.cpp index 00ce472d66..149886cca5 100644 --- a/src/plugins/texteditor/generalsettingspage.cpp +++ b/src/plugins/texteditor/generalsettingspage.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/texteditor/generalsettingspage.h b/src/plugins/texteditor/generalsettingspage.h index 968f830978..645390288b 100644 --- a/src/plugins/texteditor/generalsettingspage.h +++ b/src/plugins/texteditor/generalsettingspage.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/texteditor/icompletioncollector.h b/src/plugins/texteditor/icompletioncollector.h index d04dc6fad4..3144427f49 100644 --- a/src/plugins/texteditor/icompletioncollector.h +++ b/src/plugins/texteditor/icompletioncollector.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/texteditor/itexteditable.h b/src/plugins/texteditor/itexteditable.h index 864c280a3d..c24692e61d 100644 --- a/src/plugins/texteditor/itexteditable.h +++ b/src/plugins/texteditor/itexteditable.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/texteditor/itexteditor.h b/src/plugins/texteditor/itexteditor.h index 514f311472..57b93461b6 100644 --- a/src/plugins/texteditor/itexteditor.h +++ b/src/plugins/texteditor/itexteditor.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/texteditor/linenumberfilter.cpp b/src/plugins/texteditor/linenumberfilter.cpp index 1dd9e70720..a084ac6c33 100644 --- a/src/plugins/texteditor/linenumberfilter.cpp +++ b/src/plugins/texteditor/linenumberfilter.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/texteditor/linenumberfilter.h b/src/plugins/texteditor/linenumberfilter.h index c1e3a6af8f..353e7b005d 100644 --- a/src/plugins/texteditor/linenumberfilter.h +++ b/src/plugins/texteditor/linenumberfilter.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/texteditor/plaintexteditor.cpp b/src/plugins/texteditor/plaintexteditor.cpp index 88267dd53f..277d7fce0c 100644 --- a/src/plugins/texteditor/plaintexteditor.cpp +++ b/src/plugins/texteditor/plaintexteditor.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/texteditor/plaintexteditor.h b/src/plugins/texteditor/plaintexteditor.h index 2e8c9b980c..15dbb1b991 100644 --- a/src/plugins/texteditor/plaintexteditor.h +++ b/src/plugins/texteditor/plaintexteditor.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/texteditor/plaintexteditorfactory.cpp b/src/plugins/texteditor/plaintexteditorfactory.cpp index 67ceeb9e54..874619cce5 100644 --- a/src/plugins/texteditor/plaintexteditorfactory.cpp +++ b/src/plugins/texteditor/plaintexteditorfactory.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/texteditor/plaintexteditorfactory.h b/src/plugins/texteditor/plaintexteditorfactory.h index 25e975dbf5..b1604a94f1 100644 --- a/src/plugins/texteditor/plaintexteditorfactory.h +++ b/src/plugins/texteditor/plaintexteditorfactory.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/texteditor/storagesettings.cpp b/src/plugins/texteditor/storagesettings.cpp index c940ff641b..2d09e0d6b2 100644 --- a/src/plugins/texteditor/storagesettings.cpp +++ b/src/plugins/texteditor/storagesettings.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/texteditor/storagesettings.h b/src/plugins/texteditor/storagesettings.h index a7040dac41..7ccf80f981 100644 --- a/src/plugins/texteditor/storagesettings.h +++ b/src/plugins/texteditor/storagesettings.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/texteditor/tabsettings.cpp b/src/plugins/texteditor/tabsettings.cpp index 19145a7cd9..413e650c7b 100644 --- a/src/plugins/texteditor/tabsettings.cpp +++ b/src/plugins/texteditor/tabsettings.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/texteditor/tabsettings.h b/src/plugins/texteditor/tabsettings.h index f639cc6c8b..2a8fbc31c3 100644 --- a/src/plugins/texteditor/tabsettings.h +++ b/src/plugins/texteditor/tabsettings.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/texteditor/textblockiterator.cpp b/src/plugins/texteditor/textblockiterator.cpp index 8581edc627..b94f0a19f5 100644 --- a/src/plugins/texteditor/textblockiterator.cpp +++ b/src/plugins/texteditor/textblockiterator.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/texteditor/textblockiterator.h b/src/plugins/texteditor/textblockiterator.h index 22f1e623f1..d39a7af229 100644 --- a/src/plugins/texteditor/textblockiterator.h +++ b/src/plugins/texteditor/textblockiterator.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/texteditor/texteditor_global.h b/src/plugins/texteditor/texteditor_global.h index 4c0fd1a69f..5876f889a0 100644 --- a/src/plugins/texteditor/texteditor_global.h +++ b/src/plugins/texteditor/texteditor_global.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/texteditor/texteditoractionhandler.cpp b/src/plugins/texteditor/texteditoractionhandler.cpp index 39a12ee93f..12475d221b 100644 --- a/src/plugins/texteditor/texteditoractionhandler.cpp +++ b/src/plugins/texteditor/texteditoractionhandler.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/texteditor/texteditoractionhandler.h b/src/plugins/texteditor/texteditoractionhandler.h index 98e8c9198a..45dcca1f97 100644 --- a/src/plugins/texteditor/texteditoractionhandler.h +++ b/src/plugins/texteditor/texteditoractionhandler.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/texteditor/texteditorconstants.h b/src/plugins/texteditor/texteditorconstants.h index d9147a9a9e..46d5bf363e 100644 --- a/src/plugins/texteditor/texteditorconstants.h +++ b/src/plugins/texteditor/texteditorconstants.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/texteditor/texteditorplugin.cpp b/src/plugins/texteditor/texteditorplugin.cpp index ff102b5311..01a6ccdf95 100644 --- a/src/plugins/texteditor/texteditorplugin.cpp +++ b/src/plugins/texteditor/texteditorplugin.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/texteditor/texteditorplugin.h b/src/plugins/texteditor/texteditorplugin.h index e5c6a830a7..8eeb1e3e8e 100644 --- a/src/plugins/texteditor/texteditorplugin.h +++ b/src/plugins/texteditor/texteditorplugin.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/texteditor/texteditorsettings.cpp b/src/plugins/texteditor/texteditorsettings.cpp index 20b4e1037f..2f9c597be6 100644 --- a/src/plugins/texteditor/texteditorsettings.cpp +++ b/src/plugins/texteditor/texteditorsettings.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/texteditor/texteditorsettings.h b/src/plugins/texteditor/texteditorsettings.h index cbb0db1598..e64cb795b2 100644 --- a/src/plugins/texteditor/texteditorsettings.h +++ b/src/plugins/texteditor/texteditorsettings.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/texteditor/textfilewizard.cpp b/src/plugins/texteditor/textfilewizard.cpp index aa8e2b7747..1236a64537 100644 --- a/src/plugins/texteditor/textfilewizard.cpp +++ b/src/plugins/texteditor/textfilewizard.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/texteditor/textfilewizard.h b/src/plugins/texteditor/textfilewizard.h index d5593d50bd..788b60f21d 100644 --- a/src/plugins/texteditor/textfilewizard.h +++ b/src/plugins/texteditor/textfilewizard.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/vcsbase/VCSBase.pluginspec b/src/plugins/vcsbase/VCSBase.pluginspec index da0b618d26..1f9cd30dd2 100644 --- a/src/plugins/vcsbase/VCSBase.pluginspec +++ b/src/plugins/vcsbase/VCSBase.pluginspec @@ -1,7 +1,7 @@ <plugin name="VCSBase" version="0.9.1" compatVersion="0.9.1"> <vendor>Nokia Corporation</vendor> <copyright>(C) 2008 Nokia Corporation</copyright> - <license>Nokia Technology Preview License Agreement</license> + <license>Nokia Beta Version License</license> <description>Version Control System Base Plugin</description> <url>http://www.trolltech.com/</url> <dependencyList> diff --git a/src/plugins/vcsbase/baseannotationhighlighter.cpp b/src/plugins/vcsbase/baseannotationhighlighter.cpp index 167c1d7d31..c55a526fc1 100644 --- a/src/plugins/vcsbase/baseannotationhighlighter.cpp +++ b/src/plugins/vcsbase/baseannotationhighlighter.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/vcsbase/baseannotationhighlighter.h b/src/plugins/vcsbase/baseannotationhighlighter.h index bedd11a12b..e32fdf077b 100644 --- a/src/plugins/vcsbase/baseannotationhighlighter.h +++ b/src/plugins/vcsbase/baseannotationhighlighter.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/vcsbase/basevcseditorfactory.cpp b/src/plugins/vcsbase/basevcseditorfactory.cpp index 28fa74a737..4177608c27 100644 --- a/src/plugins/vcsbase/basevcseditorfactory.cpp +++ b/src/plugins/vcsbase/basevcseditorfactory.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/vcsbase/basevcseditorfactory.h b/src/plugins/vcsbase/basevcseditorfactory.h index 1f01f4fee7..1bf543347b 100644 --- a/src/plugins/vcsbase/basevcseditorfactory.h +++ b/src/plugins/vcsbase/basevcseditorfactory.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/vcsbase/basevcssubmiteditorfactory.cpp b/src/plugins/vcsbase/basevcssubmiteditorfactory.cpp index ff4a9d4b1b..f880d78066 100644 --- a/src/plugins/vcsbase/basevcssubmiteditorfactory.cpp +++ b/src/plugins/vcsbase/basevcssubmiteditorfactory.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/vcsbase/basevcssubmiteditorfactory.h b/src/plugins/vcsbase/basevcssubmiteditorfactory.h index 1925317b37..20b8bd8232 100644 --- a/src/plugins/vcsbase/basevcssubmiteditorfactory.h +++ b/src/plugins/vcsbase/basevcssubmiteditorfactory.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/vcsbase/diffhighlighter.cpp b/src/plugins/vcsbase/diffhighlighter.cpp index f5fe9fff92..b4cc9af0ff 100644 --- a/src/plugins/vcsbase/diffhighlighter.cpp +++ b/src/plugins/vcsbase/diffhighlighter.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/vcsbase/diffhighlighter.h b/src/plugins/vcsbase/diffhighlighter.h index 3b3e47ed36..20d03c8058 100644 --- a/src/plugins/vcsbase/diffhighlighter.h +++ b/src/plugins/vcsbase/diffhighlighter.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/vcsbase/submiteditorfile.cpp b/src/plugins/vcsbase/submiteditorfile.cpp index 4fd9398881..902b830f7d 100644 --- a/src/plugins/vcsbase/submiteditorfile.cpp +++ b/src/plugins/vcsbase/submiteditorfile.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/vcsbase/submiteditorfile.h b/src/plugins/vcsbase/submiteditorfile.h index a3e9704d7c..fd1bbf8368 100644 --- a/src/plugins/vcsbase/submiteditorfile.h +++ b/src/plugins/vcsbase/submiteditorfile.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/vcsbase/vcsbase_global.h b/src/plugins/vcsbase/vcsbase_global.h index f3bc7bac50..9196019fbd 100644 --- a/src/plugins/vcsbase/vcsbase_global.h +++ b/src/plugins/vcsbase/vcsbase_global.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/vcsbase/vcsbaseconstants.h b/src/plugins/vcsbase/vcsbaseconstants.h index 1a0765c72e..9cdcbb8dea 100644 --- a/src/plugins/vcsbase/vcsbaseconstants.h +++ b/src/plugins/vcsbase/vcsbaseconstants.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/vcsbase/vcsbaseeditor.cpp b/src/plugins/vcsbase/vcsbaseeditor.cpp index 004792b873..084109069d 100644 --- a/src/plugins/vcsbase/vcsbaseeditor.cpp +++ b/src/plugins/vcsbase/vcsbaseeditor.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/vcsbase/vcsbaseeditor.h b/src/plugins/vcsbase/vcsbaseeditor.h index f1de4f1877..fcb323e693 100644 --- a/src/plugins/vcsbase/vcsbaseeditor.h +++ b/src/plugins/vcsbase/vcsbaseeditor.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/vcsbase/vcsbaseplugin.cpp b/src/plugins/vcsbase/vcsbaseplugin.cpp index f5a480126e..9633f60ba1 100644 --- a/src/plugins/vcsbase/vcsbaseplugin.cpp +++ b/src/plugins/vcsbase/vcsbaseplugin.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/vcsbase/vcsbaseplugin.h b/src/plugins/vcsbase/vcsbaseplugin.h index 3036157e9d..3474c4a05f 100644 --- a/src/plugins/vcsbase/vcsbaseplugin.h +++ b/src/plugins/vcsbase/vcsbaseplugin.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp index 6152a93b79..152a51c386 100644 --- a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp +++ b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.h b/src/plugins/vcsbase/vcsbasesubmiteditor.h index dcaf7cf89d..91a43b06d4 100644 --- a/src/plugins/vcsbase/vcsbasesubmiteditor.h +++ b/src/plugins/vcsbase/vcsbasesubmiteditor.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/vcsbase/vcsbasetextdocument.cpp b/src/plugins/vcsbase/vcsbasetextdocument.cpp index 9a720f4e07..fcd50c12f4 100644 --- a/src/plugins/vcsbase/vcsbasetextdocument.cpp +++ b/src/plugins/vcsbase/vcsbasetextdocument.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/plugins/vcsbase/vcsbasetextdocument.h b/src/plugins/vcsbase/vcsbasetextdocument.h index d4a321be45..e4bb7d1ce8 100644 --- a/src/plugins/vcsbase/vcsbasetextdocument.h +++ b/src/plugins/vcsbase/vcsbasetextdocument.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/tools/makespy/main.cpp b/src/tools/makespy/main.cpp index e8ebd7dea0..fe9d0d616e 100644 --- a/src/tools/makespy/main.cpp +++ b/src/tools/makespy/main.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/tools/qdebugger/lean.h b/src/tools/qdebugger/lean.h index 762e61af9b..4d06d8437c 100644 --- a/src/tools/qdebugger/lean.h +++ b/src/tools/qdebugger/lean.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/tools/qdebugger/main.cpp b/src/tools/qdebugger/main.cpp index 93cddaabf8..d151bb6fa2 100644 --- a/src/tools/qdebugger/main.cpp +++ b/src/tools/qdebugger/main.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/tools/qdebugger/mainwindow.cpp b/src/tools/qdebugger/mainwindow.cpp index 8729f94724..7984626a78 100644 --- a/src/tools/qdebugger/mainwindow.cpp +++ b/src/tools/qdebugger/mainwindow.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/tools/qdebugger/mainwindow.h b/src/tools/qdebugger/mainwindow.h index f5fd07e04d..1c0d17a7bc 100644 --- a/src/tools/qdebugger/mainwindow.h +++ b/src/tools/qdebugger/mainwindow.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/tools/qtcreatorwidgets/customwidget.h b/src/tools/qtcreatorwidgets/customwidget.h index 7d925fbb1c..76edcd3176 100644 --- a/src/tools/qtcreatorwidgets/customwidget.h +++ b/src/tools/qtcreatorwidgets/customwidget.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/tools/qtcreatorwidgets/customwidgets.cpp b/src/tools/qtcreatorwidgets/customwidgets.cpp index 543d5e4f4c..3b40172633 100644 --- a/src/tools/qtcreatorwidgets/customwidgets.cpp +++ b/src/tools/qtcreatorwidgets/customwidgets.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/tools/qtcreatorwidgets/customwidgets.h b/src/tools/qtcreatorwidgets/customwidgets.h index 073b01d94c..f78e88939e 100644 --- a/src/tools/qtcreatorwidgets/customwidgets.h +++ b/src/tools/qtcreatorwidgets/customwidgets.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/tools/texteditor/main.cpp b/src/tools/texteditor/main.cpp index 219abf1296..d080780f93 100644 --- a/src/tools/texteditor/main.cpp +++ b/src/tools/texteditor/main.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/tools/texteditor/mainwindow.cpp b/src/tools/texteditor/mainwindow.cpp index a86379d5b6..7935a1cc49 100644 --- a/src/tools/texteditor/mainwindow.cpp +++ b/src/tools/texteditor/mainwindow.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/src/tools/texteditor/mainwindow.h b/src/tools/texteditor/mainwindow.h index 007421cd3d..bf6f53cee3 100644 --- a/src/tools/texteditor/mainwindow.h +++ b/src/tools/texteditor/mainwindow.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/tests/auto/extensionsystem/tst_composite.cpp b/tests/auto/extensionsystem/tst_composite.cpp index bb0934a66e..6606f243ac 100644 --- a/tests/auto/extensionsystem/tst_composite.cpp +++ b/tests/auto/extensionsystem/tst_composite.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/tests/auto/profilereader/main.cpp b/tests/auto/profilereader/main.cpp index f3ef9a4bf9..ec5945d2b7 100644 --- a/tests/auto/profilereader/main.cpp +++ b/tests/auto/profilereader/main.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/tests/auto/profilereader/profilecache.h b/tests/auto/profilereader/profilecache.h index cc31702be5..eef60ee562 100644 --- a/tests/auto/profilereader/profilecache.h +++ b/tests/auto/profilereader/profilecache.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/tests/auto/profilereader/qtversionmanager.h b/tests/auto/profilereader/qtversionmanager.h index ed7f871358..29ec0ff105 100644 --- a/tests/auto/profilereader/qtversionmanager.h +++ b/tests/auto/profilereader/qtversionmanager.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/tests/manual/cplusplus/main.cpp b/tests/manual/cplusplus/main.cpp index fd3c730f41..641c25366c 100644 --- a/tests/manual/cplusplus/main.cpp +++ b/tests/manual/cplusplus/main.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/tests/manual/dockwidgets/main.cpp b/tests/manual/dockwidgets/main.cpp index e07796c884..28fae35795 100644 --- a/tests/manual/dockwidgets/main.cpp +++ b/tests/manual/dockwidgets/main.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/tests/manual/dockwidgets/mainwindow.cpp b/tests/manual/dockwidgets/mainwindow.cpp index 561a2c42d2..3e9f8622fb 100644 --- a/tests/manual/dockwidgets/mainwindow.cpp +++ b/tests/manual/dockwidgets/mainwindow.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/tests/manual/dockwidgets/mainwindow.h b/tests/manual/dockwidgets/mainwindow.h index 220c32dc74..d2d9e6dd38 100644 --- a/tests/manual/dockwidgets/mainwindow.h +++ b/tests/manual/dockwidgets/mainwindow.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/tests/manual/gdbdebugger/script/math.js b/tests/manual/gdbdebugger/script/math.js index 0fd14f2b9d..9c0d96c859 100644 --- a/tests/manual/gdbdebugger/script/math.js +++ b/tests/manual/gdbdebugger/script/math.js @@ -1,6 +1,39 @@ +/*************************************************************************** +** +** This file is part of Qt Creator +** +** Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies). +** +** Contact: Qt Software Information (qt-info@nokia.com) +** +** +** Non-Open Source Usage +** +** Licensees may use this file in accordance with the Qt Beta Version +** License Agreement, Agreement version 2.2 provided with the Software or, +** alternatively, in accordance with the terms contained in a written +** agreement between you and Nokia. +** +** GNU General Public License Usage +** +** Alternatively, this file may be used under the terms of the GNU General +** Public License versions 2.0 or 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the packaging +** of this file. Please review the following information to ensure GNU +** General Public Licensing requirements will be met: +** +** http://www.fsf.org/licensing/licenses/info/GPLv2.html and +** http://www.gnu.org/copyleft/gpl.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt GPL Exception +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. +** +***************************************************************************/ - function cube(a) { - return a * a * a; - } +function cube(a) +{ + return a * a * a; +} - var a = cube(3); +var a = cube(3); diff --git a/tests/manual/gdbdebugger/simple/app.cpp b/tests/manual/gdbdebugger/simple/app.cpp index 1eea659625..149be98c27 100644 --- a/tests/manual/gdbdebugger/simple/app.cpp +++ b/tests/manual/gdbdebugger/simple/app.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/tests/manual/gdbdebugger/simple/plugin.cpp b/tests/manual/gdbdebugger/simple/plugin.cpp index a240f22973..90c1ffd562 100644 --- a/tests/manual/gdbdebugger/simple/plugin.cpp +++ b/tests/manual/gdbdebugger/simple/plugin.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/tests/manual/gdbdebugger/spacy path/app with space.cpp b/tests/manual/gdbdebugger/spacy path/app with space.cpp index c5969e5f96..451d93ca81 100644 --- a/tests/manual/gdbdebugger/spacy path/app with space.cpp +++ b/tests/manual/gdbdebugger/spacy path/app with space.cpp @@ -1,16 +1,35 @@ - -/**************************************************************************** +/*************************************************************************** +** +** This file is part of Qt Creator +** +** Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies). +** +** Contact: Qt Software Information (qt-info@nokia.com) +** +** +** Non-Open Source Usage +** +** Licensees may use this file in accordance with the Qt Beta Version +** License Agreement, Agreement version 2.2 provided with the Software or, +** alternatively, in accordance with the terms contained in a written +** agreement between you and Nokia. ** -** Copyright (C) 2004-$THISYEAR$ Trolltech AS. All rights reserved. +** GNU General Public License Usage ** -** This file is part of the $MODULE$ of the Qt Toolkit. +** Alternatively, this file may be used under the terms of the GNU General +** Public License versions 2.0 or 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the packaging +** of this file. Please review the following information to ensure GNU +** General Public Licensing requirements will be met: ** -** $LICENSE$ +** http://www.fsf.org/licensing/licenses/info/GPLv2.html and +** http://www.gnu.org/copyleft/gpl.html. ** -** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt GPL Exception +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** -****************************************************************************/ +***************************************************************************/ #include <QtCore/QDebug> #include <QtCore/QDir> diff --git a/tests/manual/gdbdebugger/spacy path/plugin with space.cpp b/tests/manual/gdbdebugger/spacy path/plugin with space.cpp index 75486ccd67..90c1ffd562 100644 --- a/tests/manual/gdbdebugger/spacy path/plugin with space.cpp +++ b/tests/manual/gdbdebugger/spacy path/plugin with space.cpp @@ -1,4 +1,35 @@ - +/*************************************************************************** +** +** This file is part of Qt Creator +** +** Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies). +** +** Contact: Qt Software Information (qt-info@nokia.com) +** +** +** Non-Open Source Usage +** +** Licensees may use this file in accordance with the Qt Beta Version +** License Agreement, Agreement version 2.2 provided with the Software or, +** alternatively, in accordance with the terms contained in a written +** agreement between you and Nokia. +** +** GNU General Public License Usage +** +** Alternatively, this file may be used under the terms of the GNU General +** Public License versions 2.0 or 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the packaging +** of this file. Please review the following information to ensure GNU +** General Public Licensing requirements will be met: +** +** http://www.fsf.org/licensing/licenses/info/GPLv2.html and +** http://www.gnu.org/copyleft/gpl.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt GPL Exception +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. +** +***************************************************************************/ #include <stdio.h> #include <qglobal.h> diff --git a/tests/manual/gdbdebugger/spacy-file/app with space.cpp b/tests/manual/gdbdebugger/spacy-file/app with space.cpp index c5969e5f96..451d93ca81 100644 --- a/tests/manual/gdbdebugger/spacy-file/app with space.cpp +++ b/tests/manual/gdbdebugger/spacy-file/app with space.cpp @@ -1,16 +1,35 @@ - -/**************************************************************************** +/*************************************************************************** +** +** This file is part of Qt Creator +** +** Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies). +** +** Contact: Qt Software Information (qt-info@nokia.com) +** +** +** Non-Open Source Usage +** +** Licensees may use this file in accordance with the Qt Beta Version +** License Agreement, Agreement version 2.2 provided with the Software or, +** alternatively, in accordance with the terms contained in a written +** agreement between you and Nokia. ** -** Copyright (C) 2004-$THISYEAR$ Trolltech AS. All rights reserved. +** GNU General Public License Usage ** -** This file is part of the $MODULE$ of the Qt Toolkit. +** Alternatively, this file may be used under the terms of the GNU General +** Public License versions 2.0 or 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the packaging +** of this file. Please review the following information to ensure GNU +** General Public Licensing requirements will be met: ** -** $LICENSE$ +** http://www.fsf.org/licensing/licenses/info/GPLv2.html and +** http://www.gnu.org/copyleft/gpl.html. ** -** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt GPL Exception +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** -****************************************************************************/ +***************************************************************************/ #include <QtCore/QDebug> #include <QtCore/QDir> diff --git a/tests/manual/gdbdebugger/spacy-file/plugin with space.cpp b/tests/manual/gdbdebugger/spacy-file/plugin with space.cpp index 75486ccd67..90c1ffd562 100644 --- a/tests/manual/gdbdebugger/spacy-file/plugin with space.cpp +++ b/tests/manual/gdbdebugger/spacy-file/plugin with space.cpp @@ -1,4 +1,35 @@ - +/*************************************************************************** +** +** This file is part of Qt Creator +** +** Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies). +** +** Contact: Qt Software Information (qt-info@nokia.com) +** +** +** Non-Open Source Usage +** +** Licensees may use this file in accordance with the Qt Beta Version +** License Agreement, Agreement version 2.2 provided with the Software or, +** alternatively, in accordance with the terms contained in a written +** agreement between you and Nokia. +** +** GNU General Public License Usage +** +** Alternatively, this file may be used under the terms of the GNU General +** Public License versions 2.0 or 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the packaging +** of this file. Please review the following information to ensure GNU +** General Public Licensing requirements will be met: +** +** http://www.fsf.org/licensing/licenses/info/GPLv2.html and +** http://www.gnu.org/copyleft/gpl.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt GPL Exception +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. +** +***************************************************************************/ #include <stdio.h> #include <qglobal.h> diff --git a/tests/manual/progressmanager/main.cpp b/tests/manual/progressmanager/main.cpp index 0ee436deb2..4375a9f367 100644 --- a/tests/manual/progressmanager/main.cpp +++ b/tests/manual/progressmanager/main.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/tests/manual/progressmanager/roundprogress.cpp b/tests/manual/progressmanager/roundprogress.cpp index 9e95221219..9a0c03d58d 100644 --- a/tests/manual/progressmanager/roundprogress.cpp +++ b/tests/manual/progressmanager/roundprogress.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/tests/manual/progressmanager/roundprogress.h b/tests/manual/progressmanager/roundprogress.h index 8c09f70a5c..9f7174b790 100644 --- a/tests/manual/progressmanager/roundprogress.h +++ b/tests/manual/progressmanager/roundprogress.h @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ diff --git a/tests/manual/proparser/main.cpp b/tests/manual/proparser/main.cpp index c99fc16cac..2c32a5ec62 100644 --- a/tests/manual/proparser/main.cpp +++ b/tests/manual/proparser/main.cpp @@ -27,7 +27,7 @@ ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception -** version 1.2, included in the file GPL_EXCEPTION.txt in this package. +** version 1.3, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ |
