diff --git a/GPL_EXCEPTION.txt b/GPL_EXCEPTION.TXT similarity index 100% rename from GPL_EXCEPTION.txt rename to GPL_EXCEPTION.TXT diff --git a/GPL_EXCEPTION_ADDENDUM.TXT b/GPL_EXCEPTION_ADDENDUM.TXT new file mode 100644 index 0000000000000000000000000000000000000000..e3d26987cda5416d50cd5b5ec8bb2278a6e5158f --- /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 775819934bcf7188fee0129a01304d2862142d7a..ca19e5870270f147d6b3ea9fc9cb083435fd16b8 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 8e4678abe429121115405e2c8cad96f68a2eb869..e965c1d70f3362db24e0631a3928e0fedb9c3813 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 c388d8bba8ec5595708a29c0f0d185c4bfb6892d..5e73ed9d91c610f34e17c247ac330bcdb5f8e078 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 7fcd061d6f1952f67425168a5af9c5a31a4ed60d..c289b45e8ce48ad072a5090db6bfa70180e6d186 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 0ff4839575d4f0af6534c5695de4493c5869c273..a712a1d12d2b9365b29dd9289e0a45fc0ed64d42 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 index 92c21e5b54418e0f21e648567259c180c22a67fd..1a1ceb62e6caf94077b5d0c819dd684205139b73 100644 Binary files a/doc/qtcreator-add-resource-wizard.png and b/doc/qtcreator-add-resource-wizard.png differ diff --git a/doc/qtcreator-add-resource-wizard2.png b/doc/qtcreator-add-resource-wizard2.png new file mode 100644 index 0000000000000000000000000000000000000000..74569996fe96fbb819f8849c243925c6a5f420a9 Binary files /dev/null and b/doc/qtcreator-add-resource-wizard2.png differ diff --git a/doc/qtcreator-add-resource.png b/doc/qtcreator-add-resource.png index 8a068987f1e3e0c45c19d9c63f8b18bd721e7ebb..036ff915484d05044eb7ac7f258362c1a90fd302 100644 Binary files a/doc/qtcreator-add-resource.png and b/doc/qtcreator-add-resource.png differ diff --git a/doc/qtcreator-breakdown.png b/doc/qtcreator-breakdown.png index 9b9f07069529ecea3f81425cc307cf0cc3ec1bc9..bba842e1f5b1a7c35ea1a64c9f36342d129f34f7 100644 Binary files a/doc/qtcreator-breakdown.png and b/doc/qtcreator-breakdown.png differ diff --git a/doc/qtcreator-class-info.png b/doc/qtcreator-class-info.png index 757eb128566bf22902be49b7286a87cfc3e6c794..a005239707657fa71423401fe8c4c20aaf8a9252 100644 Binary files a/doc/qtcreator-class-info.png and b/doc/qtcreator-class-info.png differ diff --git a/doc/qtcreator-debug-stack.png b/doc/qtcreator-debug-stack.png new file mode 100644 index 0000000000000000000000000000000000000000..d6dce2c57f0469330fe524dc886a06c23d8914ca Binary files /dev/null and b/doc/qtcreator-debug-stack.png differ diff --git a/doc/qtcreator-debug-view.png b/doc/qtcreator-debug-view.png new file mode 100644 index 0000000000000000000000000000000000000000..856a85f920063e09d1c4aed660a7e61aefaee9f7 Binary files /dev/null and b/doc/qtcreator-debug-view.png differ diff --git a/doc/qtcreator-intro-and-location.png b/doc/qtcreator-intro-and-location.png index e0d8c9f150b833de7f100451b4d13f98b6f15fae..f03e4fb6a475ea50a3f9ee456af67ef8d2f3414e 100644 Binary files a/doc/qtcreator-intro-and-location.png and b/doc/qtcreator-intro-and-location.png differ diff --git a/doc/qtcreator-new-project-summary.png b/doc/qtcreator-new-project-summary.png new file mode 100644 index 0000000000000000000000000000000000000000..05e1cf2e0d5893564ed62f584db160fd4644d710 Binary files /dev/null and b/doc/qtcreator-new-project-summary.png differ diff --git a/doc/qtcreator-new-project.png b/doc/qtcreator-new-project.png index 6f7832e5cb8f7109874ee3fabd7c4bf7e3205a89..f6c186206e916b6d24c1885288a6188e27690568 100644 Binary files a/doc/qtcreator-new-project.png and b/doc/qtcreator-new-project.png differ diff --git a/doc/qtcreator-screenshots.png b/doc/qtcreator-screenshots.png new file mode 100644 index 0000000000000000000000000000000000000000..18ae5e77f84d0a47d8553364493a68534d2cbfd7 Binary files /dev/null and b/doc/qtcreator-screenshots.png differ diff --git a/doc/qtcreator-select-modules.png b/doc/qtcreator-select-modules.png index b5b2ead006bb4308f39d1282ce97fdcacba5e0c1..313934ec974648c07bd77ae3327d36cc16f976ad 100644 Binary files a/doc/qtcreator-select-modules.png and b/doc/qtcreator-select-modules.png differ diff --git a/doc/qtcreator-setting-breakpoint2.png b/doc/qtcreator-setting-breakpoint2.png index 668c46b8a636bd03e0df5adfbc674a2516b0934c..056eb29a54de3fff089a81bfa19d37eaaec5e6a5 100644 Binary files a/doc/qtcreator-setting-breakpoint2.png and b/doc/qtcreator-setting-breakpoint2.png differ diff --git a/doc/qtcreator-watcher.png b/doc/qtcreator-watcher.png index 8495e1c6785c407f85daf05d1ae7c10d7e94376f..0e0cde052edb46cbbac54529f311fac5af8cab58 100644 Binary files a/doc/qtcreator-watcher.png and b/doc/qtcreator-watcher.png differ diff --git a/doc/qtcreator.qch b/doc/qtcreator.qch index 124510448158c63b73ae28bc6a8f2370abde0202..2d2985d9cfea1477e0d099daf7f1554d72cfbf65 100644 Binary files a/doc/qtcreator.qch and b/doc/qtcreator.qch differ diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc index 04b87584f9a620218c020893f6d9d58cb636e7b6..31ef1d571aa36cdd1dff56bc9c2d4b0c63bf0ff6 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 396423b654357701b208579c4bceca32059af1ca..b823995fa6670ccf81aea5694718daf043bd84e0 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 8357a6c597d7a19de9167f63f1a20db1dd66b87e..013d26d2b884170a88a4e1d36a63c54ba927771a 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 9ccaa53850cccc52cc6348db69326e3f94d7029f..be72b66b2f40d6899f7c2ca3721cf96024f0fbf3 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 0e4672a3f2ffa2523b5a57d516baec8f04ec1ef8..ea3a97f8d517f296c8b81220d9e6992c8a95b5a4 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 3250052cc9950b72856538a535951715ab4271af..ca2c6d73c04a1da407e0a37df10d7f959790b8e3 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 c176e2e0091d7391e5a656eedae3e10f260f2938..ec7db64677cc342d649914ddfe4a40ac9658a222 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 6e8ecd1404ca491f1ee2a41b3ea490e0ae1efa52..eeeea1ac855e3dadcde50e98f123a224c6454058 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 f459b26715d30236302488406c65e3d56ab2e9f8..d1b904348e690ac974b23d88303889424a0f56d4 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 56b15907f0b68c33ed4d553eb2928455b4684257..39995d899f4de2c6af5a90afa240d473f591d4d0 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 9e998eea5979073386f0bd9852b57ab2521175a9..d188412f76a13c191ac059a6918f5f7d495b2521 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 de8b1fa9f40ae76d1a6e81991956d31bf155e88b..5c20cc44c5e82c4875f8722a64676dac5cc3d850 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 00bc061df9c759c881e665c64b7283f991286d85..f60896dbd0bef187d56b98f3880021a144458bdc 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 22ccf1d99012fc6553cd5effa9551821c58da85c..490108136f3607b2b3e098319052203a011a795b 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 491fe27e5cce21b7f3efd584109490ee08e834d7..9b333c19e0f81afbfcc1ca8622c04638fa5ed9b3 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 6c37defe36b99cf5211570d5b3dcf31a1d046664..f1fd664b794f56a50500dbc0bff1c2ff31b9dd55 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 6058f4bc41a8547ef84cdf265d739129fd8fce0f..f5eb4113323cf584dc183c3f086e356e3f6cf033 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 d3d6d051a5e8da0b45da6bd96601e9e9f9bf71b9..248ed13a02789a8b23f70b2db6b5a7233dfb049b 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 5481aa29e7ac7ea70e5c9bfc5e1420822077ccaa..fd7cec40deb9cf73e60eaf87edc129721203a75e 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 8a1a5a04ccd64aa938c5da3afdd04c0c0ce2ecb6..9fbf242700e79d9c115c602ecd0a2ad9a22b3b19 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 ae0f12373e1c9b3fb7fe2e4c004ca5a3dca1820b..4e1ecaefd8fc6fb85a514a311651510403ca53ad 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 525cdd3e0c53bd01114bbbc14b2c069f13632992..14beadfdd0aeca31a483134cae4c7f33fe564dbc 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 b04417bf111cec21e1b44440407f7e958e76bf41..e6b9c9f4fe1a5031e243aacb0575341c6a996989 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 a4c994063565a5d83c73cd4c04e100c095df9fc7..08618fce03a077f20057594ae66d957e35b20216 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 d83b9540b7d9e2e43b68c712c7776b8dcb03ccaa..78f06e647d36bcb753a80e2ed5c4890a9b71d019 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 6915faf82ceb6b8cd67f3540a9347894eb95c42e..bb83b6a67068587bbcac0905e3b2462d782b28b7 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 ba6b696b0ce03437d34979ac13e926e66f062040..6c6148ce6a5ba847b10db3a2542d86459d2b11d6 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 11ff36584f5e0f783dad16920c5f14d1cd545662..d21f14cecf0964a2f72cc1aeeb9d6feca00f095b 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 9626380492e5b808fb867634ebccfcbb9ad858b3..11f14c5e5018afa3c16bd28f9ee8249468dbc713 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 993d44fb45089dc2f02a32ceef2b9a1fd60951b6..9976cbf500e874e448cbf4eae1930d139d62cebb 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 69900f94c23ee078272fe84fc803e50f26f41df1..e018e7dc89bca032777ed6d4f942a5aa5608126a 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 30f60f8f80657866dd2c0c147456833afe4ca26d..c2976a9aa38f6bf650580a19c0fd7e7ab922df2b 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 b953fdfd16de6fbc6c42b57fa63d66b5756d9782..98caed462d866e032b7b12ef19f58df5d345ad1f 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 5fda892900864e5868d298b81ac59b14ddbd1d3e..dabb4f4bd216203cd66661e0dcc623d1241bce42 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 0c5a6f92b27d5913ed183cbb535702ca96cf1f02..d93c8db480814fdb8a5ff71ad99ed6049687b2ad 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 7b1530f702dd0511a840799f599f28b87ac163d4..7758bd0381f5b2bad56ce110fc2e9f82597fbc7b 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 1b96c6ded1066d33c4f027d80c8048097909e26d..a6f02fe39168ca6c2a6170abeeb8e9fb3c9d6540 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 a486dfdb9408b9b7544c03d4a19e3cba9a287087..f6b4e229c21e98046f90f44b6b6a935bcb5b64b0 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 bd4b204843f3ae215b0db7138f34d5c25e336e8e..87015c20e80e9a9b589e7b3587c3880cc46731cb 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 d2359fc12d724482ef3b4c72655479f0d0f1605f..b9184b48d5cff45d76091d69c0849dd0e5eeeffa 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 ced34f00853babb9efda697681b3db54324d8ef1..b05bd96e4fe9a5caaf8ffc82503b072dafd48aa4 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 ac35e60e532cd59b8845610b8ab6b0db27c1e642..32ade8a066cfcf8a912670c43a82140c3a08e651 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 aefc5662676b8a0f87e1eecba849eab7d5753284..de60b120c4e72bdd6fe82031bb4be7874d4897aa 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 7d7f97a29ad745f98dd089092344498d3a452951..18b556c0099b200ca05843ead2c33100c8ae5afc 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 802e2215222c140039860abd860170b3d0ac44d6..c484b943edf8ebb83cae19aa7178da05eb2bc8a7 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 d5ec6b5d432ead6b2454c6f92ac2f58a6591471b..8cf8dbbd103749175fd26b688381469c204f3bd4 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 2e9ae98c1e0c90aac35c1f44387903a9650b52eb..56098d39f247240c42eb402c249a28af7abd792b 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 57f9d3e1362244dff7456957410fd97ad4977404..d9610849ab983187b471d60ca814a7d7b87fe551 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 226e640039524c8e350dacaf71e57969ae7e4815..e448330ef8ab2b2b0924498dbca382deb4f3b9ef 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 097f16185bff1e8f639055119b84c4b9ac6aca01..23de104dd8d769ce1a2a5e1d00324b6a10dc4eff 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 ba2184a0034e29c97aa4f3b07c9c0415fe2385be..a2d517d8b61894749f4a983b940f0d4b4873dacf 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 c777063086a169df260deb716d9b5b438eef836a..53e5c0dbef348b2eef4521f599a5124c148292e1 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 45cab6586e4abc86a3e65bcd66b8dd1d8e1c6178..639bb2c6164eaf1fab135f090c79b15f9fad5654 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 e71ae2d51c52aae4cecaa8e44ee28e1d231cab33..8d1f09b54e804598d731aad53da32fffce518b59 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 18fbd0b126a589b6cf505c3e43fdd8ba2dbb97af..8fc1d82c01c8d7b6f47e29288c178b221621c2a3 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 57936b1c8845bdc059f62d35812de309fbe4dfe0..ba7a359fae8ee3b4105eadf8207ed295eeaacf39 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 8c394900792898cefb1bd2243aa7531645f9a6e6..8573759be4a85720d24a991d2ebe88b260592cd7 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 f36a73aa94f2cd05071d63faf2a8f853697a6175..3f8ece388598730acc35a6c3172529475bfbcd63 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 b6d703bfa67d81e3b996e5f5496369d904e0ffae..186dfa9e17b1fd3e2362cff5cc0e6337dcc49c78 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 88792d91eff79143e2a287e6a58a4b3ec0596624..18b21f14d3e0d53b21526e7d6f0c7ae0d084c15a 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 13ca6b2074cd09ce5c41e78d1511d4e6eb28ef18..549a74ce111b394aff1fbec09cc05b66fbbabeb2 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 fbaf423b6f5c682b13052b5fe20ca733035b8dc3..6059aa683753986fef62d7a58dc7d3d0db2e5f56 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 47221da121f58bd39c596bdba6e6b7f69d0067cb..e6a6add9e0f4408e5ee8f500361e1d20437b87f3 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 61f394f20d64da8934e8358cb815934859701dc1..8d5dd29c753ff14b5970ea2cbe3dd00ecdbde21b 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 4f2ab18cbda33b91dce7349acf6b0c7ae83134e4..79da36b891ca24cc2fe2c1913812c99580fa821f 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 10d80276d92d1814e0af3aaedb48c672c68b1c3a..113b373024cbdb7fa439fdfa9c39bd9c5e785dbb 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 6c829ad62d54fea8a418483a6578391e4438f740..979c7f69a35a3c91f9eb33fd541fd5bab75655ee 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 a03c40e20d56e2dbcfd213d8bc27ad253f4103bf..453e517b2a6aa99c30de74dd2efb300500c7332b 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 97abf7735471284d6ab437388719b3916925c5b7..5d392f38263ffe79da49fa0c1b8ec8956f5a8795 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 1221f374ebc1d91c4fd7e214430e357f92fef0cf..fe274339a5d3d05a42042d35475f65cce8b2c60d 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 cc110f7c1e51c1d90a86560beaec5e7d78f636a0..6a066175962da18a461f0fe1ff2a6aa19e2037d3 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 04b56df4146c4d98dcb731a2172fded3f6783e95..a09924d017236df4ab0ca4841efd005efe5d71de 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 7e7e148b18d450b4aa267bdd73d4e2f937754000..7dd497426d89fa5ae25344ba8de58550dd4c6317 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 9d43c6b235872dd6272e2e7784b872a304ded6f9..3bedf3e88829caeef6580a14080becb4f114b955 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 40dfb9efab1b64ed0ade1a186883b4eb5389ee99..c21c7b4681ee2920c2432af5cdbd1fbfef98f0d8 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 f017bbc8e7ed9a3acdfa54b48ee3052fee34baa3..826f724d2c8933c14f47e7bb830f613b85b9af71 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 bc4d219e0f333c10d7ff9c11c2d71b4cbb74784c..c64bbf52c15ecf4b7e57aa1b3773ae49b84bde51 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 ae6b911aeeeb6584a5137572ea3ad7884c317f4e..9e71b1a8ee6d7c66a27352c5d8aad435a6132f42 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 a58f855f689addb63371bbcca40323a90d239bb7..e5d70e088ad8e9580773b5975f895a2170bda5b0 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 1623ee560548c8728ff0bc45ade697ae2a1136fc..e6d360bc4fd099fcf646cbd7a85f35152ea660b8 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 02710256383901be29feb6c122d8f663c4c63a3c..1428addedc7379605999c5803c70439a5f9c7e57 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 6fa8f4f1afcb8594ca769adec5c975826a59bf17..2bd6fb15c921ea84609ece44c950a300a20d5c96 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 156b8e718acaa34cecef5de4eaabce0c3bcca26c..3b9644fbcaf8a461485086ea933393490e993215 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 912e7ab16992e80f366350f855aeb09d90fe9e4c..c88619b8049618c3114e763731fb8da5dc77484a 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 0061d9671b5dc969e76619e6c56ba6304c2b6b55..f5c67a47e6f1171dc3e62795caba381cd9606ed3 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 cbcc5b0777592b0bef92ddc6ab0873a98121e99f..2438781227c50e099cdee2b879d9dd929773748f 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 763b101d4e4161b8f1ed4fe4341988be2ce69102..cdda8e3a1a8b09f75e7d78934e9553f15b68a2ba 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 1284707e4dcac28ad23736f5ca1d11800a680340..8aaf1d781d85f9d4688afea89aebdabaae03f1d5 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 cfd3a4ac515afa66756b301f74b425eafd35f9f0..e71b3a2dd1f8c19975ee8b9799a3f5800b4827fc 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 2664fea2e0c46191cdffc3790b07e042b727c0ec..bb223eb2068a6af29f18bcfb8f0a73264035a814 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 c40d8672db0ff2cb8b3770966a38a75e5bbf97f0..892c74b77c41754d9e60cd8077b9b7d5c82ea6c8 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 37f258228a017968475daecddf05f501f2e383be..768a1223ed9df18d5686a9c463e34d9cf00b32c1 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 22e519d49bf5ebb52ddf8069a835bf2d24c321de..bbd4a26a3d3fc027b10dc9065ae125f59bdb155b 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 a2c0eff903c7453ec96c620e2c07a6ddb251c532..197bf290f79d3e12be12bcb9f6545651d8982200 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 41bcf17dcacd85c3de10be1224532ed2ef4fb20d..f5b90279893daf314ab1ee9a46cbc74edc012af6 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 9b80e99cd8437b1b5507478de6aa2fa106e7ca54..59c6df629a4f6c11e2e73e11c710493a5749ec10 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 925cfdd81cc36ded955ab4f1269cad6a63665ff2..75659da563343a860f9cf96f0a2dddcbac80ad90 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 6c72d75c6c00c9f2851e82a09f4af749506ec48c..3879dfc8c2f2852b132b014291a599b0b877722b 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 51ebb06653d197fa2fd1b74f5bcdf1bcc44031c8..7f9ddff0998cab1341292f4d0bd2f483e86814d6 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 e5fa5ba9e754665cfc43c55cf12a5046ae97f966..31b8d52c05ef89fbacc70e2e0ee0519e9f866726 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 2c21ac520679a688a8d93aca45ab2a0855188a57..e29a9aae7e1e97eb1fa7b4b2dcc978c414dfe863 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 120ebdccb2253a75474e504d2d7e4c3fa715c3cf..76f2f3f1d9f6c8ce8be60e424379fdf2e98d5833 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 0f4be063407d505966817a51462b7d4ae27ac08e..ea078a2c80c671144b0cd0942c54619ea0502271 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 e71e55881e92fb8b4e8e2dc840616e776138c77d..135cbc41092df7620c95ce0276716e512fd3822e 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 e9c9396197a476794c5bbd03d2f0ad56d9a02cf1..26ffbdc4e3cc770e10c33f76fc14929c52546b34 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 4452eb88c36a422c2b88be95f53976e0c85aa092..1eb8fed086b6abcca60867722bc15862460ceb71 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 45dede34eb667a3daf29a38fdb7996aa8e302fc5..340e7a00b5b70b0c637c83ff31b2f0d3b0c841df 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 99fc30256379c092486e6721ea40d5abe48af479..b5ae09e0369979214b3a87027bee83b096f71900 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 94c296932937c1eeb50268252cd4ef5d6977ec9e..5d0dbb93787303dbe4d1d4a24e4151ef4fe1225c 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 93adb12493eee6946266417efa298d4d16e39258..63215a9f2956e02dafcb2cd9d198c2d64434f4fd 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 6dbab2048daf632be52aa306915ceeb705d1afd1..bef371c27b18d05e67e1c5f1d2102a4efbcb62eb 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 a929c7ab88d781526f11da4827ed78af41fa54f4..7708c991eaf6cd9fa448834a850c7d621b002d06 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 74b8bdaae841e10abe7f0aa85186ccc80b4b7d43..ab5bafae13ee13aa6d254275b71a488a13421d3e 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 ba7a31d6e06254a1078cfef11d9dd044e8a3d331..b7c296420af09942bdcb6a4b5e7a71906abb3939 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 83ba9361eb87454bc5ff835c99c84d0d7cc3ab5b..14805421603a43aa247f41064e8473dd9dd1161c 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 63ac6bd1d878f27160890fae47680bede564a410..5905acfb0ad51bc06b2cb881d32ec4c54a2d2910 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 70c1411781f24d199ae87145b4ea577df34407ff..9d7e1bac8ad11ebf5d922e49048dbf0f5d81d5f9 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 02a9a796c2a8b4b472d4d871014d2a9b596704d5..346517c0f0fcf8edf8ed371c9e46cdd0a2da23a6 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 852a247cc97c2e91fefe06b0b6f48d438cd6972b..a3736086e705d4981b51f74fbde715c63490cd6b 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 4c457eebd52fa3e23e6d90d22072909e6bffd0cb..daab115a4476345da7c6136cf252595dedc9adc6 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 98787294ce48872338e10bd4c929c92e2c5598b2..e1e28eb4c51385f269c86eaa768cfcbde99d76bd 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 8cfa319511141621a5e9cfe4cee06b3645b118cc..664ab6db151eb68df83c285a3f22ae2503d5239c 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 2416b3f6bc1dd235b26d34c5b8246aa45d54ca8a..f3d1edb31a496723a39e50a20bdb00b6626ae249 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 276fd684aaf5d9d7a18e9de0235a414ad1624097..059d90f7e91bf901dd8ce973d5e7c230e54e60ad 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 638d7994a9224eee505152958bb51a6dccc673e2..aafbddbf73c7db433bd2a62a9d7bddcf697fa304 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 d4ca360cdd64ae9400dce93284770a04680b508e..f3fd2f9c87d11bcc2c41468cb46800124d0bd600 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 576615a2e3b644cfbbe15be4a62c86d205a5aedb..741ac12f63ea789d4a355a1109039d5588a62949 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 db9aab9bfef4aabe2a663ed1355a5d3fd9875ed6..3c4f3a2497e19eb0ec61db4dd333aa8e9738450e 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 f394f43f41ef0ea183c9a6af87bc83896e5e0471..141e9e6d4b2ac6540eb2273d93d079f4923de10c 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 6643be39abaef21b8954a99d8905357f835dae1d..d5046e1ed85fed9543322bf14cb916d0da7cd06e 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 d0d3a9d11c53076a0b8f9a804d59ba373effbefd..8af6a7a9e2d5bca9b48259132ac4e357adc92703 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 ebf0b7b94c835102741d5e98aa7be98d306b1635..e3ac2f1c4e07fd18f463243e16a5693277110bb3 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 71d316aebbfecfa2f6ff23130963e00586d1f974..01fb1f9e7d9f25effeba2a85d126eed3d577cffc 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 e73635fcebc37ba63d1160044a097a0d705aaddb..e737efc52ef2f545c294860048cc29955b6a2e1a 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 80b31a789613d5eb79354ebeacc3c4f3ee217685..cb33eebab85d714010cf8bc26c4dae0e944bb5a0 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 246b69c0d71e2fe7978344c453dbfd4b1ac5ac6f..fb9d581d238bfcba6b881191910263e76986223a 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 b9f6dc7aca3f8dd133de9a27b2a291b5d8b17d27..5e277f59e8a1de05f0cea8ab2afbde8db75e5eb3 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 f9940a6bbe475dfe2c11caf86ed87e2756fbb53e..776d9ca74323db099347cef731257b3c175a3db2 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 353b7506c8a76615c7774ca82692dca02d060d9a..bdb59ec49f790f6711357c938a36f9436aa81929 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 6bac14320849ceb3e5ea2196aebc0bc0c23c3c72..cf914d0d59d99007bd93bf3160526878086c9261 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 1a465ae4cb8760b44344db2982ec0ac10aa65b0c..f02012c23d2c713215f579f9dfda5157540a1e4e 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 71da391d7e32edbc565947714857b83971f04fcb..a530f72f3880e9111e01e4c2c56ab45f5a388e95 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 f23475ed9349e385d0665b3516896381c776d473..8dfbbb14c2a0cc91eb55079ecd1aec978ad99675 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 665d39295fc515d977bd818db632e1d5919a06eb..499198053b80a80c05f20185f2eda5acdc835e2c 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 4909e9636f6d2dc15cc070115da095e9cb6c76a8..cc156b036449f5924be4d7592fdf3af3bed10904 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 1e324106ad0b545e28349a49f9580670e1b4532f..dbc6d3a683068803d4da6e3e3210a848874d5db6 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 104586b43956c097f3e26c68c6ca062a9c46f317..b0d78005c904e52b0e5471f82d86de04ba066918 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 c1f557bacf9fd17eb3c30e9c97bab12fd5d61450..90bd9cd35e87d0af75f083cbeba2754bdf3a59f8 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 75ce5ff530541023f185a7af2c9d8d742375aa21..f3a41c044bed0b1f9b2077c0105910f5771f347e 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 82526226ba6db0c6c7eeb0268fe170bc6bd22b87..1bb8d14f482fbe5679f042b3fdb8490a697b8502 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 fcf9c7a224a1eb3aeac4324a01f2f913d2319536..9b712fe62013f051a4304d92100ee7891d2ae706 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 717bb7246316446c952803bbd53de663feccdc42..e8dadffb99f890569c6063a560707103539ba377 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 02db144a3e5e556ac09350add2a23170a73e43cf..cb697b1f23f2b2e730ea2509f19898d5252cad67 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 ab9f20fdd5158b45b43756ac5dc5ea644d9c0ba7..a0e120da1c6666a27237d3abc03f30dbe450ecde 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 b8d4b9d4b4146052679c2aa5c6892a674d023758..f11e81764d1568d1f19823e122eeadacaa047d0b 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 de1a366f5ec378f002e2a5909e6ec885569107db..6fd7414dfc2d048f2c6a1a9e4017a8acb60893a1 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 dc30ebf35c4b2cf84e5f0e006b857cd5477c11c9..98b1693dd514b27790cbbf939704babdefceaed0 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 09dc064394903c93a9859d541db334f3e341cf6d..324a2493950767faf9418f2cdd9d0fd4ca499e84 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 0d5a09f6e8b588c0c62c98fbd9d1461ce485ae9f..87bfe784e2858cf79213d4bb7aa7d1c796281fde 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 ad766013cc56d21b1de22c8d4958712b23c1badf..69e6f1caf8e3d094d02cc3aa8b011fdcf7430d32 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 4c994f3ee175b686854af13189420f1bfe39c58b..78c78f05e1a7b2872abe6e7505bf43d1535230c4 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 04b32fc8eab643aa99cbb12cdf21f573b59b4d06..1a26dc0125345cb34020defb4adc9633c850f247 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 d670e7e0018ba051a62f037959d1feeb59f6370d..453f3367af4731860725fd705701a50ffb4d73d1 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 54de3c801ea866cac6812bac662ed8fff7e97c15..57efe4fe33f85995fdd89d869dda4ee3ee6a1735 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 d43283cd7a6c91d948e9983c4bea662684d0ff46..d55a19e8859b5427c754012de0d0b007e0908e57 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 8d66cd81661bdf9e4076c41017ef4d4498263226..c979c103e2a01c99ad609ca0d6c22bd1dd01d335 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 3b7ee24da3cc595af3b13d1336e24612ffa7df18..447db104bcfd7d15ec803e9b013fd18244636026 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 6d4e0bb25d66fe6274bf13d1def75f78fac28097..eb31a07dcf48a4dd579c3985c5d5731321a757e4 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 8b24b59f5efe8b79d9da1336dad74f5da7744eae..cbf6b1ef6600a0378086f1d53196e833b2fd56d6 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 18754bf6670676165a8043325caf02ada1ab542c..e1aec69d1225837f9dbdcab01b1709735cf99393 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 ac00aa27b8e1d080b8b09ee1e131167688508268..12690881bf8dbe1f2eede7a86394d298488930b6 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 0333cc4dfbaa22f24794aabe0c050d0201a8af5f..3aec6a543001225bc66c52dc21addc09a42f188c 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 08fe4f241671fdf9674f3885978268dc66d00f56..50f12b5d979fe91c512b74309deedd1fd0476d9a 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 d072b0b3079042afb0c03e1cd5858a0e11cffdf1..fea6e07967251192b88a18aa15c2994e95245ec9 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 d887bc95f8c91f0603d0b8e054eac9e1fb70f2e5..e394415dad9bb311cbb71fda06cfff70726224de 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 f68fb0f6cc716f824fc7b709dbb7ea826e666044..6a4bcdc23783e5471be8e865ca24da0923716e21 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 b1b7267027c3b659f018c235923e8ec9ff74e2f2..92b20d9f733e84302d9649bbb7368fdfb2c08bc2 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 e56473300a2389b60f0dae5120efe73686acb608..124382e80ac3d490b6e7f714070a24d78aa93052 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 0ea9018a353de6936ae0feaece98a7af24d60286..7ce0e42c69df9f16ca6f23b346c78bf98620e9b5 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 00f0f0748556a29075bf18c7f0e891ff6adcce87..ac4a675b459818e493a4b95be0a25be2b8c41a84 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 8b7ee01d7a31a0d43e648effef5b557dd4715068..4c2a78303632f481ce2a17cfbf308276010d1292 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 529647133448639bf9912449779dacf08a3133ba..b4889fc92ea60d1064acd6b4c3db7e07982db8c4 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 216caebb11bf3de05e9940f81c86fa2f2a6d0cd1..af0a72284e771c5858b8bd87fa5cdfb5a0e127a9 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 c94af4f96f352bda51156a9f86ec97c3771e3e79..68638329190a02408f84544272cda101a089aa73 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 cb373cce027c5a3606482a0b1cbc2e206a274949..ba088a056ec8d42a7f2ade49903429edf3a40e6d 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 87d4113f30e9f3298a6ad5505e8ae82661f2dbcf..34ad0943e40248a4e431b9c5ee57cefc3074792f 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 435f308dce9e7ad200f8f42b14a3f53f701148f8..f7727572308654f5a722e40d9055a9caa1ee51e3 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 5d46ec56387d6477f819dab68cd92377e2067e87..e80b1d435a2f2d31355db1a9e802529befb54e2b 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 49d78fda8b36d4def16fdfab74c3158cace20339..35ec8a070b3268a77d660859e09e575a0f07ab68 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 b7558ae5050a1a717b2dc3d1fe72b9b8c92a59dd..532f56a7e1dfca3783c329f96ec9ab39ba807a36 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 eead5bf460012dbab5fdf40a63f451a5da3af88c..e866be4aa89453247a46d57176351f2756c3bee1 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 c33fc8cb15157632632cb7905cf8be1421667d65..0ed09f224deef37a2951865a0ebd0fd19eb0ea3c 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 c909ffab3a72f7b26abf454c3f5c1b09f03af24c..e7c0af68fb11f02b2a36fab16ff1f95863d80ec9 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 dd839087a40c54e8281067ed26571eff80f624d5..60827d4b9b2a38d7b120a8516dde6798e9a0a2f6 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 4200b5ea0ff0548852535b699eb9680444599d5e..4ba6b9353c469bd62fa1d187982728d0203365de 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 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/src/libs/cplusplus/pp-internal.h b/src/libs/cplusplus/pp-internal.h index c11de37453a24fa960a123ecff8c749f76dfb43d..f3b8aef835ed47fb637dacde4cc3fe331ca15503 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 e17dd873dba8e12370165e06285e3d157baa7350..21148d24461cce5da194ad83ffacb5eb173c3fc9 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 c2f636c1385fba0606f17b73dad40c0549f61448..2959977bb150f2bdfa908f137ba0533022a4d4fa 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 887fff53b0a6128d13ebf439d872863e28207e11..9f5e32752c54dd7f6d8fe1323160a7101d4a36bf 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 85b65403b0bdf750252d877029bc56ffce51bf7e..c2e768912faa4235329eb547cee5f247f23c4efa 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 62f3245a281e23f0b8a9ef87d306af8e7736d2c0..2dee3e87f1dfde9f19b6d1bcc16a6da14ff636d4 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 527148af8e1762ceb08289e64a3ced0e266c68f9..db175b405040c16e76133961264523957b45a501 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 af945f2f51dd7af4fcf15020f13f75491183fe01..7ff0d1d471e1ed66f3236adf34e45135084d12dd 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 f548430d7a45b06da4b63d5b00e008c72a06c913..1b75839fa890387ed9ecef7cc99dc1a9372dd82a 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 e4f01c86b457f0ad8c3df7ad16a994815c854d6c..fe242b0fb780dcc67f2d38f59a2b12b6577f230f 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 38e8b7da9b19d0cb0173eb41a388b053fe352383..cc7e1bdae32a3549628110ba79480dba86fde51d 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 09dbaa59b7241648efc47e7cb8b30ae963b6ca93..414895c9dec82721d5be86eaf8ab2893ff5c19ea 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 1f41f06d41467d8315b80fa3b9a768a9b540288c..1be8531d537f2f3e7fddb5a77e5dbbeed75aac36 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 03013e23058fcf45adaa9b7ccbf6833de144b272..1f3070411fef378cd2f45e165f7489be8e232bcd 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 19ea5966d8b8b58915e8eae5b35980ad16a4ed02..9ae44dad3401da81419ddc0fc9f3cfcdc2e8acc3 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 0af08f8ecdc9cd1ab3de8cf5a0b0cd25afc68b0e..dae77d0b8727d5e058f2336e498d3e44d405d8dc 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 c9f04491864ed415a3fe2e93bd31e000ec1cc90e..d6c8897931d6b7cc5ce59bec34582f6955d9c601 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 90e6e4bb0049c613ab92c30485939a093475bc90..0603cd87cab52dca1163efeef2fb7a6586bdcc54 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 e621fbea17fe9927d61f96d03de9e0c60a9d973b..42e3029bc5da19ceddc41aba1ae6e9bb0f3b0b13 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 b286fdf2b1d83432e91faef5a4e95f4dda04c4b7..cfe2d6d17ad33131e453e9baee105e51ec6fb8ff 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 a8694e29677a433579b8f752a68a77cb3b96899f..99e83d9fc6407ad19bd5aae93859c53493d2a01b 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 f96ab6b8128b748f1b5fbff7dfb3261e88129f42..6ab9d4659147d5c7474018c2532dded460030f50 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 b4fefc59b32a81092963ad49d4349a84e2c3a33d..436a1f44b012af37ba18637a40b0d624bdfe50e4 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 82e8c45dd8d63e142ae6fbaf8c9460b91dbe904f..c60ae334736c78760e9a1d9a5e7813baa650868d 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 d99f996401c21592fe450b5e12e44448ea968dd9..dc4c5f1c8440500021a535e3e218d20ae6ed3b3e 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 e9565c1384f958a8bbd46edfa8b86bbe131eefb0..77e511ba2cc8dc404a26514b604c47882941fac5 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 e2a774e2319461916b4b8ec62461b2b9f2d147c8..68332a77b3eaf3fc6bcc482d9f5181717fa22615 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 6b4ce934460254e650cd0d7385f478bdfb5f67d0..c15a30bf165d3ca83b54000a361692ab733ded79 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 ed42eed157611e69ec4af0615d78342c09b74e24..fd788e4da6bdb2cf6096b1b7d245711ea65aeff1 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 d4281b8443f02244fbd13481a36a6177f018df71..431fa8201fd50377173ea7a45272e1c223778544 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 18023f15c700dedb0d3eb73fae6dca95906ac2ac..9da1403df8bbf11705042ce696a7c56b5d7b3d8c 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 b083a1a1b035a1556d180ac9c88741da687528dc..0878a907be828fae40102569e4f22858e58dd1f6 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 e2da43f004d50c8f81fb5a3f3dd8f0a97ae562f0..f67dd11e9e7e46b0c93e5e009184525cecc7ee7c 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 19472a051c149f08e2643b9ab6c6e4a079705f98..498d827dd12ac4326e7a026e764ccdaca340382e 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 b05261600eb0c212c52884b0d84cc5a73bb83bd4..4cd3a89f6d467111c239f4f5897ad7cfc6c0f511 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 8a8d9e7a6a91b8fc9a9b1bcf82f3895c24ca7292..c509439800d404f85ad611389509e5dfc167766f 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 3768b6e81c6d83f97bf18ee0f1762bc64b2273a3..7e170878e60dbe6063bc7aafdf94b66af4a815b7 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 813d91aee6b3cee9f2999a686e4d081b0bb04f4b..484ceace7a6b0f791afc91e844fcb78da3c548c9 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 18e3c26b01a5ac58603466b412189ef3af35d522..ca2b00fc71a792864b61243057c6a2b685294e6b 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 79ffc72ebfc734653bc1637be7db34c55bd1a5b6..eff30909c7b28576a08c378afe338bdb17da9147 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 050a9f12c47ae048108578933db25384b2d22e66..1cc205c334d03f9bd2d5277757b5554339673972 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 4c80166ca47dca1b26246c3e962602f07b25abdb..93b2bdb2d72223f04695e3877f9bf072053dd007 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 ceb43f492034415ca36cdadecd13ed24aaf84c75..59683feb04b668c97c88ed9c64bd400e3ecb486c 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 4dd5027f619909dcd5a90d7e56b0eb672eff6c1a..468a06dda0e48c8ad1d487d62ef9a8d42b4f0a0e 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 4e74409ab0b02aa6fa6564b95b2461369bfda1f7..7eaffeef47d36a9fc83fb698c3b34a18ee9d5815 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 23ad88838b75c2264acb1b654fd8dc0748968370..465215ec42c4844591950c1ad831c1e2942b2570 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 d225aa8589eb8397aa074d44c5a4a76814c4a8a1..77648b733b9fbd09db1444f20e63f1ea8a024297 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 9c3ac91ad6baac03da5e54999376bfcb8ed0fb59..b74b339b237d2c32bbc452843382a3c19e96f006 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 4d060b348e037101595bf5d14d250211c15c2106..c13f47f925e48ddeedd22991f4247406b3104e5e 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 5764776ccf14289c0e4cb8131e611ffea1f8a476..888e3fb662b7407870e2cc2e969e9e37877318f2 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 cd5a823036044f123bcd68af28cbc7e8ac364452..c6d865b8856853d195ab0ed932008bffa1280554 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 ffd0cb10a7eb3ec1c53cb76de284cea44883d395..b618f1cb49df90ce5eb2880b190b1c4897469f39 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 8f87ca04192745aa36ba3faef5783c2724c871db..b23c6e35804c9ee38c6446278b2af94f61ba347b 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 fd3f8c76e61a67a01289749848712881f658b320..6c49354ffff31160b3545c2b4ba4946342dbb3fe 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 9305f29ace27967b34508ba7e67e89f5f1632ae1..c5c2954db923cf07a7d9ccb966e765c5e05afbc4 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 f15e69641f2d7eec4f1f9069358306ac78b18586..6c26d0bf4b438143c141db20598d44b1db8b9a07 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 977f9fddec071387484d85adc7f11628c235f381..4a9468e7148eb816b1c33fadfd95e64faaf51399 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 aa6557574cfda5a69ee2efaecb1c9c2a994193b2..a4e55ccd81315a85a6c23b12e178017d1deeba21 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 bf6a23c615bbdbf680fcd62e533bc9d76ea89850..321bc9e34f29a05a31abf8145f470a57b336bc4d 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 b450fe426c42721adf49354d4f70f79bdc9ad698..4bfa9098cdc2eb1fa565293c2d69488f5c6b7b08 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 fcb1e99f9ada48c7feac2f0236c9add24f1e7d11..e8b844784a6c4d0815e7575a558c85ee5f5d4d89 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 25526492636b2880d7f31a734d13407c7ca6348d..8e9911f8f47a7733da060fad0aeeccc5a6d03c7f 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 072360ec9b00562db5f349261fe58df01ab9efea..10b5f32129be90705399d43e3cee9871f9f9e257 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 a7e228903b56aeb4c99e704c49333b77b8ddaecd..e11c578070d71f74365d41d6078efbb9382107b4 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 042a48fc5f19f5d1bd5a6df02aed5c29a3b0f2f2..95440c83f378891173ad2b12e12f05b03b9d95bb 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 153b9531742b3f5f5345d57e8b7844e050f650da..a04e6a429588b5950c27d7dab5232a4537098c5a 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 d8b8f68cdb25f4c5de8be30387a5b18a3d7ca69a..09bef9d1bec946ff5a8adf92628dfb2456b1ca9e 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 8441cdb86380e7add0b1f572296e5bd79d723f70..a564c63bb4fb1eb0d166972c2c4077a1250b5940 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 e5ed0d90a34676d8582d58f3aa33fcde0a5abf1c..5a01a9558d6f264c0369248b98ae36c90d874b0e 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 da892faf03b9f7c67d261d1c4c844edd488eba5c..0e5c7b2455061ddc637415785e9342af10acb3a0 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 6f9364a3a42f256ad8d159f23a731a7d4d6a4fd2..18e89af9d04ea18483c38ffa2a379ab9ac546934 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 c44df2217e8b7625d51a7b26790416c3fb79c499..75e1dd2708505e3d9f230968f53c9844612254c7 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 044bfe209fe3249d010f18bfd11726606afb53ee..1ae84ccac958a994dc556b9005f7d576f2fffc02 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 a3d85605d80142a793921ca2b27b99fec88f5d37..fa260e0ed755fcbe6559b67ba8a60643dc3841ca 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 b34ee40d4fe9469745edd98531560335b682f5ff..46db9fda71baad903df38b663d63dae8f754effa 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 40c850d28e94b55809cc91a3d74961a0b8d24bed..7b141f8c370c0052d8ea82090ea248c772ef2d3f 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 100fdbe717f632f25633f47050f0a239132e778a..d374350970907f82df6dee46ec06041d3ed14b41 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 d4bd098e908769452009f9d5326de5b6af93da6e..b3898465531658060b8724fd7cb7f1049a2e7907 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 63123138730a7037c148faf8cbc005af95991e74..85bf22b14c50897b6f0563493a1abf84a7d557c9 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 e554c61705e3360ec63efa74b6e6945761ded7ab..7f6b34bc886fd69ca69cd3c9a531a83a76ea210a 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 4160bc18792f8a24714fc35fe431415117f0e90c..bbd8d73466dbd6ef505c8b66f09ba02652eff5b4 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 12152912cca769e06c41f2bf077e04aa6e299ac4..d660c1aa4a51d4ca0156fbd8ea076c4cefee7d20 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 f75d225f6e65ae19db688e04b833b69e18842f21..3206e8c38b3a2511bb728edfd9588c3639be5a8b 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 4003f6ec6f0a292baeb165635a83fd1fd1f8b110..a30b3e5f55fc101c297f4177e7db452bfc00f720 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 cd94aa7e96382051ccc32db484a96777128ff43e..2fee344d78b904b0fef17c1b8776896ce6ba2604 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 e3d3961a0d8bca354d3f36e28edae576eda26301..509d2417415252504a08ba5597ae3236f9150b42 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 4ccb259179d7b65d35c762aa5b877e906177296d..ec7d7b411757d0034831345f4736c5d7fa45421f 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 5862c4f306cc0d1e8fc10299f9efc68b467fd61b..5394c746d6844cc26363dc93450274e08feb5555 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 9920ec6ba923a9c8d6c6fbb362b9b7c8e285aa16..3777587a406ecd0b2c30f8b103039f612f7a6bd3 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 4aa021e63ecfb4eb00e6bb08c65263b54adecbc0..ae8eb41593d5cb5778003fe89c27991a21db181c 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 9e3b2455572e66d44b5b07c08f2896fe64b251bc..921bb6d16ddbd83cbf35497f6cecfa85d0e4351d 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 6a1b2efa8403d49a73c39712b054a1396717edff..a8e2979f8194dda93e7e1e7bce4ae58edb452076 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 822edcb74edf70d2ea7fa489c9e379a2c4000fc5..5b51f53cd4c395e9a30d526965a38a3850057501 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 0a921cff912bb5c078595881efe432f5729c3f1e..5a326faa45eb1f161ae82dbec871e0682ec94b6b 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 9e09f93eecb9cb7dd43fd19164c4012255ca84dc..4c79a18f251869d5c232cff4c4c5ec3f7023d583 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 9ca1dbfb74985930719ffabbe8e41664abecfbdf..b7576f98030183247547d523184958834b1e3075 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 c6bb870b0afedc641dfa82961e2b500c706dbdb3..1940434b4255a0f1f868905ffd6700066f641039 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 66419c42f4e54450ddcb34fd84f8b2524c83ae4c..86cdb5ea5be654a9a2c3fbfcbe2f90798fedf470 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 e3a5540717fc4cbef1f558dc05767b3ad6abb702..ff07d5e876e2c86e6da8bd54fa0b7fb936436be7 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 78d54db6959d17c0c939183a71bd8240419ab69b..b5bedb49aa09a45b2e8ed32b5121879ec4520567 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 359ab6d203c2137e0bb1e6cd47d086e92b962482..e6ef924e483020feb3374b5182fd7bfc85713512 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 00bcecf937d9c0e3b1945967fe1de9d38bb9a0ec..f622bff74b33d788b4e49c8c2dede301a456e7f1 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 bbf5d13a469bacccf7974e6363b70cc3fb4258a7..72ead1d05482d23565094da7c66a66f71cbabb0a 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 a9377730fd820f7b7cb30ddf7513d9d34939d4b4..ea59be8377231a3c3dbe04294a1b8f43c304b1ed 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 d3a2fc9a322b0fbb5feda3fafd1c2d22744b6174..d0d84d50ed0fec6d18b7d2bdd6761fe5cf34bbe6 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 5eecc4c9a5a558206ecba4683348d8f9678a979e..59e639e6348d996f0ef4def2640ef077b9e76212 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 615ba5ec2aca73b7d88e68f149820c70c0153b7c..63fbb1c2eefe75d4281ad136a45cdede71b7bd53 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 2a60bb04a34e94131b4ed71b3f48160f875efaa9..9bf68c6b9bcc53bb5651510bab50876a4ad4310c 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 6e1e8fd1f41792155880ae3b2e5de4df3a6d9bb0..b28989b168065d54b9a1988ee606e485cf41be2d 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 48f5057d10229667b58fd9cdfdfaa19563b852ba..c6a93f8693c9e6cb23d8dab6444d4dc8a2aff7b2 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 713005899155864cacd987ade0c869d71ca17296..4e753c570e9dbfaa947c8939c3f683208789a652 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 7d9780eaf1a9c3646eefa3be2464fae0b5700923..2282f0cb527d0a3839af648213b39dc1452b25e3 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 04c497288f2861be839bc45d11108aaad39eed38..b3335702de1192fd5d7df0f590cb08b73c090d9d 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 d750ca60a2681982d1ac8a54717018dea4727e46..2d48295f0f641758ad770436835fd370ea167bbe 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 80044fcf989301c6d1b85bb971cd2fa6f76f553c..3f7b8442fa9e3160201a7f5034f96fd863e25b4d 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 932278a32c0c381567bb804ddc7e973b858e7e9a..d38cb56c145a43424173518c51c955936037514b 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 44ef2387725346c52d93ca40d6f04e24eca057a5..d3cd8941b53b7d3f4d1cb538bb1e09ee3e46d9df 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 fe337ac8f32cf63a63b1d06884d826a9ab72f055..f9cc2b914e721e819745115efeb983cb295dd257 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 082364e3042ad5a7594034f0c41715533b2932b0..6dff25adfd5b6ce9a12fc05cc40b964f42cf0b28 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 045fa46a241532a425ad38d41cc51fee62027f7a..a24c3f085bea6d368fa6c043707dc59a79bd8314 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 75cc0d6ba3804b8eef0a51b810121097a0ba174c..a0a20b0c50d22a1105a23542be36ba4a81066b0f 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 71d1a5d93a37808e501193e3a99a5bb01255f33b..716f548af59a8d8370b18a919ef80688838dc1e6 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 f0ef530b42f912b921e35c01f6d62c624c5d53ba..33800265d6a0826fa991f877fbfb4384fc5574fe 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 28b9067ed284264440e584cbb874af95cbf30fb1..ef7a7e38f0a3b30c04d92f12d7f4ad0aa220ac42 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 063b80e0b7ee642ba5ce976052af04c4ed2a69fb..bec545cc2627e71c9fa897b226aaaefbf50e4192 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 140ddee211e947566719793bcef48e2eefe17131..6d116426f203930228d7d7bf3e521d221455d044 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 cb59db7a12a9f582db3d9b59a24ab5e419a2b0e1..bc43374f0e463beee84403254c993e9368e9670f 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 0b301afa036a1bd812007d0209f1b4261b160d9a..dd5e2f61e92a61f3a6c4c91f5a614837da405934 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 62d74503d412e040b3d40a31ebaa20f131ca06b9..f77e9ca484c0b8b5c0eae31da4ae44b150e57e7c 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 be71fa45cd29777cc64c4b22b1ba9c841d80dbd5..d5370e4ffee55e6cd2d29b5e4b94b19ed52d7261 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 27885ad2dbfb4f375da3470b238a520709df3f6c..848114c8b96475221b2c29997e3f11767f468d9a 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 3c427dad0ad4df8257405003a9aad01c99c860f3..99602efaa850452786c2e9827b9ae7ca5dd1f7dc 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 6aefea7d634e42a9b9ae4539c209ea3a759704b2..7c515a32c2643eda03ef69e6d07f4164f9680817 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 e27fda1a93ce912d03a1f2f386fd47d5945471d4..ad510393521e68523c17cbfb7cc8a98a6d70be1d 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 85fc7d5d439b5a47f6432ba1c5c25057dac94046..7ab5145b74a9e38c099015793a291a1b73753db9 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 bb7adb996200a3f4a118d630e7bda6657d2b85b9..51ad57bc27d6ceb7cfd74af153d7e2b9d112d4e0 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 9de2943bbfdacf08c594c013dc488decd244f07e..d530b728aa5d83fdbec2e4e70b3e561b4bfd7ad9 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 16930ce936d6f6a576a1184d2835f37ae9560f62..1a428aa4df7cffcc5e63ce2c6823d31d1199e7cc 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 a9e8f13ef1d2fb2b69600d4cd3320d7defb322d3..c6fea7d48072f3184021115ce30d352ace867878 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 2d7724bcb5604a99a6e3bb0f060eef1686ffd479..5367062d3716fffc0e605b83e3d3dbb1544fe95f 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 8004721ef3526d1a3db8062b8e62ac2cbc4e7002..0312de6613b9668b6413ce1b55788c374b49a893 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 ca867625af2d256f420618c440ce7f824a6c4262..630b660c0c9986ba83babaa746740accc68176e6 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 c2a703a2d6f66bb1633be393637b5ec53071f287..41e00202e53ae384d55d47bb83b9f5246b946a14 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 e35a24d20e1513dab0eac3fa6b288795cfac8469..7a7eca4044f04c452a53874afe95f7e309b58570 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 fbe5e644d4961cac0763edfe57d0c54a50ca4bb5..5380b9bdaf3ecf8d1a9c941a2a771bffd2def352 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 dd181a6d0a439158856d72fdf87fb13eb11e1915..9a426dbeadce2869aa65979d26b9aa8300a4f3e0 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 f9b3377e3482662c62d0f15b6abeeedae3f81be4..f14d3b1a74cd50e2b61054b7be7a6e556c40a236 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 6571c77207008410422694f957f789fe2872fca2..df38e3562a62d891b87d1f116e105a7cb15f71f3 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 9250ca567b89331022a67a552c9f0e59eda0ed93..53216a0ed3d29062ecc314c794eccf6acd86f154 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 07924eaed7ab4a445811252ea2834964c5f80353..a77d59354163c55e5640296b2747e3966a6639f7 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 36f3f51aefbe129c848249da7c56f06edcb877f7..057d2e826979e4a59aff276450191f07f43af5f4 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 8f917d4ef40c512270ef99bb51eb3cc08075e926..35a5152b17eab5f5f94e6f28917ceb5b208fd894 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 2bcb0d03243a3427f92af46c8cb872c1acd26413..b4ff9675082f51b48b14053a3565a2498b6e325f 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 6362f7079c402c6c6f4e537032bd6d0484d0ffbb..36da081e2dd44f8876e41a0465132436d1aaff4e 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 987b870b3032d9b3c40761bf7c0e622b553d9f09..471c74b2b446c4884fd0da2e884ca86997d5c7c5 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 0f9758b1429e4c19c1ee3943d8831a73ff889693..b4a8c2b8ea6e70a3992dba085d401f859cde9d7d 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 84c4b2c494ac2df2ec5582f5d2af0a921ca2a083..c277c8526717b221aeb81b417dc3b1ae7e337370 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 b5c98643b4265539c5e635e98fa0952fbdfa10bd..ec1c3975c4dd62ee8772c5852e3dbd76de8b4aa9 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 58cb8fc81e73f5c84cfe1d9c662a4b2cad38ad77..99d4a8fbbc433880aaf9f439cf1c013213aae7c5 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 d61b6637c4a4eb0fd304cdf7cc2abfdabdee70ba..503c52ac8f7452ba4dcc8b6dc2f4c0e443f58c53 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 98990f19f163ee78df9d9ebe8638ed3abc4688a4..2f7555915d8b5a9c7f837078706c569eb248cafd 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 2e33f810e036ce173aaef86b2e038c1e38523068..82c30db30fbb07140093ca18d6511ce727b22355 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 aa87bcea8ce79f1a32b37a820c381235287195b5..83eb6cf240ddee31ddbe7be29d7413bcda2e5789 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 44d05e3b685d13da05cf4caf8aeb77091fc81b74..cb911b1fd20d47a856a50ede8bd8833505c1d800 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 b9da2e055ff2478a83487564c9593792d7199903..729ac7cd845b96ed9c1d2f8082e30ab9e4f34d93 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 48ec7e0e45a2e568aa8b954bcf6aaaaca4154223..370cae409fdc9117f876547b77f0f49b604fd2ae 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 5c0b7c3d0b00221fa2207795bf9a67cebfced751..0a52aa77449e1cf4715763d15624e758cdeb6d52 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 1f087e67e97b199e38c2019b059f9739d891cc14..02f65d94e008eb0b58d95dac89756fb503ed40c8 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 ae8b2dca2db6614dfdc5307862c0cf2e21a13b92..c3a25162c7a84b025b5fe824dc4a239d86d50660 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 8fadf7530642b25341e7b2f891c204104583765d..a25e92ef0ce551b1365864f888a08c56595f849a 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 9ad213ddc00aed9f50baa2a1edc5caf0900651db..4aa9743e753c012c0cde8e4af23785d0a465049d 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 5d2fa04502a132209ca3c404158bb3330d0ecfe9..b17b79c91190d66a6f110cd56ec5f61447a243ab 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 2b16298652b491c9e4d7c0294513fe6df6ac31a4..270849fb1f77c17abbd79eaf8568cdbc4646106c 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 4e95697856b9857cf340d415364986190485cc7f..6b46fa3b164e2dbedc06046f8b0017da9b01ae2d 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 40edfc0168c70726b8650bc15d31f912baafdf73..250e643c86ee316df458dec66f5e100f420e3ddc 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 401720f908e9ba15ee75289ec6e68dceab2c48d2..a4da55d393a0f04f8d789eba7722cc9fab9992c2 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 caf3e47d25c08e378bf3380860d286ffefc73c70..e7946e8ed954be52bd7843b4e9ad07a15c470ffe 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 159a79124a32c52dd918d2dc69a0b04e06031f53..c24e551c77eefe067ed06ecb29778e9e5e9807e8 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 ae353e8e94eba2eb9cb15215025b41594c35879f..58a597943704fd12114192ea619177e00d1279ed 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 571a49e8ed36ee6dd06d3e2eabec3ab093560ab9..772c826d3fe597d43930252f8dc0ca14cbeef3f4 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 c2e91f513e31098ab80681c5e2d524f758035b74..ce4939605a501b034135e8531a1b44d6a6dc137a 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 48ae15dd951ad4c43bcd6d7a5b3772b3a712eb2f..27276fbe149a5be3c8759fbafb805a5181f63d1f 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 b95063b8f5554d2058967e1a08d2d4757c9f64f0..817c0d2a5ab45c3e66aa8a324cac5a945a11f5ee 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 002963e253043fa094017c5a631b6867c0e8fff0..866b9eadcd49a59bad22f0ed311a477a7d2e283a 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 519468312d66752dbe6ebb8535b71ddf42591292..860b16a7878fff10fb328dd14478bca6c34575ef 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 294c5e00dd3535e9781063be5c233d9a9b2a0637..c48190f9e2ea0f7b0dfd31f50055d271cd3971ed 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 0423e20a8a9e35b56b2f351fa43bf03f75724a1c..efdd3a72807fb0f32b08df8f7473344c0876517f 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 220561b5a4144bad3f4f67fb788b6a0f95d7277c..654f3eac6b1df7ff36f034a9048b82c6b30b6853 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 3b6bbad33c3210254282fd6f90047da08152f155..ead56930333a7589583f4b49869634cb66c4e193 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 343b4389227dcd4a9c35e38890fbc192ea08e953..3a45cfa4123230aa1c7d278eb836f7b8bcc8a3ac 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 b205b6a72739f709e2ef08e6b7207a7c0ae45a58..fe9b3b3ba9b1137ef1898f1a4f995235fc3d387a 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 6945381deb8a31427b206379ebc09858b0275016..c0aab3b1aae2a0f92da192c24445c8c2773149f5 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 d060ef420dad2aca6001a746809b651fe19ac184..a6ecdfbcb05b52804ab2a5b369edb86e0da8bd51 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 1618b463b6def559321973d602cd1fd7ff21764f..d208d447f688739b32c2afc03cc43583909c1c82 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 e58279042306f268d82011f6d3d7ebecea687d3c..6e2c36c75946d867d62df24be1e6a17521785884 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 336f38bb46c65bb6ef3edba558bfb4ea2ef9ed05..58602c083b6d318e7aaa9d2d1bb80aa94b543fbd 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 2de8e72fbe6238096c150d2d4aecf56896c461fd..885277434d7843f7f25ff5d90b687e4201f8124b 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 e858d2024c101f6178e05cb1120520657b1b3f79..a8f1dbbe42cc5f1cdf6218695c1b9a06b1fe8189 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 cf7424a63882dbfa8bfe92b06e54b0f445ef5277..44d2d09291a3f20ebba3c95505a8fc0a5e85831f 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 0962c5537e8cf6b1594fdcd84b1b4ff449fc955f..4e82731b77cee9bf5ce60c03b1204223610fb4d8 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 b3bb00d6b41b5d281cd87bd9204f12fd111c04fc..fb472b73475d4d4a5fc3d7f4069d4453d15d3a70 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 651e1d73830b3c2f7e9b286b9f64f5f4893d81d3..2a9fff0f4e38a8ef15e65314802fbaf21f5dcfc1 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 a8edd089972489c1076ddf1359d078969ec6aa2e..57338b31276e947081da1fb03c5585edc4ac1fe8 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 1b018c66d135ea0e2bca6bb5a6ce8882740c2266..4f41be3fc81fd8dece11d3e4b7230a772762796e 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 f3ac4bf5215f5164193367994b6f4aa42d2f88f3..991d976a79eb4206ac025ffc947b513097696ec4 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 b8ef34afe8ee5dfcafa099b12bbeb3c50d109fe7..081dfb68327aa6479891ff1ff66c485833701d73 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 8b638befea2985410cc6b6253cbb2303f8bf0cc2..6e28b0a7e302a6fb9733ed39dfc30b83c87a2c67 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 0cce9101d47eadd7a0110625fa2b8ca2671289d1..8833507ff5428b023dd1f4eeeb51edcfcf5e0fcb 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 2e162453e35fa911933d0aa3d43e92955f38df12..44bf29ca1cf170ed5e771e4aebcd5c2d74d4a675 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 26e6858c983bf3fb0c3c9bcfbea2729dbe50536b..abca6a8e51d013176a9e12a673cd3354669ce201 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 e15539c4af449feca117e2cfb6f9c5e085dc344a..2f43be45cd44d002b13b797e54c25bab257a9155 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 3acb5aed82bacb703bcb7df869c02e1c1a04b5f9..1270a9ccf3ffa5c1e0712d3101bd4535f18e727b 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 c13539a53941cfe8806869a2e0d010f09f17f755..0a2beaf17ae0b150d2c69fc5966f83adf1b0b765 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 31221a343c241fe39ddb5c1c4a958582d0e698eb..2e1713d05f93633c31728639805099e28a41be98 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 cf415f13a8593c1cf7658c96fb34f2f9480c3955..d3b328c29e085bafb7042324efbb1fa1d6e30b8a 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 c5189e60efa64e7e0f2d567321b598255e2fd7f3..9bbb4323d21bbb12e18a50f013a474fa2e4bc648 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 7ab27e28ddd7e3bc2230db88a171a0e2dc48d8ee..77dbf43ecefbf1b4286a00035edab062005d9b10 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 11c0a1c4a0c5f6d771b021827d064d40d121101b..b9cd825e244b1152f4b13b9e19effbde417683ab 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 ba838378ef84df81f23c25da53e97056c6e2d891..096567a8a66cb9553577f5dc148343f6df14ff32 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 3855ddc6d24ce851de394575024bfb7dd646bac1..829c28e9c399c2d21b37853d5e1ae17dd2710945 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 d5e6e11597b0120b3e07bbd4d09f322c1577e3e7..c264978918be6bae0b564aaf04f611fc1a34a1db 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 e47c3d83828103d62417b62bc9e3ec2c9f5adacd..476a80a366764979bdc5619a0ea5f0cacba36031 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 22cef0ecc56b53767ebdec136f1d66c30c401119..8b286dbf21779f8b792258cf90fb35a11af944b5 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 be851f52677a17a25ab7b6d763f578ac3f9005f9..aaa5f4406c987fa3907e2a6f854008f610dc6fb9 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 984404712794121f4f6c7178675275f97ef2658f..7df78fe26b845b29bef1d160b7c9f8228d4d784a 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 66d612d843f8f1909ab38a92dddf595d4bc55552..8bb55cc96dde77478941c9f3cd1bcb81a4edebd5 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 f3aac399709dbd71b66541ef9881ad23dd652c6f..620b369c547a8a383d9b6065edd6e473ac629db9 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 787b838ada20c85c6affe51bd6c529dcbad3923f..1914b51b13bbb649969054919b3fc9005550306c 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 c589b4b689a59ab46b30d30ab01c574aea235135..a4e686d494b09bfaf1823cfd8900d9437eef8994 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 39191c770826ab49dc7f36c4efbc4a85efde6617..455362009cfeccb980b080a05a3a94599fa02f74 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 1465164d1874f9a0eada2b74f3ca9531c8f031ca..389afbced919ea7718ca91fd192c8feec9c648d6 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 c542c85f4c3baffe2031ec11674f949617aacdec..84739ab4e66515e247543f9d3ee69fe7ff1ff489 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 aa4ab9a4f53d2100bcfdabd9fbd7f52e60a46b89..6431e4265193248fb396795f09c181bf9f4b3af0 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 81e0f77b5644369ae92ffc150cd0e0c26ec71ba0..03809fdf30e426eea3990c5c1a200d750a3066ec 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 4efa9cc8a6c49a5e8c54cf8f398516b3c1231d5e..c7eae4a6ed4761629d67a6552ef1ae0db9fd4368 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 a3761a17fe13a2b2ba369298a26a632a99acccfc..084888c4dd2dc1228f9c16a4cdeab556ec9dfc39 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 06ef0ed3d629c2d93211b24a6a5ee7b8a15267bc..305da45ca3ad282478172232312386ac04e567d7 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 22ed62af2bd9c6b160f348e01c77fe77bfc36660..df145822e2aa117ddd5c557acf93754402957112 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 0ef66fc809422b1ae62ae6c6fbffb91dff730c26..36f744769fb1c076e11a825aef7904e636c6c474 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 566342fa4e73807a5ee870654de1d18ffebb8f51..dd8e5727c1963b4f1b3ddab169bdf5b651ef65e5 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 8ca453278b25c48e632adc039159de078b4b6bec..fa8ccd93de2aa5ccf523f35dd467e116f17a3ac5 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 24e137dfbe131843ec41369fe919a0b208312c0f..f4b6e9f95ceec3cc01188230ea778dc4d8ce0476 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 23769937bf37281048d9be37ea1f166517cdf7cf..9fcb5180debb066910d2ad9b41c6f49141d59aa9 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 2a3cf3f54b4524360f3bc6bfe7d1ae6d0dba4409..ec46f9a1c57678dd1686e0fa2b65d88196e168ae 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 2a4a267adbcddd46b55631f700c76a47b2d5a52a..2de5da922b7648ebb361c4149f26e3a9aed18b0b 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 14342483052464e99968e535c3f77015d4a2be5d..4c5290596f2761aa8c374040e3f59d7211c879fc 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 6199180c7fc62ec044580e45ed0f85efef8b088d..b06d6a7e5901c6491455ca5ca9564c907dbdea1f 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 e740ab8fe6d9ae2a365ecf59a2eda71d9bdf00d8..1aa8489685b5d4af3a17a1fbd074c7926271c8b2 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 44263e044a0bd74366b8573488f1224750885b07..9a5c9dd783f90b3d26213d6a2b20f30c6ab454a8 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 a148551d9fd10804ffff6fdfde01cb6904e4e39c..10a0efde9de146565436013ccae801a738769ab6 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 5980879ab1abcff5b7de49b031e0d4827b46d0a1..c2f18a0b1cd4113d9e285ab6dcef4aa54e948f23 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 a3afca96d6adef219ad847fcc7427d8818b92814..753db77380539cae3d3a0d0b3abcf7e7c1be8d3a 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 e534a0d1eae0cc6cda1c9f076a8350d9603ea0eb..4fdb3166cf31e33e408156eb3e13bde5ca209015 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 d53adab9ab6eb093311d32f1f6ad35551bd56f68..c7ba26db0e9bb95ad18735af452a6360c0e35ba4 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 b7b59f048ae3553340c150d90dfaaa5db7bf7cca..5032d45b4d486a2964a26d5ee153d8f556fc6c4e 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 2405b576661a608bd2fcf3c95ed3a25732a1d351..c22e68d891d04bfd5dc79f77b4f460b8607e9b1e 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 ddff06984afee771bc6cd1fbb96ec07e8bb56133..0eb21187ccb9396483fc080f93c899273c318caa 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 e90a4db6bb37d7a461b84a394cb5189b6809457c..be5dd624295befd7eacf7be4a60b0da3f8ce375b 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 f69b8226a72adacb14e9b54834ccfd58b6c9d936..05ba96c3eee4fd37b5ffa4d1c125d03c37984f47 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 7a1be0b876349228a2ad73a6b1576229ad8e5e93..7f3e1261af8b9d0edda97306e3a2997396f23613 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 2a4808891815c537759404da3bed26ad8bc49044..548c48be7d3fd1b1e7e059867c488476a6eefd9c 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 3231fe48d91263a164839810e33a70902526b8e2..9940df0840c35990de989d76daeb651a07911681 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 cc4d9117259ee078b3a34cf4d57afb6407566b1a..af35e7e576d07a75c81082ae2775ad6cb84269d4 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 9830b97ccaa47cb894ea66c0f8d8f2c53fa4d121..9f2b4b25f7bc9b83a3492460d81605cb0cc5f076 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 119f0461a67c3cfa1d2f1eae3bd87c9d04204ba5..992f655d95b46a63f56e52d2f3f21b649976dd8d 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 17e530152af7422daf1def078a8dfc736f956b00..0000000000000000000000000000000000000000 --- 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 7babfc45ad89a23ce41ed2cf6abb79f072b5143f..4ecb56b884c00210367432658d65d7849ea50e45 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 b0850d692898a49f9d0c0fffcc09b8b8fbfe85d2..177d8a1fbb1176a67381f9c5f841aa7e125959b2 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 1feece042db3ac3246d7e3f522281ab47e892897..f97106a1c4ce41f5afae7c5035b2b0e2dadbf147 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 2dd88d349934332947796d2bfc9fc69c17009d35..3667b5d6f7f217e063b44423e9d86b0d92d3d012 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 68adb513b6f7ddf3aba704d0456d50173e1d8f06..c1d8f32db723a8e8aa574f503cfdb2e94623c7be 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 f68a1cd1c01b5701b6346b9c21e32d15cf23fec2..4eb4543a679ce88f30234b9cc39c9ee136d55d67 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 a3514fa60be8c3bf4d10110fb1a21c758144d5b5..6a0391c1e8a27d0acad6377b4f0d7e8c3490dd7d 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 a89d69f5b54b3d66346c82358d543379815090b7..96359b0bb658b6d7b9a4fe6eaf206be12903a8da 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 f8e3dbe78151e8eb1ec1f1332684e939c4c1b708..07398bac9d47ffa7b485eeee10b59af15fe76ce8 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 d5f834b91f2d35df57e861b929e90122fb1384b1..df464aa576fe4e8bbf1f801a00d82cd3a506d1aa 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 1e2e0b3324ed905ff96c91702887aefc71a9735a..adb94d911f4cf40b6debeb08b1f1c4168152e339 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 e8b804321a1507ef7d1d8b307e68ff41a55ab2b5..0eb3b67e69b2af87274a9342f109cfd93926bd30 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 0e31dc466b6313d57124dc634d888ddac405b0ab..3df54c26acbfae9e86ef5d21fcf30b725a6465af 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 439fc2ad96d5b140b5add85ec2fe538cfb44d6c0..3ffff7701de31478b0923eac72ddbac2d2144ac9 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 4031f804398eb18d445149b6f2540abde7b286bd..c30bc97f29d7d77c2ba1d94eca5de145d72e2bf2 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 91ccafcdb28613d84c4928776f480f9bb323b5a8..42dae09c6f6bb97e8c505bd68204ef63275e3d2a 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 ca4a8a0e5231ed8ac5377f0ffbc1c2c0181adad1..08690446e2509af859f8eb7036328561e7db2244 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 6aa6734fca90b2c0b2d672e8bdaa532975766f4c..04c3bffd87b486a6813af8106d7d57ed91f1b01e 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 ba936eab869fe76cf9b9a0b9ef1ac5f0f266965e..9cf52ac6829538a167077ae0058aa7fd7d729b11 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 09d950a3057120a9b63744330d6b72f9878bfab7..1e54a2ae0926a20cdfc5f9055863794b8726f278 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 57f9983e0c4789625b78a14be245b57594ae7d8b..baf278e71d0ed4ce7540082939d0ed81de06d887 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 61bb8e2d00d2f66e55a0ce350b82fd6a70bd18e2..3bf2137dff6ee3b6ae7423d0ca71e17e3d0d34ad 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 6e48d65b26ff0fb3307e2fe645741c2d924c1e97..f8476001d72a6e19f31b0fb4792ce11b749b2b5f 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 bc5d72c097c18e276e113186e415494b4d87b440..6dad51a6434d3db64b4f137619edb4c7d33edf0d 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 990d019ad757e87d621482713cde055d56e24621..570ee58f451e660d46188e0ea99c8b4bc84fe670 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 6dc0da67ca0b90cac3a9abec535fbac23f676def..0247c9c514e6bd3fd814cd8e2e800747818ea3ba 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 ac69c9cc6df9119aff415aed84a08e8de54c9ade..03bd8d78bb220f93cf1404f9ebb20cfb2c41c7b0 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 12eaacb3f980d194b7c1e69416dbd6d8ec2b3504..b867194f6895068f0ede3050fab5511646523b8c 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 bbb7b0c764bdc71ef3cd127d3a109747db980ffe..7b63a15b81356bab6f9ce9fe3d8dc320c41a2f76 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 0eadabbd4a6474aab7f0b833be984ace072704b9..8279eef501d8edcf0ee00fdb79226fe3bec10829 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 fbca4c1a07530b1f0e60be8c480dba9ab61b503a..73e34e411327a0de114ff7bf4fc6252298c8352b 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 4fb6c14071f8fdc0ac18670925a082195e6ef499..042e5dcd1cfb3f82d9a49f010cdcdaf75de78694 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 764fc250b07495e4f4e2b6662e3930d7d4c5958d..4195fbee339679d72609e8c9ecae230c8fcccb94 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 8760e6a66f60501bb1d72efcfdc4998efbe83ca9..39af36e86f1dd92a675c086c6e6c6744eb3229b4 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 2669ea7bc79b70c72f37942faa65d57636a243ac..1d555fd626540e850039d5f86e5da619a40f4c02 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 494455f6d85ad2e7796cd5bd32cf41b554890859..e3cba1f30fd5ff9451b3da6907a0471e974e82f0 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 d68c17517e77b1fcc504b081e88e3a9146e14c42..399ac3c231a921520f40f22a2af3639af9ecbe88 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 f5d2101cc95ff8f8c53f6ac19e6e8f8266196667..c60130e65696cd9011d78f266d40a2e906f8eeb1 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 b64691ef803d46ffae79a84cbd0af92cedb000db..4970fa7925820ed47eee662f9bd59b5ddd6a2367 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 a409ceba03ac9aa6a1c10195da0e8dfb8dfdb45d..ffe21174239467d54c984029de61188cb1a3c88a 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 00177c89f244d7700131cd7d8872deec55636e03..5e0bee93490e3b4a94c2584a44bf0ca59ca2f66a 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 e27aa5ec41dd7941e15f6f0bf4ddaeb7114851a4..7f8d48da732709eb265e9a6812eb841c5280cf4f 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 95743f6df50d4727741ffa1f0b4f15d508eff287..9d4c82ec2053527421d8d7454059f438294b6715 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 d393a3b21cfa7011a5cdc96f61ca454887548063..c287f69dea3b0c9325556bd048a0daae82d04de8 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 8b45c8f121ca25455e6242d6372f0308375e89e5..1db2175e8bb5f48488d82b0aead45fe90b41ac12 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 a94fff8b59b7f8cadadf7afe4b47b0f6655c0d6b..5215870976a8b16e3cf8f121affb64a3e6ff6007 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 4981f199790ee9a70885b03028a7d0dfbbeb2e6f..ae32033b0dd43a7f4f71719568be46c9fcb76c5e 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 64dee6957f732c73400e83072b9f75e4023218db..4ae7e66a87de3a62dde005ca909a3395119b332c 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 cfcd8df36d8c5fdf5363fbfe27abcb8209f9054b..6818ee9620b01c4b8f2835c4a12abc344782c43f 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 0b2fd53fd5b7b9f5fec2de0adf1f467e52fb83a9..d530d501e4bec5047393c43caf91aefddcb7e8e0 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 0d0cf13c62da36a78c804f7100acb0fa3acf3fff..0f50ea461a5fafca98719dd228e3ee02d27f0d07 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 ebf12b5e12331b2fdb1827ec3252299b19ffe0e8..6dbc64ee74c8ea22b743c99eb2e62e8b0f88c8e4 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 ddf21ad652ef7d9f8ec4627a19649376436dafe0..e3e8728fde890a6095531892fa7004307588992b 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 8b9c6ce2b1ac2e1fba3a60e8cdf6f480fa1380c8..94ccddf8d1407551a7fd7012df371937b91ad91e 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 2ab255b29ae3f5da7fea46adf31db4d38848140e..c3ddd5fa5061e89656debb95f4ecb9028bb90e32 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 f5f6e1c4408100fe880f1a277f7bce9d74438d1c..0074be9217f1c8b00388f6feafbbb14bf7bebc9c 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 2a3dc7a99a2792506b8806b58efe3a6e300a77b5..f23cd1b7a90e55baaf06844d12fdef22302abc4c 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 7e2e91fc8484b88fa516f92913f5c10b58848100..28b49eb93d4c1b2a938861f506c7b765c598e08c 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 5f7367b2e4ce0e8963373270175d42bdfbedbe3e..710bee9aee5e666a81eb2eee7c150688ef514775 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 6b3cbb15fee9b0883386513d048939d8d7fe9b7b..434a110a454bac1924f7c3f0db5c538de2d72989 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 f14bb752e3e94f8e6b246c13988554cc697d5353..5f20b217317230f428ad53dfd38bc7838c16cfdf 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 f5395b555d129e60675d6b453bef77864b88f798..dbe2ef73c37b5cac4fdd0ef5cc014398723d1ce4 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 7d6742e95827c328349ff1c0c4dc1bd78b3a9a68..efbb959fcf0874854d0b0c1b28a45c1b3db2f965 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 d306e03e20f72b5b30fc8a4e103cc56b2466d94c..bb48d9e3492d0ab36e0121ba82480b874fdf4550 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 89178af268f09a142239f93ebde64d76ea1c9b1d..26d7aebf44148cb516dcc187547f12184dda0108 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 8c7f2d2b2e8e585bdacde4564661ff602da6aad5..5ab4ce066bcf95ac918cebb46f5d4bdd9919efb3 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 f780f31300e34a5c67d493bd835b25c81a075706..644067d4f35842c7fc50da92b0468c380f62fdfe 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 234f09c207931573e8bf8beec889944b410a00bb..4499414858306e24ce626fda72518dd0f7946394 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 8aa2c69bbfe6b5de75b5c913bf8f92a3451d2994..2d64ca6f0727fd3ed81450e09d73178ce85ddcad 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 80d9060f7b94c8968bcd205d71eee7f6055ab480..782fb6f9f7f7d0ec0ccf6ed33d743650a45cd892 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 efd8aa9a491c027e23883ad266f1be088ad91c5a..9c7a3570b75e9a3c6cea296dbd6978e349799520 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 3ae127a03492db4fa80d8c2849aeb7639c6b39bf..1e2d2c492c9d9a31c71df1a79d4e9c397e0c939c 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 1d9309c0bbb94e33957d5c0cfeaa736c84578ced..e2b9b57e568dfd88d8b74a735cb612eb994768a5 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 c227de81ce5c24013afe61458fc63d5a08190e08..801dbbc8dc35a5791cb76de36b3b296a275c4cf2 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 960b6e00218e3a8b4475a7f4ce7d309674268a27..9af88d33578fa3acf83f98be0b151f33cf007637 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 09beeb006f478e3f80539e86e70b3822e84d1d9a..b37fe752e8f47bfd22a495421b6371e495c2256d 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 b80a9122a9c07d1bc4c7a4ea07a39267815d4346..0b580d22d9f8313fae81be7eba2745ab982f548f 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 0a9aac613e9fb87ec0a3275b537637caa80be9d9..1721aa09fbae0126cfb830919007f09e607d0e9f 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 00629b207728f6b6fd29c618786b0ffed13371dc..773ee93108a8296bc140091e6e5329da0577170d 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 e6387bfdda9a4fa7d09e2d4ab631777cf7f672f1..14b0d8a49de98228ac1c2a8bdb667ef84355ab42 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 1c160a1ea3f0ecd9a7659e0c7ab61b5be2f098cd..8330826ef8edcd37288aa428b24f15d5aebf1bb4 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 fd70e1e1ab9c8f785690b0cfcdd6c28da4cc6595..85abf6f74882d05d570295922620466047a6ff21 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 16d77583af48339f4fc7ef1daf7682933ac08e0b..53c941881e4f1c4cbfd73fb027fed883b372af3f 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 a079b54c134f9cf7a9dfe036b6b6c2af60740999..2ef86a3d3b131edfa784efd6e0513f59ad9e4d13 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 f1dffcf7b7a3310bf0906f28b504a2e33c89a517..7955b7f4eb53f76eb6951c8818cb59238b2e0c05 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 cca92ff3a3f531ebc7e04fed4ec353574a5c2772..b8a5a59691f71bcebd52a11937fbe3cabd1afe2f 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 b71a5147765fceb9b543d463866bf9e606b8e733..3cfe4c542069297b188426dc7d3d406fc61f9503 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 354f1cba3e0a827e9747386884afe36065bc60d1..99cb74d93bf79edc219821b038dde20af5e53cbf 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 7d4f6c59b0eca51f164d986ad642fb0288972c01..373bb0804ec4aab5c082d29b1b52d6f7f5d7406b 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 5328a171aeaedd75001076214e245c9bba072e27..59e37f2acb3144ca23a15ba8c0bef3fa246710af 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 f27e167dc1b4891f1d3ffe751de00e3b337f3e9c..4ac2218a47118024fb9a253005f1df715aba4747 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 f49b7073aeff5bf32e9e77920ba5b2f807eb92c7..fae7353bc408fba5b70a1182822cd549db6f3622 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 c292bebb5f6d79ad7a3962e2a21ff23cb64a9bd8..4b38b5eb4a7e68c30713430bcd37c2307b4e5bb4 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 d1df125dbe750c5e3b7cdeceaeb7b8efceaf2f17..bc57324c4fb0af539d9815654be755bd7b2f723b 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 d1ce92854734b8a9067f5d0ee0f64011c99259e5..be21968a58c6b7dd58af8c6c8e84a09a47103e6e 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 749ab86137a83750c2f499bf481802689ee27b4c..028ed199cc3c9a2d62749c5fb1fdab3b4d766588 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 345309d45c3fc1913a5b324a5201eda6fe5a3fed..3250961d63d7c809c3694535a0fdea6a1535bd04 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 cdb1f60d17047b00fe83f9c88df1900bb95d83ba..f4f3d947cc7ef1591c42407c8cd8348c5434541a 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 eac7271b404dd48488d17e9ac56bc4d6b2541703..3a0e0065926a6b7b15d989dbd03e93fe59c255cf 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 c0b53040c6fe3fe82d340866e4ad396587e78fe2..b5270fa42de0b3f6b305addce65c7a349a265c6b 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 10dda881db93fe54c1978f92506de35254776eba..19fdd7f3527bfa62d9cf40aa0af0063eade9fc53 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 d72b8c5c2cccbafc2012315b01c2c49ec555b906..169ff2446bcec481f82cf5b16d13b052c4985700 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 2a30a8ea4fdae6ea9ae136e50375deb1cfb2f7cb..f2458816d2fc7a5957e418bab9b934cd6d9f10b7 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 794db9e0cb703e2724cdce5db1b7027f0fde1b59..a6654411acc5ef27e8620519a230879255a3013d 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 a687f714c50fd0c1bf5a670c9b25c2ec4393f56e..e144f486982efc3e1cafa1d695af043ee9cc9fd2 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 4c69966fdf422d755dd817fd8b20dabc1dced5fc..684ad07e8a9cbbd4b828ecf8320ddb22db31d7b4 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 ae565f70c37bb2e6487f5dc9632106e49dcfead8..8de03dc4e536a082d138299e64d45fa9d8ffa5c6 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 0c3dbb4d6e559d96686f9af206f92a777d442abd..3f1895e0fe1c20643c0e20d748b4d18868f27836 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 9967cf3984ca50c8bb35410cf5d9543f84cdea6f..fdcdfdb84f97ae83ae33c1cb3b6c12eb08aac81c 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 01f159f991eff3f47822afef5593953087e7d00a..b0274ad27e172d0b2ed651dd2c61815858d4d312 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 5eb0348bc82c5a35b9771626566c98b29a37c9b2..8263fbb622dcb84b8b2e8da59267092725a86f75 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 1d5738179611c6f5d03b172b9cd6af2320697142..e6ed5a1da5d064b2b9f01cad269a2eb1fb82e251 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 93bd4bcf42fcbae6e4df2e4bb62dd2604cc93558..d123b52998c32dc19781f8f5b0a994278a559124 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 86c69dd51a5518d329ae52381b7dd3f0fe3793e3..9bc3340299de5c400f2ff255e85a6875c23e008d 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 dbeaeae2fd15b99b5111f32333b25fc4c5f690e9..518f3e634883ca4213ca3624a888935b78842d2a 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 c7681848ae0fc19e5fe478fd573b50ff7b596ce3..b5a145736daf1d49159a7d960461a4fde20093b1 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 8425d56e05617ce8768e96c04a46b45032a26518..54468c388f78e16a0ce96ee23edfa52bc2982855 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 5cbc5c882d793a789e606a133404d0caa7db3ec2..c54ed911429391567b53d1032fa06636329193c9 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 8f0bc17aa613333f35aa01e98b71cf6e14f79b12..fc31d65847c6aa392f65f0c5db1aa164b1c50bd9 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 0aa877f05b99498be38e064ef04a5e0d104a0b56..5c3f84a83495a21f51173d75a1d0961c01b23192 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 7eb53a629f143bac5cefa1c8112e57a0a8b210aa..e4274a8a7be09356f3614e65200a2546e60a099f 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 e813d737480e518d7c2ac45a1f90cc9047e5a51b..958d627503d19e0d70dfec2a80462d0336b9db57 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 b537947618c11e7cb169c0fc9840a98d3da76bf2..234d3ce42bd22696c87e610cc9733019853c5d8d 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 1f2305de1471418e57d9994e8bf0141bac5c0c29..56ae6f0236f51a14f4966dc30ed478947c84d278 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 795a61ddfa56a22f7ee38a870a09a3118b15e187..30bb51dd31fec7dc71b7005dfbdbba1902af426b 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 269c6a1169f478632bfa0e215e35a5040f16d8bf..7e0952ae763228c101b7a6e47a23255e030568cb 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 f794afa634b183bae437a2caedd79c0ecf661e6d..397bb36b3a0a28b7966cfccad630c6f4007c7889 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 80f727a95ffbade53c9966b1e1d491c4f4aa47e7..8483c2f1d9a265276fb5f8eaabac525b6fc56823 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 30d88fb7bfdbc810ec468f2176177b3a06592212..10732865b0466ba70baa4ef8b0610e8c92d20158 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 13f712235b85ca3b9ac3942a94b53ce3b1d215fb..2dd9dba1a8c8a50485d4b54f7affa7c1686db7d8 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 d6a2e9997e87600a7620aa2aca59fae7f3dfa5e6..8b83975cb49f7d84a99158c4e230d4207976cc89 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 ed8435981cc03eaa270256bc2cbd304c7c8dad11..aa1fe59ec24f03c7213e31d07428ede5bc9f32e9 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 59d05919cf8d0fc2ee17cab29b4866c8ec8a7137..26ed8dd0492b9df38232389a1228d39bce5a6daf 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 815182e88c64c464ad5c3b744a54f830b9f8e386..6951cee5e71e03270b2e05b86ce44da8bb1a7343 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 800b7cccce659adf6b800c7805aabc8da3c043f2..c6c0ac5b10590ab5a966d511c0f60f9edbd30652 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 766c435a50355faf3feccc9fa05ed287cf94b0b9..0bf2ec4fdb929487f2e600807c6075eaef1a070c 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 538797f516e1b655f37ab89ea7ee5052020d426f..4a3807913768b726585d56dae741ca321980b016 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 f87d9bf9e0587896f38e3f13ae1a987b182c0230..d11768499a93d4040d6169c0ed998c8a7d20b27f 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 4eeb4f8a2dca4a7cb0e858577514a747dd3be4e1..a0055bc18c99e3eef1feb62ba1608ed19b58c6f6 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 6b1ac69debe834483d91645951f105cf604b6c33..b448e47ba96955ac888003522cd8fe36f73fdfed 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 71d3200b3c788a6d25e91d31b6d518e73498532d..bbb82cdd27adff0707fefd61497f42c5e111f294 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 057b56acd4416cff63e58202e2976de0f87aab04..2fc7b5f02a9d9f32a01feb8364fc87710e9ffda3 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 6bf5ede776a59fdb7b2817b14632ac50b1b8464e..532568471f1ab0e0385305b7e84b45c9c562a098 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 6be35f71b8ebd2c488374d9fdaf1ecfeb6b52d87..920e00650330af4e7717989909b4887d9471e028 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 a79db17383acce9083dad340ce977c95ff9b88e5..37e2413aabf475da96bba7b14fe99a811b49171a 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 a1998cdeaa1d374e7fead2d12d3e5997010ee0c0..b6affc361f369138598015c56859dedca3e47aa4 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 a0983500058b331b1b0b8bb43069bae5486649cc..b73adf506b65b4a31c7798eb73ae8f3b56e86440 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 0dd6b88676b3663240995457e6eb12e79528b8cb..7154ed1e46b810984bf1aa5cb74c2c9e089d8598 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 f99e9d8e4554ef410eef756228b6ad51d674250b..0cabff4999584e8268bdb68e9bc0f06cb4c5b8da 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 5a1518d9f026420ccfb49995be7d1790bb3ae741..c12196b306d9f6976e06d3402904df35f33bcc54 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 6cd0f41c1fcfbf7672464273069c8509c38d3ff3..15ce04b74f5eb7e019bb4812df434adab3012cad 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 578e57d9e4f847985096cc32fc329bd6dbc0cb3f..9c69c9519095f9dd3f8d549ae090ab1c0dced00b 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 d9b040f80f6e93e600121c785600fa9795c3fa07..ffbc1ba4e5b2c8819346ce8657b5b6bfc9a40303 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 7d616b1b1153565825f76496c4886efdb84d510f..82b88671282976023b08005562b21f276d53acac 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 86d74b7b3d58bae40b0f09bb3bc76ba608e501e7..a5ac526b9dea7082c903536494bae84aa473f136 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 1f511448a07ff34696292ab6db6e9047185facb0..53f6184b80c6e65d75afb4e3352492a0ba798ba3 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 9c85deff13c6a4a942aac900e8a017a1afab722b..6fff26f6bfd3f1338f1469d02d9d5d87aa61bfe0 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 ebc8f199f967a235dbb28f5a327ba2e9acaf0883..336942178cbaaf55430ef24ed750b0facfa6164b 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 46eab385ac817c0273268e08d809cfcb8ff15b32..cd520aba700139eefa9d9e6c11d01e8bece217ff 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 7ccb439a8a675b35c226e85124db597e10597e9a..cef4478e838f1258fdc87aad838a9fa3b06fa84f 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 7ea937233c7e115e901b56ff72d58809edcece29..8b96fe23c973c5e8fb1dd2238adce22bce9b6f21 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 b535168f6f357e56e7aa3877313ea9871febeee8..a1dc05ef42540be2b3ce927978efc69c41a1a720 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 466307b4de39cd1c6fbe27979e56cda4ebe90ca1..3113ebf3f862676cf251704ab5c5ca750566547b 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 eb42b27efcb65501de3c8618713c1103e6b0b9a7..2ae6c3f583ad02534c409f6f2546fe5f8130973e 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 98676249131d354e24792539c0bc7fabe21bb49f..6719221f4c0ec6a3f638d963dbc2b835b7f05683 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 a92e14eea198b3f42246e52998adb964541410d2..e45029d1aa6e588692f6924661554b3da9e50fd1 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 1ef4b34c024c10bd8f07320150e99d0bc573c997..23a6953dd1817018f85e304300785462666582c2 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 fbaed2c8413f8118379458bf37cdbb955da9b7e6..a1d76e7553e5946b3edfed89017a59879ff3e91c 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 af5a5027bbad8c89141121b75d86532591a96e65..898381a3d90a493028d757f637d427baf52fc910 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 f7647fb2d1a83f6a98464e66d2d62e5e4462d3da..dc18fe088ed3372c36b8651ede95bae3490655dd 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 adff899e505564dc680a3a9dc4ac161bcae306a0..5e15a52a87a7a69939a64650a471a3f85e68dc0f 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 f4473e1fd92e222539cc2d82d99cff9168873454..dff33129186ae33c780fc952e7f1c45d9ecd14ab 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 1b07f4437963f89496af0d75fae7b9439bf3a021..6b012f36f6ddc1f6c5c75d6f1244bf10dccd97ad 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 db854f3e3c6d406bd20f3ff2ca98cd6203645ca0..fe93a0c6ad14510f7e4a66565bc4eb7ece89d8d6 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 4219f5ae3dd9a58b2ab00ff74c0b3e2dfa338f3c..8199384d07f7a75ac1e483a53ae0b975512296a3 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 e9110f8fbeb01bb004e511f5b3d9ef5543371e33..312738968fa885fc86cbe913b703ad3019ec62b5 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 06a96cb534754a80b4662b416d9870c1e2ba0b5a..8763dd8a59be92829b91a941bafb155ba22e001a 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 5f403ef2b57d22fdb4cbcae06ad4845bfe3b12e4..0dcf99af2045bec8535e80388e1214774db4f316 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 e12e7736713c9a6b5ed100cef2b1fd705680d3c8..ac72e4c9bf6d8dc18a2a0d01bad68fbfe4eaa354 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 7f0581fc3c3a976775b4ffc7213de87dbe0cc13e..037176b52d9db472d8db115e7b5f7f1e6db00e95 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 c1f1403c4c909336fcba3b373fbb036e7c897aab..e5cce4d34a3dd0c0aef84fb3b57e637dd712cff7 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 9cd262ca4d469e86576bc2826809abaafb1f5f56..dab4cbfd3c898915adf6787ae4d3d4376b328406 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 9b1c9ea2f3d325336e3c9ca8d8e977d824003afe..296c00454ee7acd65a3a02eeed22c21fee218d64 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 877087ec6091ac9eb4ed1c0b91097f661c73528d..b598cc75239f0bb97f0bb93c741de615bd8341c5 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 03fb45c8bffb5b8b4f15e1d022fbf4d38de2dc2f..5524d32274b647a2a0f182eeadcc38d6f7451c68 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 9c38a5d0c353d2119de8f91078150104360c3498..82c00186562c5c2d02981f7ea9b2b3b486e03143 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 b60b320827e5f659559eea17202ab23baa4db730..dfd438522a3812b3b442b6b32e0622ab0c786a75 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 8e2102429991c0c0e0655fee88a402f83bf6377e..a263f3611194566206c723fa2ece2f80bf381d86 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 0ca15ce5c591dca2b683e8899d7e1f508ea73d7e..41db97a283824f59a31df225ff7fee2848363fa7 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 3c14d7f1b8ef3202240a9d8c1008b325d86ed545..ef90a09344e9530725183952a1bbcead84687a54 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 4c13827523ff990616e8aaf74e92f6a548567733..a6eabc156b3aeb63922d6d5b7f4f403d1353a5a4 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 fe01a3acbb824707fdfa5d9dae00ede614ca78d4..65fd2669b468d7fbd66a4c161c223035c74775e7 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 93b518a7f44c665adf6dc543764ae38ce6a7858d..1e74ae5404c6df6bc847017b9b6bc90fb55e125f 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 0325cb0a2046241fed8655603abd5c0bfb71a413..73a5f615d3af01262b24c95d063af50806e5c522 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 6458fd65b171f40fbec82ee7dd414c4650ae2b9f..6eb12df1811a05123ab18578448e12bd75689403 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 e0d66c58ec1099da64759e6c00a7aa612b510e2f..bac0cd4afd2d4f152703a22d31aec6a725f9c2a7 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 44501d25abcb8bcff9065a509a16983e639e4ffa..d6e4e667fc56c9a6c70cf673d423f35afcec96b9 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 e3cb08a1512d766738cec3ecccb2dd062a4616d5..a6f2f1d5e54d7a43bc735c9e5c042654e3d7a608 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 a26032ec2f5a9ade924d0704449c70555b71ff29..78a867701eca1abc8e63f93496831f44d93a7272 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 a2105dfe29373d00a4dd5096c341dbbb15b1bcf0..602bc6b712316445fea7cb228f6058014e18fc3b 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 989ed18f2a843f38f25420be5676e97729172a97..489e2aed1ef5846fe0fbfaf0847118818cd2331c 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 0e4e2743dec895de862da71040cb07a8d10e53b8..74438ee54de4baae55526fadc5a523c08e1a44b0 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 f206773f3527af6dbff18f8ae9c81f14badbcc59..ee334af42e5fdc3a5967d8b6529a4e20730bd2ae 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 458b7dc5c4b8addb3f66a720f94549d659eeac74..85edcf26daaf80483f148ff4b2902aba681523c9 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 972ab7d6a6b16df8ccbad11f0e9885d878d68d84..bdc98b66ee124e863bbfccf400c633ac721a135c 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 5f50b48a56509289735242f31a6c15cb4e5641cf..40ff127e5b11db9c90c216cf44caea793593e66c 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 07a4ee68ceaa77aab731ea82b921a775b8773ff6..b6086cdea23aafd3c637127f00c1647fa323b3c3 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 6792ca5b92ec90e092c3bda48bd9d7f6482cf316..d891ec0cb1649e77fde00ff09c8dca91d29f4098 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 c40595e4ab490609cb402e70072f02ed1c3ac74b..bbb3a9692ade0c2a0b7533729a38a550adb543b7 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 09b73c267914a64a327a323762278a6902337b06..a565491b782290e6af6835c5ac400101f08dc88d 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 367b3afd79cb6490b8781d84ab8ff1698c80350c..496e420c36e6745ece4fd6e5491b8e0580aeb868 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 196f8ef715f4889b2a45a8e217ac03a1af7d8d63..289157df66835f5d3df8535240fe732ca1bbe832 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 3d6119d402e590ab9ac30ba4aa35a1b1567880f4..574d2781f5460ff0ba929b16d01b505d6c99c4c3 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 86823969b4a7cba0f632c18152d7b3fdb156df68..e310953d3764eccc2a977b4792e06f78b3bb449e 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 c7fdaeee335931046f1b2b9bf81895b2d460eca5..9432f9ad0dc28dd398d34d5a4da189057504ad5d 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 5e9eca1f3e2b5d473df16bdd2a460a29c9167cec..bc93ac18d8dc88abb216460ee81aa9a5f96acae4 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 92b3ec56e5c4b2889d65d9884126ec997954b24c..fd1b1b98aab0af935be47fbeafc8ff77c5d059e1 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 7e0b0cdddc2972b151b48aa3ea4c3fbda2ddc39a..d6f88efd7ecba774a529d5ddaeb112785ae2b5cb 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 95c9f64ca6e280e789d13627308841719792f46a..4a755b32c4a8a317839144706fe5e4b8f16691eb 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 845f8b0f74d32aadbb0c8286ef2b0990ac7f08d9..5a0b1d2340eb9d7bf22de0a575ce85e06dac58c4 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 de35d213a8b11cc2a86799e73f8c9df9f23a7a26..335bf8b3825e07a190f624727f15ff4f8f8caaf6 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 a228e2b586fafd396493070d8d3ee2b7c4b193fb..235f7da9cc54991f62d81f3985bbf7394757b023 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 b666d078ab55d776d4105f4f3d0cebe662d6d982..9f825ae1665839684c5a2adc82d347ae246a9fa9 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 c609c35bf0e7752a4746b559c03a849aec0fb3e8..88783eb40ca1ecdfe83f7e3f9723755fcf3e1abc 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 11301853b9d5e589234ae55cc1aa55d82bb095c6..cf37ed339ebe1eb81f5c7441bb83aeda77822c44 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 6384f85e524a1283b1536757e9f4dbf80a5d9e7e..cdb4012be0ac551e889eadcf8367c6d46472699c 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 416620f761333f7e7bb627fd8c82e1ad8c506eb5..726f7f44efba61fd3daec815f613a88aa4d6ac11 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 035ffe2462114f2df25ac966b8f9ae8db2214f87..6aa74f95fb236468ee1123f94f1d9d6f4733e14c 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 cc308122b01143541d6ce21e82a23a2c8a75a998..0f44332a694f466fe22485af057f9d0ca6066201 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 c88556e4fedee87aafc275e56aa5de0d647e6000..05d14327f3fd843c01d3c080d20a8f61e44f2920 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 68c00a5896d37b741552590d4efa419344f8fd34..6d1a8dea431e14681dc85165dc0ab708a3270131 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 98379024bc04858b349778ae904133d3b5d62c23..0b2814dbe1cbef9f89ca636c6261d7483a937a05 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 0e8a1ea6539d6aaaa1465bbca2be2d25ba96cc83..6d92fc9b0ffed7691de1df7f976f96f7a172cefa 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 b5cbd7fa0009fff3387fb851527d64627ef0f7aa..18fec0f8469921829e64075fa8de99ad9485788d 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 23e968125736822484b83339158811842e043a7b..e13dab53437fc0f9227cece595de3d2b85d186c0 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 9d7fe5574cfe369068a51c816c760ac3206ccbe9..d148a47a884994e17717dbce4a71df177298c08e 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 85e3908cc9565f6779bc73841023385d65d2a17e..a924decabd3a0714af82aab1fb7dae04b97386be 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 1673c3f39992d05f2f50de79bffccce45205b66b..a60bbdf294923214eaea87e9e2e962bcf6220446 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 6f1c8840fe8d369a88335d3c1ac232fa92be29e3..10d0b819104aef73eb1b887c9b5b84637aa126f5 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 12e263ff626da61dd07de6a43b793ffef37556d0..d1a1c6443898a59aff87b493755eaf86f5a8bf26 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 965a8b4c0c4649346008f2a59547df407c22f19b..11dfa6d760dbecfbe1eacea0d6b15db7754821ea 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 e5d40343bb038a432865e0f2b06ce980a44e1b1b..9c1756c0d70fb3fc6700c75e29e69e373dbaa4da 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 059b41e730c5a39a4050acc2c66f7da62725dc49..b94edbef2598e1efb4ac41f6e36fd9ac17b8e53d 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 448483c7a77c05ea528ec1938b39e416fc44b83f..45e8105ecc563a730d67fc5b99e5fd9fcc3bb6ad 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 a7832ca6796aa1827fc85d20c0e695050815f7ab..c5bf77fba40dacd1b183e5bf154c750e18e38e87 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 77fb2e78eb8e81081060eadb0db4a91e43355a05..8479a1dfc5d00d0623ef0587f5dfeeaec4e557f4 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 049b689f44648c142f8ff9343cdbc76a4c2b2e76..93b51e8b25fed14ced3bc6dd5d5082f7e53c7e44 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 4d0221b087b6aae905f3345bb2b08b6a88b4fde9..c511d350f2769f5a8e1ff8cffb65ee9601cf88b7 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 7042c152d221395a5de3242b44e70662d62660de..5891a647395b315bb8b98f07c194e6305f8f29ae 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 88bbd64116458d6067de78f1dd0c9550b4cd7d51..1f923160b39ceef993338468d4d759223b829efd 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 5915f9b7a2f3f3d265b93b08d960a1f47a7c2979..d6bfb4d8945efdac7030edafdc9cb301d8cb07a3 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 c960cb0e34c09828faac59f2c153ca515d743be7..2fdda571c0dd138ddf8b2ab4786c827b9a136c2a 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 b3ccc8adc96a037a27986d5ad17acfe9a3ee7cb0..8bb01d15901dad201866c8cd596d2e1fd975cadb 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 c6f386fa41320a673142e38af96d0531575995e1..933987441da6aa44d147c55d0d049f9efffbe25f 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 2c7a443720ac150da930c25eb1feb09a57729cde..248d6ae92716ea92f084effbfc6f60e4689093d8 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 57bf588ca82ac3a92ecdc17055be59bddcb0f4ef..57a069ea72a0d61549d1e5999af0e92475fd3117 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 217ce0bcaf576cb0ef2684c0e0c02a5e5dc9de07..2fd92d868276bff13681528831497f52a80cf3fa 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 7c893bb9ceb442850b38d2a3ea1bed4db72014b2..afc228e460292ddc0619515a90baf054b1537de4 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 12f2ff36da3e62c0d98d0c3315b4d926299d5041..11c5293a7cb0cf96db8a65a6c196818a6b86965c 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 2c1434534be646963078c679bc78caa11343b5b4..8a42ec127369992f3cfb73d8a12056a5139b5e38 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 07e398dfc01c52e25418ce3a1c74026e568448e7..041719804944cf139678b703c0cbbd84ca89f21b 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 ef1dec4d2cb4b66ec995a91badb1ec5968f78b8c..c6f25fc96d2b80814a63035b0ff2aab6dacaf4b7 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 47f13bd3a61677bae3d61f91f9dc0a53978ed52b..93c2fac2e442e5836143cdb417098b73b98dcbfe 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 a0e103ebca5ed1276f4ed9f434aeecdc97f6e496..5986de549ad8f65d7c99d7e87833f1288540471a 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 c612c9ca5f7303014e8d4082cd13b1a25041073e..ef1e47d96460d94ba2b4006e79135ec91cce1bbe 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 8b50f3e4fa8a7c6f2eb8b81748dd32b93875264b..72ecf9893eb2cdba91249eef1b953974247a2007 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 0ec2958f2537dc1870481243c2ebe91621bb42ed..655752cdd3c4f13bd71b2271b60d29f46cb7d4e7 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 28e24b92f99f10f76131dc5ba5de418597fd9650..51519fae3814824a20aa329dac2a720b5be7318e 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 f50db814bc3d7f80f8944d625c4edfadd3197127..eb5f88121c83a23aed735ce9373ae9831e294044 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 7e3a5d0a9c11d71d0d9f0d89611227cc77ab9419..17e280e3ad0c67bba9a3fbb1881abcc47d89ff1d 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 084bb4690dc306890e2037ec37d77a7ff752f3e7..4de19f9be5bd9877057f2b262da25ad8696d8b99 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 3e5d216632ed36bed41b4f055cab50558c3e56a7..c52f9f605ff7000f1f2863592a64d532361e6caf 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 bcef3183b9ca1397dcfc6679ab21d13ed08dfe26..d0221cc98058c326dd002e61787a0a60557ba1d5 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 37577a2a95d42505bc0877d9ea34087bbac2f366..d44171d761aa1357f73d22e21a1b055a70794751 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 c52b86f488b09e9ffcb3eb6141584dcacedab2c7..f2b9c66ced1e72df2350d3e47d29404773cbb25c 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 5d15009c0221e9477c95fe8dce31d5d6e2283c17..bcf3fef091a67c7e479a8986439171fd9aa55de5 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 0fc776dcb1615cc3854367f96096955ab15242a9..de7cee85f869fe3d26653fdb158cc3f8c4d8e4b5 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 bcb635dada312af1d22271ed476101ff5b7e5aec..3b815369ab937b942ace69bf5674056089cf1ddd 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 7134763854e3eb8fc0822a0cc7681e92971b7946..042d1ecaa91eeddf3601a857ae58d83e509996d9 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 d2a016ef2bd07c604edc296f6df7d2db19623044..a836c4d9a03084ba4e389ebb675db503e702bc39 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 a968008a576ce382f9a85a9860e28e8b2faa86fc..d01fb8b719513ef1aebaed12c6390ea2a0547528 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 e969079aca52c7dee5cbc0b1b776280fa8049ed4..f62bc485b98d287b609cbd715464f0511c1f2c26 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 df9936fe0ecf2f41a9f98b806d8afc7760998d24..caaad115f97a61d53deeafafc1543424108c5877 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 b428ed3a92d79b29e85f12f77b8ef245b39dea5d..9220564bba036e2ba88aa5a19b6ef8160f913254 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 3f7e68ea72e2c69647f176589eb0d158b03fcd72..ba3aa9f161d6310555a6b18419305a8502df9e4c 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 d881a2e6db39800719340304bc09bf1c89c701ed..caa5e571404a810eb3f1172f7d8623b0abbe86d2 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 4f2065202760f3bf285e63f5108727705ef76044..070703cab145e5e5936d61634b434c176e70a8a7 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 3a59aca76c6a3210ae470d9e385516bf73e886a8..75a92945dd6b799cda560c281ba272e05b3d032c 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 82e4493eec7c9c5b195ab34ed350f01c2a64b60a..f88bdd6d79c7c6fd8c7d58dd876fd58afe239252 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 42d439e59784f955b7b23905ef2d52e3d8bd5352..3455375a0f8433c0bd0ba112e4f5af37f3ded323 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 f3f13927bc84b2af52eff54fb8cf0e3e1c789a71..0a4d762f3395fe4f696689b7c1ef4dedfb684a68 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 e7c3576ffe4601accaa5782368b26a64636be1b1..5ec03977a98439b9a44322f42ea335431e2558c2 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 c2574f36f9d6097ab8c7f619ab2d62fd3aa5f260..4ebe7913ef06d59b35472862cce708e2cf269bf2 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 86c3a772705b5b649e9dfeb4f0ecdbbe5c3adbe2..f489ab95844cfb73751af67d4cae89842e0bdd80 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 81a9f292450bdbd8f5cb95830e3a5b4ac23166d3..a1a3b1dc9692b5c47ca942fc331cef6865e27fbb 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 69bd4ef9722ae30c0e20c1dd95cde04c434b7fd0..6e7431f2b62aea4dbcead39e4920468001f3beec 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 0939dc17850212cad19773140dd0e435c83d818e..c8b38f1139892fcf1759602c2487ce6d7b7848d1 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 a1bb19b833da8bf7456425cdff2971ba3751433e..011a61e28b7b8ff19b8a651c4590f2c2f75bc902 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 723d5dbaf51f62400aa8ca0c9fb78630e2cd805e..09630139a44d9a50c4ac74238c3ec662d9a4ccfd 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 5d3dc6b1f1a41bac14faa51394063c8cbca4e865..ff6527713fa318d97a1f7f41d5f9a7379a0cc8fc 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 f2e2a8ac5437bf937b773fbbaf24783f7940ab65..3d8b11665ccb4322c73d16cc631a29acb6cd47ee 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 0cee08d071d3540d9d78a74868a1b4454039684f..11b40ba9afd473bff0f860113580906ccb076f0d 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 2aaed472dd4ccdd48df707af5007f16511566f34..7945ddefe4a04b145b28ee1a32278e8d6ed852a7 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 0d05234bd89aa88f104707c1af6788ef2b94fdda..2ad175e48c23c7369a7211fa981b625554a07dce 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 25cdf99b7d9a0018545a747c9fce183bd16db1a2..dd3cd836cc87035a244a4153d4e777bda761eda2 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 9cce2c87f54d794a952fd971b153baa0acb28a70..fa6f34602caf537e7494f78bec7904aa5147116e 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 43475aeb4fb617e2b1c7e9b50144a67554147b73..ff288b1d17235727f814d07bd98cb0f75e11b825 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 11a3cf5c2790b9aef5a9ba3df80ce59097c45c8a..3f937823ef2502230277cd6c3b8f388202d248bf 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 7445d4799c7e7a304d421f6ce4545e2bf084eaaf..5f9b5f4926016bec18605309a3cbfa2c3aad241d 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 8a5912725696b42d10156139ec74e94592059b8c..6e777cf19ecc521f3705ec0406b7574b477d3005 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 823244578ed164eb1c4fd17cd2e379ef26af99a7..81a35c9b65b3c7b62424d0686524a9c220d9c0f4 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 35c575fe94babfb0ccac38013f63a432b3813224..2cdf1e6f4d7cbbf5f4db0c90de226b6a0a5f7ac6 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 7c85aae6ae36a04e85c350bbb0c4dfbf2754d297..a3f1b307528a006ba281c22a8322593ac679e6a3 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 14297df8beeb7805c1953df1dc604dcc5b1c98f6..e45cfbc9c0385c4f8c11743bd97067021e85003f 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 8ddfd2404b8f735abb730e9c0841ada7d390176c..49d8ff3070e6d6b7c3e80f67b92e4d95ff5a2507 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 85dc9801abd8d1f9bf0f43307c51669aaf811130..91f83ca3a6956ba722654a160a057b92566a24eb 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 e6732387424c2832b804bd5e37d9b4b26419f1c2..b02839a4c5abac8332bb3c75c5d465e1d692da90 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 e5e2dc4a81876152fdbebefaa5602003ca2f92df..8bd546942244b7d2ab29e1cad2e7c6a3398459c4 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 f7022158bc8d85ac832cb181c8963143e95e5518..a2d544393ac7e213a738be19522a60c6ac6e058f 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 bc86bb6fa7eccc52ca0af34bf910a78077a29f2a..e076a3f0a3cfe87f8e93243fb277e30fa7644e1a 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 32f573b5f623e7a8c92be922e0d8c1f96147e193..c08075f0e539f70aa02eddb26ff6d82c62d86c25 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 7c43774d8b747e6553452c5f223c86e0a37f4580..3e9ac432c31784f202ed05bf956a371336e19fad 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 8c83e2c407b381d03c9c703d45b40815c5b2678c..fc897a2f9fcee7e0be4b2627d4d8e6933d123518 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 def848765d0bdaac89e7a83b7d33e46f94b72ba9..c7cf2519bf373605aa097a13aaff0e8732bb6050 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 ce26ce4da927c91ce98b8a85b5a569319d2ef5dc..2d20ba3b67bc6a9bc953ca685f53035b0f0777a9 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 c3882eaefb8d24d545fe1c79fd3180513d6a699f..1f22bae7e719681d36995fc6aef678ad30c7385a 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 d026636017d11e2dfd1098facfec8592fd708a22..873785313303625df2e3200e443a63c6d09d8934 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 2c8f3b42c134a8e8544d44aefa74938321ff8324..05ef55420ae8a4c33a47dbfde5a68e5594469eaf 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 89716ce3f68ab22a905a51f71ce7e5913e2e45be..e6461e302a9175e654c2a796c3faffd72a27a624 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 d07316f07a459757782f9ce2bf5e173d0518becf..b44202f9a6aef0777b4729046c813f70afa2b458 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 b264ac11a9acafc0abb61d702e5c5721cea52922..0ce134edfb95cd4efb14296cff1e8c24e2053b38 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 b06704e95968330640a03416825ddffe0590a9b5..07aa28a0084dba08416857dd18a3aaf3672f4720 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 2e3131e36fc1e634be08786b62d15ec4d28a5092..b702bb98bd36da12bcf65830b232a24d07b8cff3 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 a3bdf47621dcccfa5bd6261a29b2e2a630d134b7..48b8de1eb11ef3e25d268f46c037ed218eddbf8a 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 d8231cea70f574bc57b4b160eff6d74433edfd56..13663e622fc22aa7e7351470e799c601a482ac97 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 ffaefea8cbe7028f58e70af8bd4d9bb98dbc427d..02ab6d9ff66dfa8ab38625534b68dd8ac16cfcd3 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 478b232981de5a7e7e7574e0551b00c9506b2222..4bdfaf38cf68e4fc7939e18e56bc487f55724c80 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 275b21f52751c4b746941ed0c0c16b92842938b8..bd9d2540b586ed29c35e58ec96426a0edf373d1c 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 4d39139c4439689a6411ef5241e0bb9b64b43f58..1dad289404102c2896c1e359665d433396b2db70 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 e920de2e8c266fc8fffee3693a61f081f29cdcfd..ca6f793d8148c39fe5f04c0ebaccde3d848567b1 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 015a6705ef6c8b7063c680396e671323b19dde44..88870e675e0b5e136ddd484c5b56dd35acfe1850 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 56a9f21d554c574b98441f0ab4ff2d5d88a4c26c..571d39c3289df1dab04f3fbf3f7f32ff09846ba3 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 8e166238867d5aa41441069ccba237eb93765b47..c5d09426de0d4f9f9f65954e7db5c6ed6914e1b7 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 bb580ab10d951d23ca4ffa8515a3a3151021ef94..6f5aec1a141395ae687a2c3dd8bff2b3d67fc8d5 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 088af5fcd5403133f09024ccde33803869ed5cb4..5258776456e1a41ba8bce4b797be47cb897321eb 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 b7a5602024273b8ada6382edb977766b777f4b57..34a62305f658206ad4cb444fb36dfc47735205df 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 269d0d77436b6171936c1c57bcb962e14e48ec61..1c96b053ba741211278b495f6e5ee5d544967454 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 25200c3ab2707b1ee90a05a5b3f5a40b3ab2c6a0..c4b5f5e22a6eaff3b872e039f19671f24a054476 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 f830564addcf688332b6760119fd78bd3f273722..d3e5bf4a03593632bec90b2a724fbc10c1955874 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 cf48604ad20776df28de65adc9a173a95be40c46..807725751a0a789fb52cc70adee6b5ec40d364b9 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 381353babc388ffbc5f34b980bb9e68628db151a..49626f887dabec2e636476f47c1ea27773ef0b3f 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 daf478348381c889e06768a0edae9578d2904d62..3434b0284d4469824a70ce60ae7bcad6d2f9b829 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 b529ec07e7835281c1b0d02c0974bc11d0acf944..af73a131f0d12feff0abaf4b2d6aa05393d58576 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 1689a1bad519fac95daa50c36b6c5771e67b39a4..61d9ff0bc3761dca4da8eab68af4849cfd0be759 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 238117a3d57f7112a5402e63f02e76c336c44d76..93b7bae4cac83c9927d96d50fad789fa340d89bb 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 a208fc63052dfb4accd20b768ead5ee18aa5cda3..52187715fbfe697a7a62733a9844a6cd7d3a7820 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 aca5bc36e45f454f8b03ebe3bd395f51efc47647..76e2b11b31f2bba9f20be4f20b3313bed21c5eff 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 79d16d47e07e21ecc5737dd67c27ca52f5181ebd..a946377873009d2ff58a6d787df77b30536ef4ad 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 a99cfbb7a3e447d9079398b0879c1125d0cb8355..484dee0b5385197486791d5a1f0751da001f4f69 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 79795676d72974bdd60a3f1e0f13c984c21d4bfc..584d443e3eac5af0d35b6d5712cc0216046af779 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 61226a4154908ee5366439bcda75f050d84e68b1..f5aa55d22e572c34a8bc3b411c38dfbbf787617e 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 cb99c6070772d12a0b6791d8fd43f1e2e961a1be..74012f89750c6ba4476b5f7c59f496490be59b72 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 55ef402fb970025e98674f5e62abc2ebbd5f25af..71fc51f796283e4c0e8d30929fecfefc811a12a3 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 617125e34e5cf0e7a5e0987143684883927ca603..ad066d23c40eccef8d86b30c94c604328a240ec6 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 48d751f0f2593b7f87b0e7d3a833c950f59b4b97..dcfc15e10c8cf2eb9436ef9f57871d5a4aa5c998 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 85b4150f9a8757f7df87202ed167a9b3aca9699a..b1aef04e1c9bd0bd880777138462a192d297a615 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 ed7e4eacf471a6e4f35d7c048eed0ce484449250..7ef3d7c955ff585e40fe1a48fa3acb93df4ba4ff 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 d19ee77d81016ecdfb352880363b9b3c20527ebd..4811c90773c73a05857007a82f5f6fd3a5f7a684 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 cc31702be5ab98d260d2400e24ae13c04fd715ff..eef60ee5624e20d475682e79bf4f26b5b72b34e3 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 0542f4a091ebf7270bdd7ae5a8fe24b242d5e7b3..ddcb0b4252bac7f682255a4ffd5029d132b68e2f 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 de52d8a03210f819451410c50117af9dd654cbef..36017aa6eb858492a83775b75c7196fa2ad10baf 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 2ad95e995a3a3399e4cc24ec34696a0e4171c1fa..a18fda7b5d92f3e7e1f01796a7fbb2815786e620 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 4f6909ae69d56b02ca453226cc597897cc5d629e..f73edc8f47bab578fb9bf0fe6345a8a87ff5a1fe 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 a21f0a7f5beea7cc90e138c9d90f54f82c5b3595..90338130378748bbec20e726b444c135a02a4a51 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 b4ad5a72245e1de4add374a66682e017c5b396b9..7dd2ccd5a9c5be4413eee2986eaa711c9383f089 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 2b4c817928f385e54b8cdba0302f3282be311ecd..a8069b54a797042242b947ebb779aeb7330efce8 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 ace88866041d144afb0ac215f24d485ab12a7200..81e0ad2f944bcca8ed48a6ee9dc5ec607cbcdb67 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 9a75d2e9dd9daba90203584e1d4fb6bad4040ec3..62bef9bcc6b7b7b49bdf3479b47c72a80040f3cc 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 c205b84510fc8c13046bdea552c2b5bd150c9102..71dae75bf2968b90ab2f329c6fe0bb160f09f1d4 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 4bf3b8ee98a4aeba66b578fffcd34f44d2f8bf5e..f6c422b9a0d9f8ce795af7db5ce018823aea7fa2 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 3e06f864cadfeb9a2b0d0a6e7696593c52513e8f..2766701eab3a536fd3ce182a04c2341216e4a086 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 85852f01885029400a47adde296f9a70f9d6a43e..fcb07fcf8ae6387be54c93669bccb92fb0858591 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 af9bf743dda27c23d1d9ac89b65c28d8749532fb..4431e59bfb80244aec0cbf68646ea196ebdfa4e4 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 75ea55097c1fa98c20580179fb08374260c00a66..2ee2d0f8bc0be72d7b49e106b690af32dccab592 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 5a14376d00e483a144a70c5bd91384e646937b62..622ce98be2e78d007c63aaa2a514df9fb7243272 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 84ae6744a455e878f142a3694065c83a062079e4..f0195cfd8470b6bd3b61dec5602ccfb4c04f446f 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 d5adbd8e6c6f915cc52997350ce871993f3e5308..1218607f5c5a1b3d5e51b42775304743ddd9cd14 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 b5549dadf0ccc147490774f7184d42dfdd571e24..03765104ca7d4c006c66112a9b7f99dc9cc7a6d9 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 6b858bc52594ba4855e163c38c4637a540606d0e..487177c84aedc69288a4f8d63a2afa9c86f328eb 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 ceedf098c42002cbafab19347e4124d81eb44a2d..2a7fd0c242cb4a5dcd8306e6205f0b0b5e1eb7de 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 2a236a84c632bf33f2af3c1e3e35d24393fbd74b..a70669f49f05250b013f6ff8c79d2eae4786218b 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 2e1281682efadfb55f0b0dda604a2da8a8d992b5..7e83418eaae3e6b0c27a15dfa31706310edf192b 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 de33def6e671dfed249ee938bd93c6fc52d665fe..c6eb4127d75d638ccce162c5fc3587f4b34919fd 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 bce80c77134b9cb2a8a041a9fa80ceba4f013fe2..251f47dcf13754a0cacdfad20c615301ecff1f13 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 7f16692cef71dc6222c16fdb9a64da0ff52f5f2d..247dae0117fa2a3771657f786e8f1aa9a67f21ab 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 14affc5f0787592dc56e9328b53bf6ba9e310681..debb89dae447d23d8f0aba962afc127251c53835 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 207bc02befe61ecc680861ed106aceca642ab52f..ee46f1f6aa07ae69deaf7520d43221477412e8fa 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 2c0b4f346970fb2bfec8fc7dba420306466fef06..f9a5053fbbee15392c5e42912835a70eadd4f6f4 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 cd2cae85c0e0cacde9caa8dd9c4a52269d684f6b..9e2897914388cf36044f1e59c12e79f7556e8bfc 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 246d4737bd1be74bec1437802784d53364def44a..2df789946430240f13ea838ca22295b19acf2993 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 d13ba7c3e0067383d5a40d5b353692b361f5d7b5..164e40c6d8efbe5442798cc85d63aa9dca865861 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 58c69769bd42db33eec4f3bb84e51dcef0399195..fefce92e5574ed3aa381b4bc2cde81cfa41d32fe 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 1da8f8502b07a77a598e58e82f5e1cd6c03f68af..46ac60372a0f59f05e88ab6f3b68e0bba8dd774f 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 a49d077d7cd9edbe0bc6eef291155582b32d47b5..2be52a0a8d1671bd0aa2429f0770e5409b121c54 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 aecf20b667cda06b7220cb9f907820babfb666c3..ffb398d1e7b706dd25f4c5a3165dfe8fdcff7aba 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 1090673284f08a4d50278b104b826541e71c9208..7a1bf47a4c4ee3325c01966c7bf0909c7deadbc0 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 8e44923557deb7ed6f36610e90431d87cb7f2a51..e8ba72a5575b6caeeef0e50f9f353db3abc2b23f 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 58391a739587aedbda947dee97892290a3827c94..73d5438ffeedcea544985d1ea6bac1066426480b 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 d670dabbece2f7b82f3095a2928612f177e8f551..f84812425b2016f77605f8a739dd80223425565f 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 28712aa4b62a363c201b09c52cece706ce9972bc..1df3a0ba1a3eecc779b164937dd226a27a27538a 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 6f25688dc86038441edb6321666763d73ea92312..f3098e17506115ea64eb01ca64b0a026831f0d55 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 621a3b6ba92072de3d411f1713ac6515166102c6..1c525704675d322e2456e2d0a21208f472b30eaa 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 1ca5b76ec7f2226a07b2a4f2603580402b314c37..4092fee5dab857f53e0d583c44ba34dd27e71f0a 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 15e52ce68a28f6fa05b361dafa0f025b7139ea9d..16887d103048f7459afb7da4dcd2a1802586083a 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 470443bd298073abf31d2422ce0f5169e8c5f530..e02eaa32bb9fe65e8afae72204fe1bde5a22de15 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 30e7add344033b0959dd152d58a834043704abc8..ff6639ad4844f9bc9f2f0a9afabcbc9f08dc2f5f 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 94732e5fb67dad51ca57ecf4e7daae534921c7ee..6e2eb725888cb57168e929576ed18c288572ace7 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 c95bea8217b7c944aaff6712db02c89c3cb596fc..96f0fd86e5858184fb9c1d3d5f18db0d0f2dc4e3 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 a95dce6986246273aeabeb4b83b43077a4d291f7..8472df61fe82ef6f07953c1ff61bf4f3684957ed 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 7e11c50de9a11a41ef0968ca6313308c685bf05c..959936f1245d9440005c0df9904128159c52b18c 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 34552fa6b2e638e7b5321ac9f9a88af663874da1..fdb63202f8dfa4c3406ddf94c42b4151db8ec430 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 eca41422ad247ba767e68c7362e9eedc22caf1b7..cab7b56b46a89ea0c89e0b888607593ffcb64cf4 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 1b5186526f100652bd4d489bbd7184e4baa2bad6..e8146557f21d161b1ebca089369f4caf9a5e30af 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 86c9c2a7902a94635f6780ead75e0b68bcdeba8b..831e0e908dd7d990761b96680df84a60618d0e47 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 1ae6ce0dd54b7f03c9a5e7011804f77eb7281513..1b4f1a6074acd1c08b3d30a9bb4321ba4d057b78 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 bf60d7d54fab0f4b63761352614c26df98e8be47..a1889ef20d73c81dc89a57c0674ab9bdff42eca6 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 bbb4bb2683ea36b609a73930a4966301e802b28c..d2f3ad850df490187cb7fb3e5e9ce008ca68b1b7 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 3e70cf5568e1756383a02ee7cf95834978c6fdc8..f303e35e4544bb3aa967fdcdbd22e8cc2be0b784 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 673c7a02fd8a1560ed2783bf8ffa79f58ee134d7..39ba4f0d9426d1fa7b76792f2255dc7eda52fba3 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 1964ddea8513547ffa69673fe1c14657bf8d77e0..73e34fc527d9426109368017a69f74ffb8d8f4a7 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 971ea9d49169f0d36ac54cc5e6aa5c4b0c1a2e5c..f51d8a8329e29a558ea4f3fa73790eb7cb204b98 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 e5fb11c136c97d058ca1f5a209f40dd87ce7617d..3e21889bdffd1df1053e4e13bb4f534071c765e6 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 9998dd4c2734017a233a97fbb24a9c1d1dd9e6ee..da6b6948641b6c2c9fca7291679dffe1880bfdaa 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 e8e7f64018be9d421bb883d4ce67f4be73fd664e..e63c9d16c4411b88e2f3464b2fe75543e1f2b4c0 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 c8442daea3512cf96bd8e138f23913327708ceba..b2bfee27e20d9ea53476b3ddc264a8f4b9c76f6f 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 9f724d4d09d39b303c8aa01f55c358031710e1d8..d03692b9d6d3d6b453382908c358889fad591b59 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 cd7a3365645dc10a9fdbdf9d742b070f33d60e41..d1ab725b645f11408864f848aaa4790784836bc5 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 0e7cd342cbd681dc0acd6bf3b364c50fa2ad8dac..66bb3c88facc55bb2abb6f20291fb609cfcecb75 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 374116e089341b40f254bcb9b7cddd78e0f5bd63..e1b60194860266ff2d97900819fd11392886a412 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 3c92b9cbf8b0295e95b91484072c36e670f494de..088f2affc951589d8bbfa5efc90b2bbc574ea783 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 ca5653506381b1b482c52fc98c53cb340d9e821a..1909f4af03177c7b9acd62e0a5447d0dec42e51c 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 e454b6b07e75bb845844dbfa404f684c5ed49494..883fc078e1faf1e22225275f8152c3570eac025f 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 30f7fc28faef19741f6182db6bee6c3b7c271f19..2948d990df11c636281d89ffcb1b726370cb5ce2 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 c283dfe33f893bc23d7deb6216f29437bdb5f97b..7df79ae700bf35e7d7a098108e35502a73d43b19 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 5a420e3505172b2f414a9c16a19150cced080b87..dbafa92f63a271fbed454b7e9732c2cdf54ad49e 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 13a0cbc5ef8f1e24e56e4f2d302a7b2e78d4da41..4a566e041dd9f2328cc160c52527db89856ffa0c 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 4631a8d9347ead3dac58b9a735b67cb0306f2f21..77c66cd0d78b0e7aaf36beb4749a27f9ee8706a2 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 a404da038f027fe768afecbfcd8f5223db51fcb4..fbf8c57ed67a028b77206a0f0d518ef6b8ca69a7 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 82922e3ba2a8fde6c772a3bc755c5eb03c20d13d..adca7a71a4033cf86f5c8f6d73dedd4ab9468760 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 d5591ac940f82f272fb4f34e271b66c66d4279b8..b06e2bb9768697a74929681c6512af1802ce5da4 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 0ee4ad8e98565055cb8b05b01e0ee375d02bc043..d8039de87449bdac54d481eae15b047b9dba9778 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 6957119727e90a3bf3bd785fb786190d5f4fc918..4462810ff257fa2e9cf29f02cbc94d9baf9c0d7a 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 5d0c896f56e35a122ac39e4cb9e8e71d299bc65b..d887df382996ec290ad04aa55a373d2c0c9dd452 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 9cce426877073af1513350da7fbaeb204a25df48..9a0d2be319a795a6ec7402cc1b37f1429757a5f0 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 519c56daec7dbd78046ae5cbe7921325aad084dd..6bff7a73ed9156c0ed32ac0c30f3bb4d3c795ac0 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 2e3c1dc906c8f8b1b5f1fa56cbc8792ff3e243d3..3c68d815c247bdf3d5eb55211eb3507e66f563ab 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 1cabeb6bc2dd795c8cf9d69384b019d113b09fc2..b6e5cb9ccb1af6c4e47f18847c98fc1fa33fd9ce 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 72b85f72d569f544972d348e04afcafab97079e2..52277d0e545a6b9146458cae5e37f72a7c6cb62b 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 a2956eb3b5919f37c07e21c5ecfc7f822a0acc0c..d38502815dee1a50cae6e678e32549e4ad97db62 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 58220368b4da8f4c451c795cc558d5af16986a2e..e87e8b313d660c509b7f617684aebdcbdb772721 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 9701923515acf4db426b2d689bca0e97c846b2a3..415e347a3ac612904ff87f31a7604984fc989821 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 b4bcbf91729183a47f5016c031615c2812e40772..896c1ab1edd07090631f69958f993fe6b7daa8f7 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 d84253d2b13d78bdd88c61699d7bd209cfa7ebcb..c5ab95477b8db7dc96e21ba2cb8d98f938a3309a 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 7acbdadf73f62f48b8749b3154369cec9709f8ea..755763b2f671d8e0fabda04432eb0113b14fe6ae 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 03d09009670384bb6d1dd18165b13e2e0cd93956..c284def7f3af425402d3c87767bfae1e25a33678 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 42a8601821e65308073712e5b0fc5e19c57963d2..42070682f9afb191d113256c9e1361d35caec2b7 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 4a81ce347ee2c5cc0dca394d6bd8bbda19218c25..b4d8db227c34b6ac397008e000cc9eaf9a455c20 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 cfa245a1c4efe838b87e7490dd70b65bc007c2f4..418faaf4f23fc4d3df0d3c2aa598cc0661ba1fa5 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 73ae07e3aba125cd21ad2c26096ce6bd1515e902..f6c87d587bf441f3241b607af6f3bf4cfd486262 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 d98795c375f0f6737cd71558310b55ecaa27dc7b..b2d9a6ceaf044b22481a741a04eee274c394b78f 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 1c1a8a6ce79946f2d3b17e8b73cdf0710a705f98..80d124db5489ed2355f33b51cb87817d6563cc2f 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 cddde0b0d9d29498c164e5637443fa3250c58c1b..e46b249dbf4eba3efebda6e171ee1cf3eb01572e 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 739afefee7ede9cb130e09e176340f647dbb8fce..df5d97c75690ddd60b159e2118bf7328a0eb2d8f 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 a849bb0d202effd65da77d82979a338997ba79e5..64c1dc9cfc7e312991ebec68c3ea461ff879db47 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 e9b50af0986ffd77ddb7d6f1dc1bed1a1250e755..8d6ffa9df6d62c41b4954689c979b960ad299838 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 44284f06fd7d1b939108495856de18cd8bfab67a..2d8c3370bf09dfb1274165248eba95cbc0cc39ba 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 94c7f6054c4ca765cea9ba358fcc9994cd5e757f..d646be712a8e34964dff17a16526d5281c579b7b 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 7eefdcb7720de0e16cf867c0d93936fe34d94057..652470cb8704f4688db6719b3ec561a849167247 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 ed21cde8a51c41705b9005983e053c86ac80d8a4..4aff0ae98983871a1dcf6fc2642c755e47b5e38a 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 838e1c079be334ee89fbe5f80de76f844b6532ea..72e801b1ef058bebcb74743f789c6c533c68ccfe 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 5681f6405167cd4d032ec2c9463f2df5950b0864..0ddc677f2a19d69d8db3bf929ac89d0d43db0001 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 362791eb16f982c82b54ce9533bfaacd65d02c68..9128dc76e9acbc0124d68f5da2c384cc292de399 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 02abe97b37f112455047303cb9b0fa244d0bb3b9..27b89154e532519cff2657cebf740691e8110dd5 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 59bf51c5e80e4a9e8ad966925faacdde4f3e7686..de8b164059499f34823a55a9d4de1ae81d5f2af0 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 c09759e7f8836ea3466ff46b586bb5615ff69223..47a8fecc5dce73bcefbbc9473c9c932fdb616854 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 3bee53ff9d245b5eca03782a4fc5b3d9b1fa933e..4fb83a48819f61328eda004475e039c1993d5ca4 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 19980f879a5a0b9005ec9409bb1838c86bc78fe1..ca108d499acb6403478304cbedc1f0bc268e1517 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 edc585781498e45913f3b4d8342a3f75b4da945d..f97ae89a7c10706541e03e678f24c04787e3b887 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 caef9bfceacd04bbff94197ca1c98d641694ba4e..d46e773b7327cbae5409ac8eb3df5099fcb799db 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 82af202d38bbf389a0cd555fccf1decc2b5b31fd..9c4e03463f7362ee7cb850688075f6499d40cb1f 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 866e75359354c9bb2f60e1375c1b614b3ff7c48d..6a0f3a0a7dc3e919130757364e98be5db2482218 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 e225e6fb4e3ccbc20560d808bc19317e6c589bf4..8c271a14db41f95e4bd94ebccc36877994b860f5 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 f503ff1340f39e7ea3aa3e592a0880486a3855ff..bddb93aba6c8e5697ee15c54bd5d67555ef1fed2 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 d8ec2f59321e5f408ec526879cd65690d5143e3c..919bb317abd98d5065e3d67fa79ee3afbc1c9af4 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 d822d4b65e729b59b859cb22271fa093f5d68b78..db9f65839506ba2ad67c4b891a2e6e2ded8a0bae 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 70e8acf66672508c289bc9b1d5b9a1beed953c83..42a00c8059e0c4033ba5c54b885995dc9f9f3243 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 9a6be9fa0448c4705a8c382137ca11bec86b999b..9b857302c11f94016998624b7179158313de7ae7 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 4621928b9638a87e3752a4d99eedf88b4b2d7d2a..e8c300c6006254f6363d5748c8fc314fa83e7528 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 8ac704f0727158b75c177a60eff995beb0ff6ac4..973a2824e07c01a8131f91bc70a705be40f1c68a 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 6b2e9d34167540264f8ab2573b1037deff584452..1d385e560d644f7328ed2ce492ac85a54f4a4f0e 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 56ad229954743e3719088985e4eecc15be726919..a600f841f3781f0b1fb59210f911f458090e7e92 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 c4a2f8aa79c69d5145438a9182fd6737821e1443..bcccef45487fe6b1c4e548825193dba2fb229fe8 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 3552c0f9b490298b5221cfed484f7496ab0e3ffe..44950872c225f6da40dcf2b578d59e5395479f25 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 b4133890fb2b6be1560e33544c478cdcca8e9c92..518c8e1b73052363197a12bcf0dab7781af32872 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 8c3749ff5eb8564a07603d94acdcd9df679e5600..f8f4740b542b52692b9ea601cd2c1cc353ab02a8 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 f201beac4fdc5c165973eefb9fd76a68e7a81b34..130c26a781d2f3856391cb69ee5abce0073f6c6d 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 2865bb0f0167567f4aed1c902498803f8cde7013..5f5200aab34528a3ae0a20cb0a62ce5447dadc0f 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 af77baa6ea83866bdb82e3bba833eecb95ec112c..6c2c448241ea3de3323901cb9e5d624cf30cf18b 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 0fb800a5338bb2034c7cdc7c6f0543d4ed5fdb3f..3460739f4f82c6b19606e5164a83ecd7e4d4bacb 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 4f4c073a03446cff13c0377e1042dfaee9eb227e..1719016c590df6a3c7e07759e19a031ac8f753f4 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 01aac80a2b15d036b42b6fc0044f6d7bc7f10c55..b1e97e676e46dcecd1948231557d9e4d8ff94df6 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 efb97dade23e6b98b5abecb3ba5b495893ad9e0a..c6bf0845ebce135ce2f67658b2e6423ef49888b1 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 aaad622ea4fb9e9feeafd13c8964c63cdcddf3ca..5c9506925cf1e5d75cca81340b404889d2ad644b 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 4811e4e4c18454cc8b4eca3637e49e2092e352a8..60072084c7b9533124f6f04639010f8eabb6841c 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 0e3cce643b675add322ff8361fe55595c5886a8f..e20a750330e28924abe77b68d5d3797f2d526d08 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 3758b1332789b5cbfaa59ea5efe5aa96cf1abab2..de6054cfa8952c4c2e43f8f6f25f316b01b77f3a 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 b945129c474a95e83b1052f204b1c57380bb575c..b54a45b888a808ed0bd6309114f79b5f963e3b7f 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 ab8f87c5a88c80b6eebd8c726707f9eb15a7e22f..48de83d5ef2fb77b3552e6021a0bc2fbd9dc8766 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 1d6444557eed41c26a2673b80e9b6cfd63078dc0..7cdcafdf7fb998280d308535b5c603cd77acdf5f 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 9f1e5a7eb67b633e56e67268da701357f64327f0..2b586823851f6639183e6694c75f9acd177e157a 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 d3ec41eb293f5d8409bd72a61b80eb6a2db01a69..5d4c17ac9baf505e15340a30899ad16e0e8f6841 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 3e1044d9a73e118ae39ee08d9d03640a31a34578..4010db3f6bf3c60d8e6457164307502590855c8a 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 3dcdf9f37353b32cbbef8ae42061e286b877f0b2..2c4138dbc7c6dbaaea96da4041d2fe6fd0c0eb4c 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 82ba9e515d5c3f014f48c8f62e0d0b3f4d14a01e..e221d279e6f1681e9a79da41d0a43652fa760a14 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 e7f6a5879a07f3d0ce22637596b3c06893f9c6a5..34648b4bb00567f30a8ebddf150eea6be07b8955 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 b43a71aa72138315b038864f78873790af1bd545..d35a1347d771d8a49875965e01f0f8b077c29986 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 be2a2091c3728c394b662b17a436e66ecfe21f53..661cda0c3220c219f014ec236a88465a6588efa1 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 db15d599dc46054e033b31d3dccbf550bfde1501..c1fb28fc1cf17f7df58f7c287393f13417e45c38 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 1d4d7a697b97592d234edb70058b7c2236902345..c3b3deb15f9507bd882270ddd94e7aec625db3a5 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 ebf486dc4b2d482f6ccee27ad45c94f7486561eb..86a216f24ccd05da8bd6b984e7aed15b89021c39 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 a67dbebe11065c0b7ad2c4e4e8fc5bbd633c8b6b..ac2276ebed0ee3176daa47f4bbc7700e680b05c8 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 9aeaf57be8934603173e1c1b93d9f5162cdc13db..dc1ee8e53f076f5ba3e67da9bec9c441673463bb 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 28181654174c776f3fada62930b05c959be9287b..2fcef19077f3f9dd571190b74df8c34e0a6abba8 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 486385565dadc742167948e855692b74a56289c9..130719f47e5a2fb3b6286a29df3384b71a4f7735 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 0c6043a7c7e8f6fc64b247d50354dfbdda68a7df..bdc86ca3e13d2b2c77e89125eb7516f1629c83f0 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 3a9c280c8a580b63259be40bce721c88fb390a22..dd1711cfce215ef09a34a32a0a0b592837cf33dd 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 00ce472d66379fa2fab0f7367f87261830d082f7..149886cca52d6c17811006f3b8d4a5a4bd854d34 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 968f830978226bdf4c614e37a497cd69a6f48652..645390288b05270e2929866e561b1031cb8e0eac 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 d04dc6fad445e2bb71505f4e42560778b6bccb9f..3144427f498fc095064b6248f5417bc5ef17e9fb 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 864c280a3dd36420c29a136275eaff54b82ba49b..c24692e61dec5b69883d8281c37b68313ba6cdcf 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 514f311472a8a362b6ec08a09b397dab18a10857..57b93461b6cf5acd2baf207d7feb2be8de7fe112 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 1dd9e707206c3e1e8d841be77e8d9a4715a6353f..a084ac6c332562a860b0084dc683e89a1d52842c 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 c1e3a6af8f82b8e18cd686710e8233b7d1ba3391..353e7b005da352a5155bf7b0ab8c35d6ed98000f 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 88267dd53f5eed70654fdf5c0889f8efb0c0ef81..277d7fce0cac3a60aa6756001672e668f31be189 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 2e8c9b980c68067515293069b032df754ca7c8b1..15dbb1b9911255a80324ada16d9434380a4429ff 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 67ceeb9e543249c4056b7da063c9fd846e770f7c..874619cce5516a446d5b79d4ae9aa56a234232ca 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 25e975dbf571c33ca30c5473b948bf34d733c0a8..b1604a94f126d8cd52580bc731c7c40e777aedd6 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 c940ff641b04c13edca9f02135f53763d71aee6d..2d09e0d6b2a09a70e468a9fdc5a9497111555be5 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 a7040dac41b73e24783edb0ae0c4e7d912d8dd8c..7ccf80f981149d76284411a24e733aa6a6fbf0bf 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 19145a7cd9748d6e3860db950719fda621c7d8dd..413e650c7bc0749602a1fa0fe9b6d43e9333c862 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 f639cc6c8b6c5af9eb348397af132a034edce485..2a8fbc31c3d6d74f3e2ae8cd81760104756c7a33 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 8581edc6275e3e16fb5dc61193dae0010a5457fb..b94f0a19f5c0be942dc45d3c67a96608f546d46f 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 22f1e623f1c8a77b0dc7fa592aa93cdd6a7f9629..d39a7af22912d56e077674740322c459a324a4ed 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 4c0fd1a69f86b8e024a10566e4b1442342e0c63e..5876f889a065a1f165c269a5ac052b3fccb7a192 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 39a12ee93fd98159b1e5efb2a797626bbd2d3e75..12475d221b1cc98d02fba1aa8a245a472d41ef51 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 98e8c9198a9dd10ac27d8f6e558f01c14311af3c..45dcca1f97fc7b7f48fcdd852691f40a4c2734d3 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 d9147a9a9e92cd37f1e5ae452e3100be99e6a154..46d5bf363e9f630c3551c8df05c99a0c33c51a2d 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 ff102b531175d02394200b8d4e74c076fda2ef4f..01a6ccdf95fa3137cd35e5b4d89c5806a9e08396 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 e5c6a830a71261f4a9e2a4ad26ba703982ff02b0..8eeb1e3e8e6f34e7ac19b1abbd017b445984a291 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 20b4e1037fe1929c329204e7db98265376a378b3..2f9c597be651c49eadb5524065cae9a350bc0f04 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 cbb0db1598a2aec0597a4843b5a868187dc8821b..e64cb795b2d78bd44dba6de528a903c464f932f2 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 aa8e2b774707934028e8603d747b564cdb5aa9d8..1236a6453706a6a2669dce681aef3e1663c41d78 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 d5593d50bda9ed86a70d99e0d1b85f8ee7bc9c75..788b60f21d18f3a2abf71b000bce7425dd056b8c 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 da0b618d2604f3c04793d2515230de8d6356dfe7..1f9cd30dd2dbd43f1b0b7166de11d19ec191d9e7 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 167c1d7d31b2d2d5d1c1b431a9042e3aa2429da2..c55a526fc1d896461dc9d31e6c9bdcd785ebc399 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 bedd11a12b0960e5b8110c0b7949079c7fd54fb7..e32fdf077bf7aeb93cdd64ef204254e6d1d159a8 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 28fa74a737b697723ee9a7f529b2fa58c467e5b7..4177608c2713efd66ba8ff6eb7771d69e5854e4f 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 1f01f4fee7a6cdf9bfd6cfefc2a291a04a5db0c1..1bf543347b85173211e64e6bc6c19519dfb0acee 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 ff4a9d4b1b903b97475199c1440aeaf11f7e4f3d..f880d780666e2c9fde8584f45b0a7bce5ed8ff6e 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 1925317b375783c0dcb3152b06f3f1aa4e0b1f5b..20b8bd8232b987074511fc74cf870d41aacc8507 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 f5fe9fff92dd03ae0b9f1f751800856f6c054356..b4cc9af0ff0ba0ae99c551ba80cd56b40109e4af 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 3b3e47ed364ec4c2d555a0b4ebcfa36970525e3f..20d03c8058263bbd4892226c3c01217c17084cef 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 4fd9398881a28027e0d73c08243fc9b7306356fa..902b830f7d45f47dc5de3e0a87dfd000d48f90b7 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 a3e9704d7c3d55fb0cf6b656f3e153d1f48d7631..fd1bbf83688b5b9fb609bfcaa25119c5061058a7 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 f3bc7bac50f370ab43c40eb807c8f2cfadd51ae7..9196019fbd9b388cd344e42264d6b05a4245678d 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 1a0765c72e121cfea947cf161ad79f9f8fb8e4cf..9cdcbb8deab1fb60b3a58566be8015ef5bdfa3ca 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 004792b8730673262a1b1d60e96e9dc4640eb672..084109069d5091f71c11db7422f35d0f95af049e 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 f1de4f18777beff09e8f198616c60bb3e710fd28..fcb323e693009040df09e906dbd559ef94b1350e 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 f5a480126ecb3cc65b5e1465acb67e207054960a..9633f60ba14104ab955a9574388c32347e81c9f6 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 3036157e9d7fb56250dea0d3997870775fbf4906..3474c4a05f2aa777e3ad33ab40acd887dfd25a13 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 6152a93b795c0925cb64ee60609de3a1d0f61213..152a51c386459f47e3fd957b7bc0f09b5bf37459 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 dcaf7cf89d09e9cd05a7610c54fca99ae728a4ef..91a43b06d41371fb0626c56b3fd9906395fad9a3 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 9a720f4e070403674c821802ed14954257cc8ad0..fcd50c12f4bf28a6bd4d118594de476fb6dacd8b 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 d4a321be4576064166b7e13c9d91c5ff5365730e..e4bb7d1ce839c4ed82f271acc1cdd7e85ebf26fa 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 e8ebd7dea098bb38ed2e791c4be3f734275da6e8..fe9d0d616e0c32bd737c0fe68935e196e738e9ca 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 762e61af9b29f2b5f054c314c4ddd3fd055c1347..4d06d8437cd610cca1e8c92f08df7446b822aa9b 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 93cddaabf82809005a7c84493078bd2dd640673e..d151bb6fa28ab93d035120a64e70854911e39501 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 8729f947248e225788056862793d39559b04ad63..7984626a78815967e517c981dcd05f7ac1ab1dc9 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 f5fd07e04da19707c525a860940fed4ef2989081..1c0d17a7bce7b917bd1c8b616c8a105435f3e49f 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 7d925fbb1c030a8bf3b3b4526832e37defb9eba2..76edcd317650deb716d0e23353116bbdb78e9b3b 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 543d5e4f4c60047ed764e5daf0fa8ecc75de7e44..3b40172633aeff2a77d7297528f4c96ac597322b 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 073b01d94c7cf79eae244433a11fc953a8e3db13..f78e88939e5cc69bbd97a961086ded8aedd2abde 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 219abf1296372e6068c25462b6f50c81fcde77d8..d080780f93f032ef77117d30e958e1842b525050 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 a86379d5b6935edc1e07b95f266cbe34e7b83874..7935a1cc49823e16ea39fc1d5b64f2cd3cfe3419 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 007421cd3db60258091416abbf6a053336f5f729..bf6f53cee39b5086fb1ec8d285931d9c4d438c64 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 bb0934a66e4be6df7d712ff7cfcba854545dcdb9..6606f243acc663f61bbe93e31f372de156ecc222 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 f3ef9a4bf9c2573fe87cb1de7879043e10f6011f..ec5945d2b798352cdf2b6007d20adb6854ca4dff 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 cc31702be5ab98d260d2400e24ae13c04fd715ff..eef60ee5624e20d475682e79bf4f26b5b72b34e3 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 ed7f8713582762f5be256cbbeb968cd0e0dd575e..29ec0ff10525f780bd724bba5efe1d219b7acdf4 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 fd3c730f41d5f9cccf9c88d193dfad2e03314d66..641c25366c80f5b89eb5f8e99c0a3b0882d1f1c6 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 e07796c8841067fd6f004266d8580a301d88f937..28fae357951e75326a95bc74dab460babf6fc7f5 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 561a2c42d2dc88fa38a1190956f112f55f16870c..3e9f8622fba2167fcfd27fd06f3142748faa389e 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 220c32dc74a2f393b1ee6721ad150bf3b638d1b4..d2d9e6dd387718d8e69121f8bf63e2dd2818afb4 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 0fd14f2b9d6234b773ae0eb672eb577c27832669..9c0d96c859d4f9883899a11f2257e083779a7b17 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 1eea659625d086c87948907a71e50cff4db3b922..149be98c271905564acb2a8f2274442a5305e578 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 a240f229739f241caadc7dc6ad39382f8b32b451..90c1ffd562f4016c3f0ec6e913ec37420f7c50ae 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 c5969e5f962a04718ecaef0978ba7a9bf780e4f0..451d93ca813d4ea9bb047fef896ff24ac4df4b6b 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 75486ccd6707421963ca4b351f9d1ee9582c3b7e..90c1ffd562f4016c3f0ec6e913ec37420f7c50ae 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 c5969e5f962a04718ecaef0978ba7a9bf780e4f0..451d93ca813d4ea9bb047fef896ff24ac4df4b6b 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 75486ccd6707421963ca4b351f9d1ee9582c3b7e..90c1ffd562f4016c3f0ec6e913ec37420f7c50ae 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 0ee436deb252beab5c094118d00b65f4916c4433..4375a9f3677e9f5f99b111ca8a85ad6cb2be3f1b 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 9e9522121916030430a27b3f0f67ca09565d8fb4..9a0c03d58db3b81157d106028d97a825a2c97447 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 8c09f70a5c2be0a01ae8b292528ae4c88b7739b0..9f7174b790d60c7fc8b7b6d8fe1c52475725b61f 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 c99fc16cac4461c9dde042fd2170c3865a7afe7a..2c32a5ec6274b3c30916a25fc716791ec26adba7 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. ** ***************************************************************************/