diff --git a/LGPL_EXCEPTION.TXT b/LGPL_EXCEPTION.TXT index a54c00e44a44aced8810ddf967aabb1da19b6d6d..add80b93182aa3fa2ffd0ae076cccf72ad11e910 100644 --- a/LGPL_EXCEPTION.TXT +++ b/LGPL_EXCEPTION.TXT @@ -1,4 +1,4 @@ -Nokia Qt LGPL Exception version 1.1 +Digia Qt LGPL Exception version 1.1 As an additional permission to the GNU Lesser General Public License version 2.1, the object code form of a "work that uses the Library" may incorporate diff --git a/README b/README index f878a256bb998672fd3cfee0408603287ee4ef49..b366ad1c1c2db444650ae793f9f25c2cf18d9c13 100644 --- a/README +++ b/README @@ -37,7 +37,7 @@ Compiling Qt Quick Designer Qt Quick Designer (QmlDesigner plugin) depends on "private" headers from Qt 4.8.0, specifically from the QtDeclarative module. These private headers always -end with an "_p.h". Nokia does not promise to keep these files or APIs binary +end with an "_p.h". Digia does not promise to keep these files or APIs binary or source compatible between releases. This means that when compiled, the plugin has a dependency to the exact Qt version it was compiled with. Running Qt Creator with the plugin against updated Qt libraries (also for patch @@ -250,7 +250,7 @@ we thank the authors who made this possible: * ClassView and ImageViewer plugins - Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). + Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). All rights reserved. Copyright (c) 2010 Denis Mingulov. @@ -270,7 +270,7 @@ we thank the authors who made this possible: notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor + * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/dist/copyright_template.txt b/dist/copyright_template.txt index dc469cfb88cdf910aa7054427760d6b9486e1446..024ea3c0fa1cf7d12a5d532d9845533b6474287b 100644 --- a/dist/copyright_template.txt +++ b/dist/copyright_template.txt @@ -1,30 +1,29 @@ -/************************************************************************** +/**************************************************************************** ** -** This file is part of Qt Creator +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator. ** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. ** ** GNU Lesser General Public License Usage -** -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this file. -** Please review the following information to ensure the GNU Lesser General -** Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -**************************************************************************/ +****************************************************************************/ diff --git a/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/installscript.qs b/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/installscript.qs index 33436bbbb166d4c35dcafc5ed52f8f97110dbec7..d2c73835d9b66a57b83934c01b584304939002c6 100644 --- a/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/installscript.qs +++ b/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/installscript.qs @@ -1,21 +1,31 @@ -/* This file is part of the Qt SDK - -Copyright (c) 2008-2012 Nokia Corporation and/or its subsidiary(-ies). -All rights reserved. - -Contact: Nokia Corporation (qt-info@nokia.com) - -GNU Lesser General Public License Usage -This file may be used under the terms of the GNU Lesser General Public -License version 2.1 as published by the Free Software Foundation and -appearing in the file LICENSE.LGPL included in the packaging of this file. -Please review the following information to ensure the GNU Lesser General -Public License version 2.1 requirements will be met: -http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - -If you have questions regarding the use of this file, please contact Nokia -at qt-info@nokia.com. -*/ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the Qt SDK. +** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +****************************************************************************/ // constructor function Component() diff --git a/doc/addressbook-sdk.qdoc b/doc/addressbook-sdk.qdoc index 6ce2530815c90c5442ed0d2cf4432819f5d61300..ca939fb968c749a48fd725e38213a0f002443405 100644 --- a/doc/addressbook-sdk.qdoc +++ b/doc/addressbook-sdk.qdoc @@ -1,10 +1,9 @@ /************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/api/coding-style.qdoc b/doc/api/coding-style.qdoc index 681f3e3a4de97474c8307ce94cebeb2ad8cb2133..ccac8f3aa3c3d87483593a1dc2728b926476d5bf 100644 --- a/doc/api/coding-style.qdoc +++ b/doc/api/coding-style.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/api/creating-plugins.qdoc b/doc/api/creating-plugins.qdoc index 8acf900596e3ad4ed70504b2b452a6a47542e5d2..f762000b7ccf74f774a804059f18b87c5c49e915 100644 --- a/doc/api/creating-plugins.qdoc +++ b/doc/api/creating-plugins.qdoc @@ -1,10 +1,9 @@ -/**************************************************************************** +/************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** This file is part of Qt Creator ** ** ** GNU Free Documentation License @@ -14,10 +13,8 @@ ** Foundation and appearing in the file included in the packaging of this ** file. ** -** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. ** -****************************************************************************/ +**************************************************************************/ /*! \page creating-plugins.html diff --git a/doc/api/external-tool-spec.qdoc b/doc/api/external-tool-spec.qdoc index f22e5f590c3ee79c73bb1ad60c01eb133dacba9e..0926f34baa186079d397a98e4df59ccc1020800a 100644 --- a/doc/api/external-tool-spec.qdoc +++ b/doc/api/external-tool-spec.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/api/first-plugin.qdoc b/doc/api/first-plugin.qdoc index e2f9162f14a59992267972a7d9404d538a320f1f..1a2dc423ffc477225b3714c3795adfebe0f7969b 100644 --- a/doc/api/first-plugin.qdoc +++ b/doc/api/first-plugin.qdoc @@ -1,10 +1,9 @@ -/**************************************************************************** +/************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** This file is part of Qt Creator ** ** ** GNU Free Documentation License @@ -14,10 +13,8 @@ ** Foundation and appearing in the file included in the packaging of this ** file. ** -** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. ** -****************************************************************************/ +**************************************************************************/ /*! \page first-plugin.html diff --git a/doc/api/getting-and-building.qdoc b/doc/api/getting-and-building.qdoc index ea45d62882522e3cccb32959db61c60830149c56..f15a99af14cea3939ceab3e6626db972d98f85c6 100644 --- a/doc/api/getting-and-building.qdoc +++ b/doc/api/getting-and-building.qdoc @@ -1,10 +1,9 @@ -/**************************************************************************** +/************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** This file is part of Qt Creator ** ** ** GNU Free Documentation License @@ -14,10 +13,8 @@ ** Foundation and appearing in the file included in the packaging of this ** file. ** -** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. ** -****************************************************************************/ +**************************************************************************/ /*! \page getting-and-building.html diff --git a/doc/api/plugin-lifecycle.qdoc b/doc/api/plugin-lifecycle.qdoc index 8c0e0c15ecc5e0ad0e1015bc8ae82e3a237f7fcd..2f7c80dec69b2156b38242dac54bf9969f3a40d6 100644 --- a/doc/api/plugin-lifecycle.qdoc +++ b/doc/api/plugin-lifecycle.qdoc @@ -1,10 +1,9 @@ -/**************************************************************************** +/************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** This file is part of Qt Creator ** ** ** GNU Free Documentation License @@ -14,10 +13,8 @@ ** Foundation and appearing in the file included in the packaging of this ** file. ** -** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. ** -****************************************************************************/ +**************************************************************************/ /*! \page plugin-lifecycle.html diff --git a/doc/api/plugin-specifications.qdoc b/doc/api/plugin-specifications.qdoc index 94821d69047984be99fa528454d76b02a69575f2..db2f43a77d9c696f4bd76110ebd5b2ac2f12a546 100644 --- a/doc/api/plugin-specifications.qdoc +++ b/doc/api/plugin-specifications.qdoc @@ -1,10 +1,9 @@ -/**************************************************************************** +/************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** This file is part of Qt Creator ** ** ** GNU Free Documentation License @@ -14,10 +13,8 @@ ** Foundation and appearing in the file included in the packaging of this ** file. ** -** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. ** -****************************************************************************/ +**************************************************************************/ /*! \page plugin-specifications.html diff --git a/doc/api/qtcreator-api.qdoc b/doc/api/qtcreator-api.qdoc index 54d7a29cb62a6e72ff28d2f4f456f039f14e9544..aaf83daa98232c3d6a0aa4b5e707f6c9dcd99fbd 100644 --- a/doc/api/qtcreator-api.qdoc +++ b/doc/api/qtcreator-api.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/api/qtcreator-dev-wizards.qdoc b/doc/api/qtcreator-dev-wizards.qdoc index 995b75e07f6215aef2f492e997c4a44b7b00b6e3..ba0f2f721eae27250742b6b6ff24b4cbdc05e0d3 100644 --- a/doc/api/qtcreator-dev-wizards.qdoc +++ b/doc/api/qtcreator-dev-wizards.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/api/qtcreator-dev.qdoc b/doc/api/qtcreator-dev.qdoc index a042ce3746fe4de61cb8a09dd943bde38dbdf141..493b70ad54e22b3e13f29c480ce0bce760019a32 100644 --- a/doc/api/qtcreator-dev.qdoc +++ b/doc/api/qtcreator-dev.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/api/qtcreator-documentation.qdoc b/doc/api/qtcreator-documentation.qdoc index eb2b780a1d0d2d66a6b38c7b4af43b410d3e0076..4f28c3ec2e69415cd0efe8ff74d2eee39602d1b7 100644 --- a/doc/api/qtcreator-documentation.qdoc +++ b/doc/api/qtcreator-documentation.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/api/qtcreator-ui-text.qdoc b/doc/api/qtcreator-ui-text.qdoc index c865ad161e9472f65d02838bb918046a984b8243..e596df1c8a5b22c55f209cf25f98795a895b3bbb 100644 --- a/doc/api/qtcreator-ui-text.qdoc +++ b/doc/api/qtcreator-ui-text.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/config/qt-html-templates-online.qdocconf b/doc/config/qt-html-templates-online.qdocconf index 91c5e5c0bbdc161f2e7839c66c5817c8bca26c74..4e5732b9d75183d8f3d20ed0cea74623e22a8f2f 100644 --- a/doc/config/qt-html-templates-online.qdocconf +++ b/doc/config/qt-html-templates-online.qdocconf @@ -106,7 +106,7 @@ HTML.footer = \ "
\n" \ "
\n" \ - " © 2012 Nokia Corporation and/or its\n" \ + " © 2012 Digia Plc and/or its\n" \ " subsidiaries. Documentation contributions included herein are the copyrights of\n" \ " their respective owners.
\n" \ "\n" \ - " Nokia, Qt and their respective logos are trademarks of Nokia Corporation \n" \ + " Digia, Qt and their respective logos are trademarks of Digia Plc \n" \ " in Finland and/or other countries worldwide. All other trademarks are property\n" \ " of their respective owners. Privacy Policy
\n" \ diff --git a/doc/config/qt-html-templates.qdocconf b/doc/config/qt-html-templates.qdocconf index c812684d18c7146d810e076bffaee4000b2af1bd..358c0f118487b9ccda18b1e41723055e2b0de297 100644 --- a/doc/config/qt-html-templates.qdocconf +++ b/doc/config/qt-html-templates.qdocconf @@ -24,7 +24,7 @@ HTML.footer = \ "\n" \ - " © 2012 Nokia Corporation and/or its\n" \ + " © 2012 Digia Plc and/or its\n" \ " subsidiaries. Documentation contributions included herein are the copyrights of\n" \ " their respective owners.
\n" \ "\n" \ - " Nokia, Qt and their respective logos are trademarks of Nokia Corporation \n" \ + " Digia, Qt and their respective logos are trademarks of Digia Plc \n" \ " in Finland and/or other countries worldwide. All other trademarks are property\n" \ " of their respective owners. Privacy Policy
\n" \ diff --git a/doc/examples/addressbook-sdk/part1/addressbook.cpp b/doc/examples/addressbook-sdk/part1/addressbook.cpp index c3f2087389bd8e9e89fde3083703da9be17af1d8..cea6b1efd5f758cf3f5e231529619085ca7ed872 100644 --- a/doc/examples/addressbook-sdk/part1/addressbook.cpp +++ b/doc/examples/addressbook-sdk/part1/addressbook.cpp @@ -1,10 +1,9 @@ /************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** You may use this file under the terms of the BSD license as follows: ** @@ -17,7 +16,7 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor ** the names of its contributors may be used to endorse or promote ** products derived from this software without specific prior written ** permission. diff --git a/doc/examples/addressbook-sdk/part1/addressbook.h b/doc/examples/addressbook-sdk/part1/addressbook.h index 933293c49775968c7401427c5036460100ecaf44..d1773f4a4409dfeb95ba77fb05fa4cc32341acdc 100644 --- a/doc/examples/addressbook-sdk/part1/addressbook.h +++ b/doc/examples/addressbook-sdk/part1/addressbook.h @@ -1,10 +1,9 @@ /************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** You may use this file under the terms of the BSD license as follows: ** @@ -17,7 +16,7 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor ** the names of its contributors may be used to endorse or promote ** products derived from this software without specific prior written ** permission. diff --git a/doc/examples/addressbook-sdk/part1/main.cpp b/doc/examples/addressbook-sdk/part1/main.cpp index d48d0ebbc5e98af76f157888589ce05a88d5594a..67907558082cc836c6cc2506ff1c480d1c2357b0 100644 --- a/doc/examples/addressbook-sdk/part1/main.cpp +++ b/doc/examples/addressbook-sdk/part1/main.cpp @@ -1,10 +1,9 @@ /************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** You may use this file under the terms of the BSD license as follows: ** @@ -17,7 +16,7 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor ** the names of its contributors may be used to endorse or promote ** products derived from this software without specific prior written ** permission. diff --git a/doc/examples/addressbook-sdk/part2/addressbook.cpp b/doc/examples/addressbook-sdk/part2/addressbook.cpp index bf12d9f817d6b3598dd4bfe95f235815543457f6..1672ab20dcfe8e517bffb8cc0583981dd53d78b7 100644 --- a/doc/examples/addressbook-sdk/part2/addressbook.cpp +++ b/doc/examples/addressbook-sdk/part2/addressbook.cpp @@ -1,10 +1,9 @@ /************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** You may use this file under the terms of the BSD license as follows: ** @@ -17,7 +16,7 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor ** the names of its contributors may be used to endorse or promote ** products derived from this software without specific prior written ** permission. diff --git a/doc/examples/addressbook-sdk/part2/addressbook.h b/doc/examples/addressbook-sdk/part2/addressbook.h index c8e554ca0d2d345b0b4db75cdf9f086ec693ee31..381755b9ba169d5d8e3f9fe64258131b70e595c3 100644 --- a/doc/examples/addressbook-sdk/part2/addressbook.h +++ b/doc/examples/addressbook-sdk/part2/addressbook.h @@ -1,10 +1,9 @@ /************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** You may use this file under the terms of the BSD license as follows: ** @@ -17,7 +16,7 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor ** the names of its contributors may be used to endorse or promote ** products derived from this software without specific prior written ** permission. diff --git a/doc/examples/addressbook-sdk/part2/main.cpp b/doc/examples/addressbook-sdk/part2/main.cpp index d48d0ebbc5e98af76f157888589ce05a88d5594a..67907558082cc836c6cc2506ff1c480d1c2357b0 100644 --- a/doc/examples/addressbook-sdk/part2/main.cpp +++ b/doc/examples/addressbook-sdk/part2/main.cpp @@ -1,10 +1,9 @@ /************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** You may use this file under the terms of the BSD license as follows: ** @@ -17,7 +16,7 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor ** the names of its contributors may be used to endorse or promote ** products derived from this software without specific prior written ** permission. diff --git a/doc/examples/addressbook-sdk/part3/addressbook.cpp b/doc/examples/addressbook-sdk/part3/addressbook.cpp index eb882859bb2eb9ed9461b284c42ef7c0e0adf8c9..851e702f71c51a35862f43c831c6ece7c69babc1 100644 --- a/doc/examples/addressbook-sdk/part3/addressbook.cpp +++ b/doc/examples/addressbook-sdk/part3/addressbook.cpp @@ -1,10 +1,9 @@ /************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** You may use this file under the terms of the BSD license as follows: ** @@ -17,7 +16,7 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor ** the names of its contributors may be used to endorse or promote ** products derived from this software without specific prior written ** permission. @@ -189,4 +188,3 @@ void AddressBook::previous() ui->addressText->setText(i.value()); } //! [previous] - diff --git a/doc/examples/addressbook-sdk/part3/addressbook.h b/doc/examples/addressbook-sdk/part3/addressbook.h index 60aea2d99a4d8cd45f0eb98f644f2faa9df9cb90..68742bca06a26e12a28d02f429f373e091c54fc0 100644 --- a/doc/examples/addressbook-sdk/part3/addressbook.h +++ b/doc/examples/addressbook-sdk/part3/addressbook.h @@ -1,10 +1,9 @@ /************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** You may use this file under the terms of the BSD license as follows: ** @@ -17,7 +16,7 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor ** the names of its contributors may be used to endorse or promote ** products derived from this software without specific prior written ** permission. diff --git a/doc/examples/addressbook-sdk/part3/main.cpp b/doc/examples/addressbook-sdk/part3/main.cpp index 36e01df9e9ee4d7c216f31cec1c0256f825edc69..588e9ccfe61b490ba439a3e454b7c1081fcfbbf8 100644 --- a/doc/examples/addressbook-sdk/part3/main.cpp +++ b/doc/examples/addressbook-sdk/part3/main.cpp @@ -1,10 +1,9 @@ /************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** You may use this file under the terms of the BSD license as follows: ** @@ -17,7 +16,7 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor ** the names of its contributors may be used to endorse or promote ** products derived from this software without specific prior written ** permission. diff --git a/doc/examples/addressbook-sdk/part4/addressbook.cpp b/doc/examples/addressbook-sdk/part4/addressbook.cpp index ff707faa61c79117019d92d8eff792da4a52ca3c..5733b8890fe38f6c90badb8febd37a9245012958 100644 --- a/doc/examples/addressbook-sdk/part4/addressbook.cpp +++ b/doc/examples/addressbook-sdk/part4/addressbook.cpp @@ -1,10 +1,9 @@ /************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** You may use this file under the terms of the BSD license as follows: ** @@ -17,7 +16,7 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor ** the names of its contributors may be used to endorse or promote ** products derived from this software without specific prior written ** permission. diff --git a/doc/examples/addressbook-sdk/part4/addressbook.h b/doc/examples/addressbook-sdk/part4/addressbook.h index 284b5e49f7355776718b11194eb2a92953a27999..c3f03ee4f6c05de329e74accba0fabe93129cf19 100644 --- a/doc/examples/addressbook-sdk/part4/addressbook.h +++ b/doc/examples/addressbook-sdk/part4/addressbook.h @@ -1,10 +1,9 @@ /************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** You may use this file under the terms of the BSD license as follows: ** @@ -17,7 +16,7 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor ** the names of its contributors may be used to endorse or promote ** products derived from this software without specific prior written ** permission. diff --git a/doc/examples/addressbook-sdk/part4/main.cpp b/doc/examples/addressbook-sdk/part4/main.cpp index 36e01df9e9ee4d7c216f31cec1c0256f825edc69..588e9ccfe61b490ba439a3e454b7c1081fcfbbf8 100644 --- a/doc/examples/addressbook-sdk/part4/main.cpp +++ b/doc/examples/addressbook-sdk/part4/main.cpp @@ -1,10 +1,9 @@ /************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** You may use this file under the terms of the BSD license as follows: ** @@ -17,7 +16,7 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor ** the names of its contributors may be used to endorse or promote ** products derived from this software without specific prior written ** permission. diff --git a/doc/examples/addressbook-sdk/part5/addressbook.cpp b/doc/examples/addressbook-sdk/part5/addressbook.cpp index df11b883394a4ed9070d5bf0690c87ad6c6cf178..e2c0fa33e79ae0285bb9c252e89a5d630024d981 100644 --- a/doc/examples/addressbook-sdk/part5/addressbook.cpp +++ b/doc/examples/addressbook-sdk/part5/addressbook.cpp @@ -1,10 +1,9 @@ /************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** You may use this file under the terms of the BSD license as follows: ** @@ -17,7 +16,7 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor ** the names of its contributors may be used to endorse or promote ** products derived from this software without specific prior written ** permission. diff --git a/doc/examples/addressbook-sdk/part5/addressbook.h b/doc/examples/addressbook-sdk/part5/addressbook.h index 5ea0cf9ef5a734eb7214450c463833a85bb4284f..3290a1c1e16a5a6fe5db10399d118696da4bce3a 100644 --- a/doc/examples/addressbook-sdk/part5/addressbook.h +++ b/doc/examples/addressbook-sdk/part5/addressbook.h @@ -1,10 +1,9 @@ /************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** You may use this file under the terms of the BSD license as follows: ** @@ -17,7 +16,7 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor ** the names of its contributors may be used to endorse or promote ** products derived from this software without specific prior written ** permission. diff --git a/doc/examples/addressbook-sdk/part5/finddialog.cpp b/doc/examples/addressbook-sdk/part5/finddialog.cpp index f1276b8505960a68cb1d3e7f5e85c395d9c3ea4f..b935289ba7aa6d2f2bb5372e813fab3a9a20f48d 100644 --- a/doc/examples/addressbook-sdk/part5/finddialog.cpp +++ b/doc/examples/addressbook-sdk/part5/finddialog.cpp @@ -1,10 +1,9 @@ /************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** You may use this file under the terms of the BSD license as follows: ** @@ -17,7 +16,7 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor ** the names of its contributors may be used to endorse or promote ** products derived from this software without specific prior written ** permission. diff --git a/doc/examples/addressbook-sdk/part5/finddialog.h b/doc/examples/addressbook-sdk/part5/finddialog.h index f0f47e37c91e761058e201af4badc554184e04c4..4631ee2b94e76f4aa9d03703df669978a9e55b30 100644 --- a/doc/examples/addressbook-sdk/part5/finddialog.h +++ b/doc/examples/addressbook-sdk/part5/finddialog.h @@ -1,10 +1,9 @@ /************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** You may use this file under the terms of the BSD license as follows: ** @@ -17,7 +16,7 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor ** the names of its contributors may be used to endorse or promote ** products derived from this software without specific prior written ** permission. diff --git a/doc/examples/addressbook-sdk/part5/main.cpp b/doc/examples/addressbook-sdk/part5/main.cpp index 36e01df9e9ee4d7c216f31cec1c0256f825edc69..588e9ccfe61b490ba439a3e454b7c1081fcfbbf8 100644 --- a/doc/examples/addressbook-sdk/part5/main.cpp +++ b/doc/examples/addressbook-sdk/part5/main.cpp @@ -1,10 +1,9 @@ /************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** You may use this file under the terms of the BSD license as follows: ** @@ -17,7 +16,7 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor ** the names of its contributors may be used to endorse or promote ** products derived from this software without specific prior written ** permission. diff --git a/doc/examples/addressbook-sdk/part6/addressbook.cpp b/doc/examples/addressbook-sdk/part6/addressbook.cpp index ac57c02420b191b54478e28e515bc27142955e04..eefd213604869a5f211dbc5a691c0fac4d49e6ca 100644 --- a/doc/examples/addressbook-sdk/part6/addressbook.cpp +++ b/doc/examples/addressbook-sdk/part6/addressbook.cpp @@ -1,10 +1,9 @@ /************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** You may use this file under the terms of the BSD license as follows: ** @@ -17,7 +16,7 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor ** the names of its contributors may be used to endorse or promote ** products derived from this software without specific prior written ** permission. diff --git a/doc/examples/addressbook-sdk/part6/addressbook.h b/doc/examples/addressbook-sdk/part6/addressbook.h index 4684d412a5ff3f806c3ee07c8aedcd0f404a7154..42be7fac55acee09a252867b22d6d6bd0a2c37c6 100644 --- a/doc/examples/addressbook-sdk/part6/addressbook.h +++ b/doc/examples/addressbook-sdk/part6/addressbook.h @@ -1,10 +1,9 @@ /************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** You may use this file under the terms of the BSD license as follows: ** @@ -17,7 +16,7 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor ** the names of its contributors may be used to endorse or promote ** products derived from this software without specific prior written ** permission. diff --git a/doc/examples/addressbook-sdk/part6/finddialog.cpp b/doc/examples/addressbook-sdk/part6/finddialog.cpp index 40f6bed37f4c605eab2aaa0998fbfa48cab81412..9b751b7cca2924f340c20d8ece18c4332b622592 100644 --- a/doc/examples/addressbook-sdk/part6/finddialog.cpp +++ b/doc/examples/addressbook-sdk/part6/finddialog.cpp @@ -1,10 +1,9 @@ /************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** You may use this file under the terms of the BSD license as follows: ** @@ -17,7 +16,7 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor ** the names of its contributors may be used to endorse or promote ** products derived from this software without specific prior written ** permission. diff --git a/doc/examples/addressbook-sdk/part6/finddialog.h b/doc/examples/addressbook-sdk/part6/finddialog.h index 92d9956224fb54e100db0065ad89a4479c5fc260..4876ae42f9394111f04f24a3415183253be2e88f 100644 --- a/doc/examples/addressbook-sdk/part6/finddialog.h +++ b/doc/examples/addressbook-sdk/part6/finddialog.h @@ -1,10 +1,9 @@ /************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** You may use this file under the terms of the BSD license as follows: ** @@ -17,7 +16,7 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor ** the names of its contributors may be used to endorse or promote ** products derived from this software without specific prior written ** permission. diff --git a/doc/examples/addressbook-sdk/part6/main.cpp b/doc/examples/addressbook-sdk/part6/main.cpp index 36e01df9e9ee4d7c216f31cec1c0256f825edc69..588e9ccfe61b490ba439a3e454b7c1081fcfbbf8 100644 --- a/doc/examples/addressbook-sdk/part6/main.cpp +++ b/doc/examples/addressbook-sdk/part6/main.cpp @@ -1,10 +1,9 @@ /************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** You may use this file under the terms of the BSD license as follows: ** @@ -17,7 +16,7 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor ** the names of its contributors may be used to endorse or promote ** products derived from this software without specific prior written ** permission. diff --git a/doc/examples/addressbook-sdk/part7/addressbook.cpp b/doc/examples/addressbook-sdk/part7/addressbook.cpp index 959277a5e911bec7d9e40b807ada2b5dfa450528..ead25215b45ca5fb31db9dc5b24f0ec3d23794c0 100644 --- a/doc/examples/addressbook-sdk/part7/addressbook.cpp +++ b/doc/examples/addressbook-sdk/part7/addressbook.cpp @@ -1,10 +1,9 @@ /************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** You may use this file under the terms of the BSD license as follows: ** @@ -17,7 +16,7 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor ** the names of its contributors may be used to endorse or promote ** products derived from this software without specific prior written ** permission. diff --git a/doc/examples/addressbook-sdk/part7/addressbook.h b/doc/examples/addressbook-sdk/part7/addressbook.h index 7741cfb4acd132472771b72abe7986e315d6d230..8b125bcd5718e344236a7962d6256b48b6ce3226 100644 --- a/doc/examples/addressbook-sdk/part7/addressbook.h +++ b/doc/examples/addressbook-sdk/part7/addressbook.h @@ -1,10 +1,9 @@ /************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** You may use this file under the terms of the BSD license as follows: ** @@ -17,7 +16,7 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor ** the names of its contributors may be used to endorse or promote ** products derived from this software without specific prior written ** permission. diff --git a/doc/examples/addressbook-sdk/part7/finddialog.cpp b/doc/examples/addressbook-sdk/part7/finddialog.cpp index 40f6bed37f4c605eab2aaa0998fbfa48cab81412..9b751b7cca2924f340c20d8ece18c4332b622592 100644 --- a/doc/examples/addressbook-sdk/part7/finddialog.cpp +++ b/doc/examples/addressbook-sdk/part7/finddialog.cpp @@ -1,10 +1,9 @@ /************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** You may use this file under the terms of the BSD license as follows: ** @@ -17,7 +16,7 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor ** the names of its contributors may be used to endorse or promote ** products derived from this software without specific prior written ** permission. diff --git a/doc/examples/addressbook-sdk/part7/finddialog.h b/doc/examples/addressbook-sdk/part7/finddialog.h index 92d9956224fb54e100db0065ad89a4479c5fc260..4876ae42f9394111f04f24a3415183253be2e88f 100644 --- a/doc/examples/addressbook-sdk/part7/finddialog.h +++ b/doc/examples/addressbook-sdk/part7/finddialog.h @@ -1,10 +1,9 @@ /************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** You may use this file under the terms of the BSD license as follows: ** @@ -17,7 +16,7 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor ** the names of its contributors may be used to endorse or promote ** products derived from this software without specific prior written ** permission. diff --git a/doc/examples/addressbook-sdk/part7/main.cpp b/doc/examples/addressbook-sdk/part7/main.cpp index 36e01df9e9ee4d7c216f31cec1c0256f825edc69..588e9ccfe61b490ba439a3e454b7c1081fcfbbf8 100644 --- a/doc/examples/addressbook-sdk/part7/main.cpp +++ b/doc/examples/addressbook-sdk/part7/main.cpp @@ -1,10 +1,9 @@ /************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** You may use this file under the terms of the BSD license as follows: ** @@ -17,7 +16,7 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor ** the names of its contributors may be used to endorse or promote ** products derived from this software without specific prior written ** permission. diff --git a/doc/examples/batterystatus/main.cpp b/doc/examples/batterystatus/main.cpp index b620de53136556d6f86cefa638f7549ca579ba07..e550ca9bc74f1a1a700f57b6a00cd084d54f923c 100644 --- a/doc/examples/batterystatus/main.cpp +++ b/doc/examples/batterystatus/main.cpp @@ -1,6 +1,6 @@ /*************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). ** All rights reserved. ** Contact: http://www.qt-project.org/ ** @@ -17,7 +17,7 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor ** the names of its contributors may be used to endorse or promote ** products derived from this software without specific prior written ** permission. diff --git a/doc/examples/doc_src_plugins.qdoc b/doc/examples/doc_src_plugins.qdoc index 1072c850ae8e2adcf2c7f50686211660be53adbf..ee2d618b0e804718e68f13cff2aacd649dd05448 100644 --- a/doc/examples/doc_src_plugins.qdoc +++ b/doc/examples/doc_src_plugins.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/examples/textfinder/main.cpp b/doc/examples/textfinder/main.cpp index f5a67e294fcc48aa188ab43d0ff144ca4f9fa1fb..b2926e7b8a4076641f5d26d891b37e68c4c496e2 100644 --- a/doc/examples/textfinder/main.cpp +++ b/doc/examples/textfinder/main.cpp @@ -1,10 +1,9 @@ /************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** You may use this file under the terms of the BSD license as follows: ** @@ -17,7 +16,7 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor ** the names of its contributors may be used to endorse or promote ** products derived from this software without specific prior written ** permission. diff --git a/doc/examples/textfinder/textfinder.cpp b/doc/examples/textfinder/textfinder.cpp index ae0d5bf1d5edb7c2bca17af9c116eef494a8f5bb..a7b1b73704f82b9484fe1d8872310f76d1710d17 100644 --- a/doc/examples/textfinder/textfinder.cpp +++ b/doc/examples/textfinder/textfinder.cpp @@ -1,10 +1,9 @@ /************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** You may use this file under the terms of the BSD license as follows: ** @@ -17,7 +16,7 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor ** the names of its contributors may be used to endorse or promote ** products derived from this software without specific prior written ** permission. diff --git a/doc/examples/textfinder/textfinder.h b/doc/examples/textfinder/textfinder.h index 3233549c85ac01d9c0ee9e769ca3dce912dbbe80..333d6a500465b340f6d41c21321e01dc73e5ba6d 100644 --- a/doc/examples/textfinder/textfinder.h +++ b/doc/examples/textfinder/textfinder.h @@ -1,10 +1,9 @@ /************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** You may use this file under the terms of the BSD license as follows: ** @@ -17,7 +16,7 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor ** the names of its contributors may be used to endorse or promote ** products derived from this software without specific prior written ** permission. diff --git a/doc/src/analyze/creator-analyze.qdoc b/doc/src/analyze/creator-analyze.qdoc index f5280b9279c4815b4862aec1f1eb094ee57c3601..f753b86d2ae5c9119a5e926d17b417d923642491 100644 --- a/doc/src/analyze/creator-analyze.qdoc +++ b/doc/src/analyze/creator-analyze.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/analyze/creator-valgrind-overview.qdoc b/doc/src/analyze/creator-valgrind-overview.qdoc index 2b525a570e0ac94d0cfa142d6d7e94d852ba111b..c513dc1101fec37fad59b2ee9267ecec25c4a93c 100644 --- a/doc/src/analyze/creator-valgrind-overview.qdoc +++ b/doc/src/analyze/creator-valgrind-overview.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/analyze/creator-valgrind.qdoc b/doc/src/analyze/creator-valgrind.qdoc index 5edf7b3bdcb40e7afb50782db9f8211bcf7abf1a..9c11389f92992bb7409e9f837304838ef1cf73c8 100644 --- a/doc/src/analyze/creator-valgrind.qdoc +++ b/doc/src/analyze/creator-valgrind.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/analyze/qtquick-profiler.qdoc b/doc/src/analyze/qtquick-profiler.qdoc index 916b6dfc2823116e3ac93b73ea58eac7573c2946..d612f665584e819aa294d3a02fab5a731c96faf2 100644 --- a/doc/src/analyze/qtquick-profiler.qdoc +++ b/doc/src/analyze/qtquick-profiler.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/android/androiddev.qdoc b/doc/src/android/androiddev.qdoc index 0c91d9d25a6d556bf45671e2cfc34958f2718a25..ed1d618cf4afcb0364128aef51531cb093eca107 100644 --- a/doc/src/android/androiddev.qdoc +++ b/doc/src/android/androiddev.qdoc @@ -1,10 +1,9 @@ -/**************************************************************************** +/************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: Nokia Corporation (qt-info@nokia.com) +** This file is part of Qt Creator ** ** ** GNU Free Documentation License @@ -14,10 +13,8 @@ ** Foundation and appearing in the file included in the packaging of this ** file. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. ** -****************************************************************************/ +**************************************************************************/ /*! diff --git a/doc/src/android/deploying-android.qdoc b/doc/src/android/deploying-android.qdoc index b079311d9d5ae4299df482feef42c3ac8c679982..d65fce3257cbf4581048c0a2ef817ed6fa25b130 100644 --- a/doc/src/android/deploying-android.qdoc +++ b/doc/src/android/deploying-android.qdoc @@ -1,10 +1,9 @@ -/**************************************************************************** +/************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: Nokia Corporation (qt-info@nokia.com) +** This file is part of Qt Creator ** ** ** GNU Free Documentation License @@ -14,10 +13,8 @@ ** Foundation and appearing in the file included in the packaging of this ** file. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. ** -****************************************************************************/ +**************************************************************************/ /*! diff --git a/doc/src/debugger/creator-debugger-example.qdoc b/doc/src/debugger/creator-debugger-example.qdoc index 302438e8786405dd576b3ca0ee2c931fccb121db..8e1fce4cf3a5be94777b492c934b66740b0db493 100644 --- a/doc/src/debugger/creator-debugger-example.qdoc +++ b/doc/src/debugger/creator-debugger-example.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/debugger/creator-debugger-setup.qdoc b/doc/src/debugger/creator-debugger-setup.qdoc index fd450effa2dff3c269011e90f8ded425589c26e9..99b664e94ffcb7b8cb85271385461fb437298e32 100644 --- a/doc/src/debugger/creator-debugger-setup.qdoc +++ b/doc/src/debugger/creator-debugger-setup.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/debugger/creator-debugger.qdoc b/doc/src/debugger/creator-debugger.qdoc index 8c1e8cadca1c4e3baba6cecb793ac39180efe658..4e14a0a3e2ca64334d7e1967e2b916a5596a120f 100644 --- a/doc/src/debugger/creator-debugger.qdoc +++ b/doc/src/debugger/creator-debugger.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/debugger/qtquick-debugger-example.qdoc b/doc/src/debugger/qtquick-debugger-example.qdoc index 63fc36211de47dc26a97e94023a5c009e29be930..740f706d5c191505fcb544201b7b63d35dd2c6fd 100644 --- a/doc/src/debugger/qtquick-debugger-example.qdoc +++ b/doc/src/debugger/qtquick-debugger-example.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/debugger/qtquick-debugging.qdoc b/doc/src/debugger/qtquick-debugging.qdoc index af7a168dfd2ee69a54c3ca6bf150afcbb73ed734..384c474f0306458d487eb29bf09ad023f24540e0 100644 --- a/doc/src/debugger/qtquick-debugging.qdoc +++ b/doc/src/debugger/qtquick-debugging.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/editors/creator-coding-edit-mode.qdoc b/doc/src/editors/creator-coding-edit-mode.qdoc index 3c667dcd6584a86ad0b76e2da0f5cc2fa7be646d..ae9969108194db4d95eb08dd2bf2e4f16b2c3d20 100644 --- a/doc/src/editors/creator-coding-edit-mode.qdoc +++ b/doc/src/editors/creator-coding-edit-mode.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/editors/creator-coding.qdoc b/doc/src/editors/creator-coding.qdoc index 1a508534bbd435e21a18d9f2b4c92503b6aef067..202a99e07a51dcea7a6bca52b11111e82d4a0942 100644 --- a/doc/src/editors/creator-coding.qdoc +++ b/doc/src/editors/creator-coding.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/editors/creator-editors-options-text.qdoc b/doc/src/editors/creator-editors-options-text.qdoc index bfe316764090361f45c7a04eaceb72368fc66cb5..880b17a6a3c840a916298cf99f48c08fbc7936fd 100644 --- a/doc/src/editors/creator-editors-options-text.qdoc +++ b/doc/src/editors/creator-editors-options-text.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/editors/creator-editors-options.qdoc b/doc/src/editors/creator-editors-options.qdoc index 08ef2c4e8b065a0a6b1f662aadd09f8477342818..64527a3129571eb4825fc1b571e412ec21d00b21 100644 --- a/doc/src/editors/creator-editors-options.qdoc +++ b/doc/src/editors/creator-editors-options.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/editors/creator-editors-writing-code.qdoc b/doc/src/editors/creator-editors-writing-code.qdoc index 350f8bfc9e1475df47d5e4a936adf70bfc0b7d97..0a2c335ba116a8d715a941928fc97d9d6ef58ce1 100644 --- a/doc/src/editors/creator-editors-writing-code.qdoc +++ b/doc/src/editors/creator-editors-writing-code.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/editors/creator-editors.qdoc b/doc/src/editors/creator-editors.qdoc index 9a48a28deb134045d5e7fe396029f2c1e01c075a..786f1e01f2be6db0d89c1792093608ed323f6ec9 100644 --- a/doc/src/editors/creator-editors.qdoc +++ b/doc/src/editors/creator-editors.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/editors/creator-finding.qdoc b/doc/src/editors/creator-finding.qdoc index 453167c2015890455501ae0574ba32082d475edc..370db9ca9a077b7adf5c69aa52e2628171637f0c 100644 --- a/doc/src/editors/creator-finding.qdoc +++ b/doc/src/editors/creator-finding.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/editors/creator-mime-types.qdoc b/doc/src/editors/creator-mime-types.qdoc index 6715d211ba50edeceb1393230a8fdfde3f0feff1..b89ee8c7cc2000203ac92506718f892fe93e4d35 100644 --- a/doc/src/editors/creator-mime-types.qdoc +++ b/doc/src/editors/creator-mime-types.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/howto/creator-cli.qdoc b/doc/src/howto/creator-cli.qdoc index a0ac5601717ff1dff2dafff83490364f6b38d120..70073dc917cd5bb04dcd36bd6b9b3fa9abb84f75 100644 --- a/doc/src/howto/creator-cli.qdoc +++ b/doc/src/howto/creator-cli.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/howto/creator-external-tools.qdoc b/doc/src/howto/creator-external-tools.qdoc index d7bac602b379a2189c4ac87ebd8ca48fafa649e6..37f73c7e90d8f91db2e065db3b76de84735430dd 100644 --- a/doc/src/howto/creator-external-tools.qdoc +++ b/doc/src/howto/creator-external-tools.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/howto/creator-help.qdoc b/doc/src/howto/creator-help.qdoc index 37a2e12d913fa71a02ee888283dbc3f199b9f261..93f7dc3e6ce95891fc7a27dbcd97a9c85c7ce477 100644 --- a/doc/src/howto/creator-help.qdoc +++ b/doc/src/howto/creator-help.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/howto/creator-keyboard-shortcuts.qdoc b/doc/src/howto/creator-keyboard-shortcuts.qdoc index 25c5b8277fa4321127b02805704a6c5544ce0380..7bdc70b54295242c967c01657defe22cf33b4502 100644 --- a/doc/src/howto/creator-keyboard-shortcuts.qdoc +++ b/doc/src/howto/creator-keyboard-shortcuts.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/howto/creator-sessions.qdoc b/doc/src/howto/creator-sessions.qdoc index 97285b62c74d212dd073dd1094b5e4dc1012abe0..8a7744edf9f0fd26b4d10905ad12824ce6fdc580 100644 --- a/doc/src/howto/creator-sessions.qdoc +++ b/doc/src/howto/creator-sessions.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/howto/creator-task-lists.qdoc b/doc/src/howto/creator-task-lists.qdoc index 0d2cdd6a52dce4c343257be51cfa9d8b126cc5b4..6e7e6dc88e8edda4f6d4498f5841c8433bc60f48 100644 --- a/doc/src/howto/creator-task-lists.qdoc +++ b/doc/src/howto/creator-task-lists.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/howto/creator-tips.qdoc b/doc/src/howto/creator-tips.qdoc index 94976312d24459fb3f48a6e23e1403d3772236cb..c0f51da1f2d0a149cb04f6490400dfda1e6d8483 100644 --- a/doc/src/howto/creator-tips.qdoc +++ b/doc/src/howto/creator-tips.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/howto/creator-ui.qdoc b/doc/src/howto/creator-ui.qdoc index f69ce3cc4cb68afe8568ea5c0d6c522348c39253..d527d228b8599ac8a218d708af1d5f290dcbb77d 100644 --- a/doc/src/howto/creator-ui.qdoc +++ b/doc/src/howto/creator-ui.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/howto/creator-vcs.qdoc b/doc/src/howto/creator-vcs.qdoc index 2ec977a99291905eb78950bd9d4716733faf2651..f045ae67e264ee71bf023f18911dfb3ef4ed3528 100644 --- a/doc/src/howto/creator-vcs.qdoc +++ b/doc/src/howto/creator-vcs.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/howto/qtcreator-faq.qdoc b/doc/src/howto/qtcreator-faq.qdoc index c1ce45912e692bfa9b79bf1dbded9906c70cf436..0601de7efd074b01720d7043cc9aef0e6e12aa92 100644 --- a/doc/src/howto/qtcreator-faq.qdoc +++ b/doc/src/howto/qtcreator-faq.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/linux-mobile/creator-deployment-madde.qdoc b/doc/src/linux-mobile/creator-deployment-madde.qdoc index bb04dbe1608ccaa44f96502a411d8e89c7f26d5f..1ba7f60eb54ec761e4e39fb3caccaa36fc2e637a 100644 --- a/doc/src/linux-mobile/creator-deployment-madde.qdoc +++ b/doc/src/linux-mobile/creator-deployment-madde.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/linux-mobile/creator-madde-emulator.qdoc b/doc/src/linux-mobile/creator-madde-emulator.qdoc index 587dda3d5bfcf40e17fe6b54dbf270395fa15a10..c794257a83530e748cad88572065de0b1c32a22b 100644 --- a/doc/src/linux-mobile/creator-madde-emulator.qdoc +++ b/doc/src/linux-mobile/creator-madde-emulator.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/linux-mobile/creator-publish-maemo-extras-devel.qdoc b/doc/src/linux-mobile/creator-publish-maemo-extras-devel.qdoc index d2f25c48fc186a931f6721d552c6dfad9f1e4590..f2189eb67af797878e4a75a7e3427d73797ad1b8 100644 --- a/doc/src/linux-mobile/creator-publish-maemo-extras-devel.qdoc +++ b/doc/src/linux-mobile/creator-publish-maemo-extras-devel.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/linux-mobile/creator-publish-ovi-maemo.qdoc b/doc/src/linux-mobile/creator-publish-ovi-maemo.qdoc index 44904771f1e7484038f1521c522ae21450b4819d..921332d0edc8cb2719e03610bc59be2bc9a35bd4 100644 --- a/doc/src/linux-mobile/creator-publish-ovi-maemo.qdoc +++ b/doc/src/linux-mobile/creator-publish-ovi-maemo.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/linux-mobile/creator-publish-ovi-meego.qdoc b/doc/src/linux-mobile/creator-publish-ovi-meego.qdoc index d28791619a5e75df4447c01298204eba2e004918..57cb2312fede1d386b6ea94b5dbdaf6183a96b4b 100644 --- a/doc/src/linux-mobile/creator-publish-ovi-meego.qdoc +++ b/doc/src/linux-mobile/creator-publish-ovi-meego.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/linux-mobile/linuxdev.qdoc b/doc/src/linux-mobile/linuxdev.qdoc index 67697d70564172b63ff36dfefa1984add4ab7e27..bcc0b2b6257740211a0d97dc1876152a77a2fe58 100644 --- a/doc/src/linux-mobile/linuxdev.qdoc +++ b/doc/src/linux-mobile/linuxdev.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/linux-mobile/maemodev.qdoc b/doc/src/linux-mobile/maemodev.qdoc index 7af7a56964aec80fc507c9d89f62ad41972c8c44..a74cfe02831acc477cf5b878d0aa5cccc3268792 100644 --- a/doc/src/linux-mobile/maemodev.qdoc +++ b/doc/src/linux-mobile/maemodev.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/linux-mobile/meegodev.qdoc b/doc/src/linux-mobile/meegodev.qdoc index a3af8549fa318a70a660726b2fac72867b8cf6e4..c4e9d2b8f9608f873dd0ae9411187cab3b8e195d 100644 --- a/doc/src/linux-mobile/meegodev.qdoc +++ b/doc/src/linux-mobile/meegodev.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/overview/creator-acknowledgements.qdoc b/doc/src/overview/creator-acknowledgements.qdoc index 4c9a8ef8b02dc865ed5719c123f2bd1dd3c62c2e..cdd6c2b3a638321d9da40c76ac17f96d022259e7 100644 --- a/doc/src/overview/creator-acknowledgements.qdoc +++ b/doc/src/overview/creator-acknowledgements.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/overview/creator-advanced.qdoc b/doc/src/overview/creator-advanced.qdoc index da4991fbaa324610459af29db72382b0935f395c..12f5bbe8aaa1452319991469a9d0b34b30538289 100644 --- a/doc/src/overview/creator-advanced.qdoc +++ b/doc/src/overview/creator-advanced.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/overview/creator-deployment-overview.qdoc b/doc/src/overview/creator-deployment-overview.qdoc index cb7bed32721161b5398c464c1da3a109bad8289a..6b970a5e81140487db231b3c2ed58017e1eabb24 100644 --- a/doc/src/overview/creator-deployment-overview.qdoc +++ b/doc/src/overview/creator-deployment-overview.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/overview/creator-deployment-ovi.qdoc b/doc/src/overview/creator-deployment-ovi.qdoc index b697b0eb658c0a1b8a3168e33b3aa0bb80d1d960..0b536d6bc689eabfaa8b13dd186a544b6e9f4172 100644 --- a/doc/src/overview/creator-deployment-ovi.qdoc +++ b/doc/src/overview/creator-deployment-ovi.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/overview/creator-design-overview.qdoc b/doc/src/overview/creator-design-overview.qdoc index 65d4360bb4713c8b800d793ac1ad508d9c2ef7f0..ea1f2b408247668be97144c4e18eb94bff94955f 100644 --- a/doc/src/overview/creator-design-overview.qdoc +++ b/doc/src/overview/creator-design-overview.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/overview/creator-getting-started.qdoc b/doc/src/overview/creator-getting-started.qdoc index bab83192c6203194df9239da56ff2ce3c0daa927..966e73cfab7526cbab3052c98178d4e3de6c5733 100644 --- a/doc/src/overview/creator-getting-started.qdoc +++ b/doc/src/overview/creator-getting-started.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/overview/creator-glossary.qdoc b/doc/src/overview/creator-glossary.qdoc index 2b3f7338893467d4d06308e8aa51b5ab579d2d2d..13d532aff315d081d0974afdfbaf09356cb0885b 100644 --- a/doc/src/overview/creator-glossary.qdoc +++ b/doc/src/overview/creator-glossary.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/overview/creator-help-overview.qdoc b/doc/src/overview/creator-help-overview.qdoc index 3fe0d4078065e0d2bc077f07694b22522b97ed72..cf28fb12d6033413b2618cc2a8a7d48dad835b8c 100644 --- a/doc/src/overview/creator-help-overview.qdoc +++ b/doc/src/overview/creator-help-overview.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/overview/creator-issues.qdoc b/doc/src/overview/creator-issues.qdoc index 74d2b2a952ccd754ab160cc9d0fd7320b7f896bc..11603c401a206b8872c00588974a456d3f444410 100644 --- a/doc/src/overview/creator-issues.qdoc +++ b/doc/src/overview/creator-issues.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/overview/creator-mobile-targets.qdoc b/doc/src/overview/creator-mobile-targets.qdoc index 40e35337e99de1af020aed18372fd004f08a332f..168786d2df3997b9eff4147ef7766fe374873cc6 100644 --- a/doc/src/overview/creator-mobile-targets.qdoc +++ b/doc/src/overview/creator-mobile-targets.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/overview/creator-overview.qdoc b/doc/src/overview/creator-overview.qdoc index d05af8d609f4718e138105fc6589647eece43c54..3f39150db45ffa193b2cbd4ed46411a013026b69 100644 --- a/doc/src/overview/creator-overview.qdoc +++ b/doc/src/overview/creator-overview.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/overview/creator-supported-platforms.qdoc b/doc/src/overview/creator-supported-platforms.qdoc index 8c9d30ba53aeb2e9c1f9ce2e164c7066af7e3a02..20fb1aa0cd9d64c8156f335e9377d06101cfcbca 100644 --- a/doc/src/overview/creator-supported-platforms.qdoc +++ b/doc/src/overview/creator-supported-platforms.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/overview/creator-tech-support.qdoc b/doc/src/overview/creator-tech-support.qdoc index 2d0af0e27a7fa2f14d4a683849eb523fa8f16fee..fb0f73b0c732c873539ca906ef3d8ce8bfc25a7c 100644 --- a/doc/src/overview/creator-tech-support.qdoc +++ b/doc/src/overview/creator-tech-support.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/overview/creator-testing.qdoc b/doc/src/overview/creator-testing.qdoc index 226eaf6e46ec99e7aff701f45e510679cabbd0a7..515c8a732e2c0bee7c2809b5e3558b541f37e21f 100644 --- a/doc/src/overview/creator-testing.qdoc +++ b/doc/src/overview/creator-testing.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/overview/creator-tutorials.qdoc b/doc/src/overview/creator-tutorials.qdoc index cbbb6fe86cce0b5c9e89d29a949b3532e13b6312..2da9c556e96b67568d578ce9f87ca2dbb51fa886 100644 --- a/doc/src/overview/creator-tutorials.qdoc +++ b/doc/src/overview/creator-tutorials.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/overview/mobile-app-design.qdoc b/doc/src/overview/mobile-app-design.qdoc index 8dad73b7cbc56bbba527d372609fcc3e21ceac97..6e963d6b1d368c89800f4147303b3a4388597d63 100644 --- a/doc/src/overview/mobile-app-design.qdoc +++ b/doc/src/overview/mobile-app-design.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/projects/creator-projects-autotools.qdoc b/doc/src/projects/creator-projects-autotools.qdoc index 193a58d8c13446a15966da5ede9089f4e3593b5a..956f1f671a8c10a1ab9140152697aa986f7c23ee 100644 --- a/doc/src/projects/creator-projects-autotools.qdoc +++ b/doc/src/projects/creator-projects-autotools.qdoc @@ -1,36 +1,34 @@ /************************************************************************** ** -** This file is part of Qt Creator +** Copyright (C) 2010-2012 Openismus GmbH. +** Authors: Peter Penz (ppenz@openismus.com) +** Patricia Santana Cruz (patriciasantanacruz@gmail.com) +** Contact: http://www.qt-project.org/legal ** -** Copyright (c) 2010-2012 Openismus GmbH. -** Authors: Peter Penz (ppenz@openismus.com) -** Patricia Santana Cruz (patriciasc@openismus.com) -** -** Contact: Nokia Corporation (info@qt.nokia.com) +** This file is part of Qt Creator. ** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. ** ** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this file. -** Please review the following information to ensure the GNU Lesser General -** Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. -** -**************************************************************************/ +****************************************************************************/ + /*! \contentspage index.html diff --git a/doc/src/projects/creator-projects-build-run-tutorial.qdoc b/doc/src/projects/creator-projects-build-run-tutorial.qdoc index bd5b1256f4d47e3ad2dcd88b6d0e881bffe89199..0deeb3b6f3bca5f908e6f80f38e1b79be9ce51f2 100644 --- a/doc/src/projects/creator-projects-build-run-tutorial.qdoc +++ b/doc/src/projects/creator-projects-build-run-tutorial.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/projects/creator-projects-building-running.qdoc b/doc/src/projects/creator-projects-building-running.qdoc index 637d6b4300a873dd410ba593176e47cd93e2b743..0c793cc799dc54997590c0814107bb252dd500c0 100644 --- a/doc/src/projects/creator-projects-building-running.qdoc +++ b/doc/src/projects/creator-projects-building-running.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/projects/creator-projects-building.qdoc b/doc/src/projects/creator-projects-building.qdoc index 78ec14144d38d5239f9a33ffdc1a8ab3fc33dbf3..9ce72afbaa3b991780d1a2799b3997747b1c3810 100644 --- a/doc/src/projects/creator-projects-building.qdoc +++ b/doc/src/projects/creator-projects-building.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/projects/creator-projects-builds-customizing.qdoc b/doc/src/projects/creator-projects-builds-customizing.qdoc index 004e395e6af313a34f5e4383a24a4a0a65e26c11..099106b80a61df3685137c20b559cb324f451ff3 100644 --- a/doc/src/projects/creator-projects-builds-customizing.qdoc +++ b/doc/src/projects/creator-projects-builds-customizing.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/projects/creator-projects-cmake.qdoc b/doc/src/projects/creator-projects-cmake.qdoc index 7ff7f287c20680ced0e785d7866f660aaef14d3b..462249d32bd231cc112674f0669cd24e4ce63cec 100644 --- a/doc/src/projects/creator-projects-cmake.qdoc +++ b/doc/src/projects/creator-projects-cmake.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/projects/creator-projects-compilers.qdoc b/doc/src/projects/creator-projects-compilers.qdoc index e99bd621aecec66533c8dac093de2f9d458042bc..6166a1f50a1972a58ea0db3b8b8139f6ba6212bc 100644 --- a/doc/src/projects/creator-projects-compilers.qdoc +++ b/doc/src/projects/creator-projects-compilers.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/projects/creator-projects-creating.qdoc b/doc/src/projects/creator-projects-creating.qdoc index 211a129df7999a6b4fe50e1a9233bb0c620ecd97..bdfe10f770cf873ca7fb28e31cc038c838416c39 100644 --- a/doc/src/projects/creator-projects-creating.qdoc +++ b/doc/src/projects/creator-projects-creating.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/projects/creator-projects-custom-wizards.qdoc b/doc/src/projects/creator-projects-custom-wizards.qdoc index aa29e9b7a3b1e7eec53c308a543bd133e78a8d31..967573230b6b0e737942df008921c91badb5e2e7 100644 --- a/doc/src/projects/creator-projects-custom-wizards.qdoc +++ b/doc/src/projects/creator-projects-custom-wizards.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/projects/creator-projects-generic.qdoc b/doc/src/projects/creator-projects-generic.qdoc index e536b259d7e389280433a9032d7f18c6e0bd82d2..09eaba6bd5a74cf9dc444e0c81dfcc0811032f02 100644 --- a/doc/src/projects/creator-projects-generic.qdoc +++ b/doc/src/projects/creator-projects-generic.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/projects/creator-projects-libraries.qdoc b/doc/src/projects/creator-projects-libraries.qdoc index 630b6e9546fca643654936426e668abcc7175ee1..98f21693ca53d1dc357f4c13225752221d430bb3 100644 --- a/doc/src/projects/creator-projects-libraries.qdoc +++ b/doc/src/projects/creator-projects-libraries.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/projects/creator-projects-opening.qdoc b/doc/src/projects/creator-projects-opening.qdoc index cf9cedb34e5b59d34bf3bbfb232fdd90666c54c7..260f4ca2560f44f87a76af4f13928c595920cfc0 100644 --- a/doc/src/projects/creator-projects-opening.qdoc +++ b/doc/src/projects/creator-projects-opening.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/projects/creator-projects-other.qdoc b/doc/src/projects/creator-projects-other.qdoc index a0cfe2f9f8006f4357553bc60457bb21d25a3e6f..c3066291949e7f5d4fccaa154d962d2169043dbc 100644 --- a/doc/src/projects/creator-projects-other.qdoc +++ b/doc/src/projects/creator-projects-other.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/projects/creator-projects-overview.qdoc b/doc/src/projects/creator-projects-overview.qdoc index fb5bab9b9303d06db4968bdf1e940cf272f5681c..0e5dc1247206d42f42c766c9b78890ec4f480cf2 100644 --- a/doc/src/projects/creator-projects-overview.qdoc +++ b/doc/src/projects/creator-projects-overview.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/projects/creator-projects-qt-versions.qdoc b/doc/src/projects/creator-projects-qt-versions.qdoc index 9185ac45a572e760c8a85915150a690a3dce8c06..50c12e3a5ec3ccf46e00b23b8bd6d2095510801d 100644 --- a/doc/src/projects/creator-projects-qt-versions.qdoc +++ b/doc/src/projects/creator-projects-qt-versions.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/projects/creator-projects-running.qdoc b/doc/src/projects/creator-projects-running.qdoc index 99488dd27af608b09aa25d08aa4837b12e21eb5b..345f0cb2a356832315a28dc5a8026b982929ab30 100644 --- a/doc/src/projects/creator-projects-running.qdoc +++ b/doc/src/projects/creator-projects-running.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/projects/creator-projects-settings-build.qdoc b/doc/src/projects/creator-projects-settings-build.qdoc index 3a39742c3fbf6ffbd2353b8a09ae8c8e05383492..09d1d8941e321128fe222279d721243fe5f8000f 100644 --- a/doc/src/projects/creator-projects-settings-build.qdoc +++ b/doc/src/projects/creator-projects-settings-build.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/projects/creator-projects-settings-code-style.qdoc b/doc/src/projects/creator-projects-settings-code-style.qdoc index 486a9fab7ba7fbe1b87e2b6d94bc3db03eae7c1c..525982a92ce0e919e153da8d140fcd04bf01c223 100644 --- a/doc/src/projects/creator-projects-settings-code-style.qdoc +++ b/doc/src/projects/creator-projects-settings-code-style.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/projects/creator-projects-settings-dependencies.qdoc b/doc/src/projects/creator-projects-settings-dependencies.qdoc index 7095a1900bfbb97db7dcb0665b41994f11db877b..1998c7065f0e83b7b5e1e6dd88d11e657c7c542f 100644 --- a/doc/src/projects/creator-projects-settings-dependencies.qdoc +++ b/doc/src/projects/creator-projects-settings-dependencies.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/projects/creator-projects-settings-editor.qdoc b/doc/src/projects/creator-projects-settings-editor.qdoc index 117b88315f91e4134e8c714962b80e5a2e1cb93c..91dc459e655a535e7e10f29de9b569d8b22a96be 100644 --- a/doc/src/projects/creator-projects-settings-editor.qdoc +++ b/doc/src/projects/creator-projects-settings-editor.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/projects/creator-projects-settings-overview.qdoc b/doc/src/projects/creator-projects-settings-overview.qdoc index 28f67574d054daafa958e0faa6ab09fbd7154081..d04370a17443b0bfd6550ea6403c3721f15019fe 100644 --- a/doc/src/projects/creator-projects-settings-overview.qdoc +++ b/doc/src/projects/creator-projects-settings-overview.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/projects/creator-projects-settings-run.qdoc b/doc/src/projects/creator-projects-settings-run.qdoc index 407fe6724621d33a70343e89d1537bc078d911d8..9e13366407709fd721ab9f4894cc2e7e95f882d7 100644 --- a/doc/src/projects/creator-projects-settings-run.qdoc +++ b/doc/src/projects/creator-projects-settings-run.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/projects/creator-projects-settings-sharing.qdoc b/doc/src/projects/creator-projects-settings-sharing.qdoc index 451efcf31b4a8cc5c8e9e6de1d81da3a374f18f4..e92bfc4ec5119f936e65f8ae893f485c6abcbee1 100644 --- a/doc/src/projects/creator-projects-settings-sharing.qdoc +++ b/doc/src/projects/creator-projects-settings-sharing.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/projects/creator-projects-targets.qdoc b/doc/src/projects/creator-projects-targets.qdoc index b1a49bcef06bab85f6431e1bc830fadabcfc74e5..ae487d2c33138649ad9df30f3de7f6c4b8d592b7 100644 --- a/doc/src/projects/creator-projects-targets.qdoc +++ b/doc/src/projects/creator-projects-targets.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/qtcreator.qdoc b/doc/src/qtcreator.qdoc index 979638dd0b823f8844748ff10cd6ae6b8807b018..d3258832aa0021fb46a6c065b49182a76f121bcc 100644 --- a/doc/src/qtcreator.qdoc +++ b/doc/src/qtcreator.qdoc @@ -1,11 +1,9 @@ - -/**************************************************************************** -** -** This file is part of Qt Creator +/************************************************************************** ** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License @@ -16,7 +14,7 @@ ** file. ** ** -****************************************************************************/ +**************************************************************************/ // ********************************************************************** // NOTE: the sections are not ordered by their logical order to avoid diff --git a/doc/src/qtquick/qtquick-app-development.qdoc b/doc/src/qtquick/qtquick-app-development.qdoc index 2ddf7dbac6fbf4d84e88df414093f626490835dc..06d64b5523943151450f1ae9b859903c034ab75e 100644 --- a/doc/src/qtquick/qtquick-app-development.qdoc +++ b/doc/src/qtquick/qtquick-app-development.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/qtquick/qtquick-app-tutorial.qdoc b/doc/src/qtquick/qtquick-app-tutorial.qdoc index 2c963ce1d537abce762a120d06901b80400343e3..408132f538162a5aea2bd2956ced7a90743a1009 100644 --- a/doc/src/qtquick/qtquick-app-tutorial.qdoc +++ b/doc/src/qtquick/qtquick-app-tutorial.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/qtquick/qtquick-buttons.qdoc b/doc/src/qtquick/qtquick-buttons.qdoc index 46ad15c28a1204f1cc55efef0336ae4f9f0e6113..48a7d1e854fff250fe3e99878a17c885c4d316ad 100644 --- a/doc/src/qtquick/qtquick-buttons.qdoc +++ b/doc/src/qtquick/qtquick-buttons.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/qtquick/qtquick-components.qdoc b/doc/src/qtquick/qtquick-components.qdoc index 1f805625df95fa4b15ac362ef355276e0677f599..52eecaf6f95719063d4a2ad479584c60bf88df2e 100644 --- a/doc/src/qtquick/qtquick-components.qdoc +++ b/doc/src/qtquick/qtquick-components.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/qtquick/qtquick-creating.qdoc b/doc/src/qtquick/qtquick-creating.qdoc index 80763000a400d8a1fdc4aa012667365b046bd511..906dacb31818493716ab23a2eb4d6166c2aea413 100644 --- a/doc/src/qtquick/qtquick-creating.qdoc +++ b/doc/src/qtquick/qtquick-creating.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/qtquick/qtquick-designer.qdoc b/doc/src/qtquick/qtquick-designer.qdoc index fee3c191c57ee7b49fa3bb65275f371934190bd8..70e582e6540ddce3b5c16687d88272818c722813 100644 --- a/doc/src/qtquick/qtquick-designer.qdoc +++ b/doc/src/qtquick/qtquick-designer.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/qtquick/qtquick-exporting-qml.qdoc b/doc/src/qtquick/qtquick-exporting-qml.qdoc index a749ae2fae9aa63c94bf6105eb2deb0ddd006654..95b8b35e7349c87fb09a792f755fc3dc900da8ae 100644 --- a/doc/src/qtquick/qtquick-exporting-qml.qdoc +++ b/doc/src/qtquick/qtquick-exporting-qml.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/qtquick/qtquick-modules-with-plugins.qdoc b/doc/src/qtquick/qtquick-modules-with-plugins.qdoc index 06e7ffd816eb261711e5f8c460eb82f0cd4d1c65..f3c2c37cf310a989d1169222c5b5806b1b22f432 100644 --- a/doc/src/qtquick/qtquick-modules-with-plugins.qdoc +++ b/doc/src/qtquick/qtquick-modules-with-plugins.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/qtquick/qtquick-screens.qdoc b/doc/src/qtquick/qtquick-screens.qdoc index 0f31ce14a8b9af11188bbc36ad78112586141a0b..9188b4806a0aaa2b29b6f034a0399cc1d08cecfb 100644 --- a/doc/src/qtquick/qtquick-screens.qdoc +++ b/doc/src/qtquick/qtquick-screens.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/qtquick/qtquick-toolbars.qdoc b/doc/src/qtquick/qtquick-toolbars.qdoc index 8871273bfbe435916026718ee0ea9441b9749bd3..90f17b3a4d67fe9ab88a7e700c29b379e19647ba 100644 --- a/doc/src/qtquick/qtquick-toolbars.qdoc +++ b/doc/src/qtquick/qtquick-toolbars.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/widgets/qtdesigner-app-tutorial.qdoc b/doc/src/widgets/qtdesigner-app-tutorial.qdoc index 1256bbee0a2463536764270fb52e7170a7dbab8b..a1f6599bd42535d1c1e224cc2efe6d4a9ef12ea7 100644 --- a/doc/src/widgets/qtdesigner-app-tutorial.qdoc +++ b/doc/src/widgets/qtdesigner-app-tutorial.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/widgets/qtdesigner-overview.qdoc b/doc/src/widgets/qtdesigner-overview.qdoc index 61eff724c708f600ad50cc7a78afac86e084ce78..53b4d40fc944b0d386c1869f34057587571e8650 100644 --- a/doc/src/widgets/qtdesigner-overview.qdoc +++ b/doc/src/widgets/qtdesigner-overview.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/doc/src/widgets/qtdesigner-plugins.qdoc b/doc/src/widgets/qtdesigner-plugins.qdoc index e1e641776571c22dfae9bbffef46d9f401b50fa3..fed4b0d477704777806ef7de1d50c9bb78c158ed 100644 --- a/doc/src/widgets/qtdesigner-plugins.qdoc +++ b/doc/src/widgets/qtdesigner-plugins.qdoc @@ -1,10 +1,9 @@ /**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator ** ** ** GNU Free Documentation License diff --git a/lib/qtcreator/qtcomponents/Button.qml b/lib/qtcreator/qtcomponents/Button.qml index a00271f43a6f50f80d3b110befa4fb942e5b2564..58d273bf6955b233c09e87775acaf36cd05d4950 100644 --- a/lib/qtcreator/qtcomponents/Button.qml +++ b/lib/qtcreator/qtcomponents/Button.qml @@ -1,32 +1,31 @@ -/************************************************************************** +/**************************************************************************** ** -** This file is part of Qt Creator +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator. ** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. ** ** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this file. -** Please review the following information to ensure the GNU Lesser General -** Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -**************************************************************************/ +****************************************************************************/ import QtQuick 1.0 import "custom" as Components diff --git a/lib/qtcreator/qtcomponents/ButtonRow.qml b/lib/qtcreator/qtcomponents/ButtonRow.qml index 177ae4efc1fb8901b222fa4fad1e3826182a42f9..a4bc1000501f4cd2c4b91b2ee15e85aadfba462d 100644 --- a/lib/qtcreator/qtcomponents/ButtonRow.qml +++ b/lib/qtcreator/qtcomponents/ButtonRow.qml @@ -1,32 +1,31 @@ -/************************************************************************** +/**************************************************************************** ** -** This file is part of Qt Creator +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator. ** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. ** ** GNU Lesser General Public License Usage -** -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this file. -** Please review the following information to ensure the GNU Lesser General -** Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -**************************************************************************/ +****************************************************************************/ import QtQuick 1.0 import "custom" as Components diff --git a/lib/qtcreator/qtcomponents/CheckBox.qml b/lib/qtcreator/qtcomponents/CheckBox.qml index 936a31df9acebad894cf98adce3001537879218c..6975a5ef54b62470187bc1ba1e61be36ac38bd00 100644 --- a/lib/qtcreator/qtcomponents/CheckBox.qml +++ b/lib/qtcreator/qtcomponents/CheckBox.qml @@ -1,32 +1,31 @@ -/************************************************************************** +/**************************************************************************** ** -** This file is part of Qt Creator +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator. ** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. ** ** GNU Lesser General Public License Usage -** -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this file. -** Please review the following information to ensure the GNU Lesser General -** Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -**************************************************************************/ +****************************************************************************/ import QtQuick 1.0 import "custom" as Components diff --git a/lib/qtcreator/qtcomponents/ChoiceList.qml b/lib/qtcreator/qtcomponents/ChoiceList.qml index d2f7fa67849869195a8ecb8c7eee669468ba283f..9025fb9d231cd545a8cdad57772fefe8f39178a0 100644 --- a/lib/qtcreator/qtcomponents/ChoiceList.qml +++ b/lib/qtcreator/qtcomponents/ChoiceList.qml @@ -1,32 +1,31 @@ -/************************************************************************** +/**************************************************************************** ** -** This file is part of Qt Creator +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator. ** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. ** ** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this file. -** Please review the following information to ensure the GNU Lesser General -** Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -**************************************************************************/ +****************************************************************************/ import QtQuick 1.0 import "custom" as Components diff --git a/lib/qtcreator/qtcomponents/ContextMenu.qml b/lib/qtcreator/qtcomponents/ContextMenu.qml index c3589302c9ecdbf18eaf33c3f0b90de95871d998..b31c0a0072ecb326267ee7b7abb3659cda1d7c49 100644 --- a/lib/qtcreator/qtcomponents/ContextMenu.qml +++ b/lib/qtcreator/qtcomponents/ContextMenu.qml @@ -1,32 +1,31 @@ -/************************************************************************** +/**************************************************************************** ** -** This file is part of Qt Creator +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator. ** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. ** ** GNU Lesser General Public License Usage -** -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this file. -** Please review the following information to ensure the GNU Lesser General -** Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -**************************************************************************/ +****************************************************************************/ import QtQuick 1.0 import "custom" as Components diff --git a/lib/qtcreator/qtcomponents/Dial.qml b/lib/qtcreator/qtcomponents/Dial.qml index 72be7516f099a96be8826031382f3534fe82e197..b0fcbcab0ee7f7fb2aa57188627c66d5c8a32f3f 100644 --- a/lib/qtcreator/qtcomponents/Dial.qml +++ b/lib/qtcreator/qtcomponents/Dial.qml @@ -1,32 +1,31 @@ -/************************************************************************** +/**************************************************************************** ** -** This file is part of Qt Creator +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator. ** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. ** ** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this file. -** Please review the following information to ensure the GNU Lesser General -** Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -**************************************************************************/ +****************************************************************************/ import QtQuick 1.0 import "custom" as Components diff --git a/lib/qtcreator/qtcomponents/Frame.qml b/lib/qtcreator/qtcomponents/Frame.qml index e3e050c3fe445a153d5375af332e5a2b5ed7eeca..cbb4b60caec4e76741762568ad493ee8124387ca 100644 --- a/lib/qtcreator/qtcomponents/Frame.qml +++ b/lib/qtcreator/qtcomponents/Frame.qml @@ -1,32 +1,31 @@ -/************************************************************************** +/**************************************************************************** ** -** This file is part of Qt Creator +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator. ** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. ** ** GNU Lesser General Public License Usage -** -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this file. -** Please review the following information to ensure the GNU Lesser General -** Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -**************************************************************************/ +****************************************************************************/ import QtQuick 1.0 import "custom" as Components diff --git a/lib/qtcreator/qtcomponents/GroupBox.qml b/lib/qtcreator/qtcomponents/GroupBox.qml index 39bd223ba85628b2bd1d95630793595882fc6798..0b7eb6be50118c558de8cf59d836ea34a1bd9cbf 100644 --- a/lib/qtcreator/qtcomponents/GroupBox.qml +++ b/lib/qtcreator/qtcomponents/GroupBox.qml @@ -1,32 +1,31 @@ -/************************************************************************** +/**************************************************************************** ** -** This file is part of Qt Creator +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator. ** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. ** ** GNU Lesser General Public License Usage -** -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this file. -** Please review the following information to ensure the GNU Lesser General -** Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -**************************************************************************/ +****************************************************************************/ import QtQuick 1.0 import "custom" as Components diff --git a/lib/qtcreator/qtcomponents/Menu.qml b/lib/qtcreator/qtcomponents/Menu.qml index bb77adb0e25faa37f7380378d8c18a50b297f194..cc01bf7f0d98d3bc9e3d88232ad364aa4b248e84 100644 --- a/lib/qtcreator/qtcomponents/Menu.qml +++ b/lib/qtcreator/qtcomponents/Menu.qml @@ -1,32 +1,31 @@ -/************************************************************************** +/**************************************************************************** ** -** This file is part of Qt Creator +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator. ** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. ** ** GNU Lesser General Public License Usage -** -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this file. -** Please review the following information to ensure the GNU Lesser General -** Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -**************************************************************************/ +****************************************************************************/ import QtQuick 1.0 diff --git a/lib/qtcreator/qtcomponents/MenuItem.qml b/lib/qtcreator/qtcomponents/MenuItem.qml index 7a36db3cade7e20f4936fb124e27493a2fcdfd89..c001050f5a50697900f56d2d5bcdd21563fd813e 100644 --- a/lib/qtcreator/qtcomponents/MenuItem.qml +++ b/lib/qtcreator/qtcomponents/MenuItem.qml @@ -1,32 +1,31 @@ -/************************************************************************** +/**************************************************************************** ** -** This file is part of Qt Creator +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator. ** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. ** ** GNU Lesser General Public License Usage -** -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this file. -** Please review the following information to ensure the GNU Lesser General -** Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -**************************************************************************/ +****************************************************************************/ import QtQuick 1.0 diff --git a/lib/qtcreator/qtcomponents/ProgressBar.qml b/lib/qtcreator/qtcomponents/ProgressBar.qml index 27446c96408380440edca23b8273e53d7a1ddc1c..16cb23414b65abb4ca04073d53113ff54cd979bb 100644 --- a/lib/qtcreator/qtcomponents/ProgressBar.qml +++ b/lib/qtcreator/qtcomponents/ProgressBar.qml @@ -1,32 +1,31 @@ -/************************************************************************** +/**************************************************************************** ** -** This file is part of Qt Creator +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator. ** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. ** ** GNU Lesser General Public License Usage -** -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this file. -** Please review the following information to ensure the GNU Lesser General -** Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -**************************************************************************/ +****************************************************************************/ import QtQuick 1.0 import "custom" as Components diff --git a/lib/qtcreator/qtcomponents/RadioButton.qml b/lib/qtcreator/qtcomponents/RadioButton.qml index 214d2598feba6cc77e5541235f676a1b45585073..efda634c05e36cf5705d8bcab50ec5693c2c2a99 100644 --- a/lib/qtcreator/qtcomponents/RadioButton.qml +++ b/lib/qtcreator/qtcomponents/RadioButton.qml @@ -1,32 +1,31 @@ -/************************************************************************** +/**************************************************************************** ** -** This file is part of Qt Creator +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator. ** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. ** ** GNU Lesser General Public License Usage -** -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this file. -** Please review the following information to ensure the GNU Lesser General -** Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -**************************************************************************/ +****************************************************************************/ import QtQuick 1.0 import "custom" as Components diff --git a/lib/qtcreator/qtcomponents/ScrollArea.qml b/lib/qtcreator/qtcomponents/ScrollArea.qml index 54136b357506921f000cf56788739881cf148f96..a32eaf8365e58fd28533f85f0b0e48af61ad4f10 100644 --- a/lib/qtcreator/qtcomponents/ScrollArea.qml +++ b/lib/qtcreator/qtcomponents/ScrollArea.qml @@ -1,32 +1,31 @@ -/************************************************************************** +/**************************************************************************** ** -** This file is part of Qt Creator +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator. ** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. ** ** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this file. -** Please review the following information to ensure the GNU Lesser General -** Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -**************************************************************************/ +****************************************************************************/ import QtQuick 1.0 import "custom" as Components diff --git a/lib/qtcreator/qtcomponents/ScrollBar.qml b/lib/qtcreator/qtcomponents/ScrollBar.qml index 130d25ed207140c0d9fa5981018319918bd497e3..548a8f42567ef095af6af07c01c9723f6b622b8b 100644 --- a/lib/qtcreator/qtcomponents/ScrollBar.qml +++ b/lib/qtcreator/qtcomponents/ScrollBar.qml @@ -1,32 +1,31 @@ -/************************************************************************** +/**************************************************************************** ** -** This file is part of Qt Creator +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator. ** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. ** ** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this file. -** Please review the following information to ensure the GNU Lesser General -** Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -**************************************************************************/ +****************************************************************************/ import QtQuick 1.0 import "custom" as Components diff --git a/lib/qtcreator/qtcomponents/Slider.qml b/lib/qtcreator/qtcomponents/Slider.qml index 08a4a7b2365d6b648d9825b69aa65d0005acb6da..a52cba7b441abae0acf20e67bbda90076c8ab108 100644 --- a/lib/qtcreator/qtcomponents/Slider.qml +++ b/lib/qtcreator/qtcomponents/Slider.qml @@ -1,32 +1,31 @@ -/************************************************************************** +/**************************************************************************** ** -** This file is part of Qt Creator +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator. ** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. ** ** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this file. -** Please review the following information to ensure the GNU Lesser General -** Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -**************************************************************************/ +****************************************************************************/ import QtQuick 1.0 import "custom" as Components diff --git a/lib/qtcreator/qtcomponents/SpinBox.qml b/lib/qtcreator/qtcomponents/SpinBox.qml index f2df3eae70798f0c5e091494d70d1d685b71f79a..7405a486bb23acf180b879043198beccd2e822dc 100644 --- a/lib/qtcreator/qtcomponents/SpinBox.qml +++ b/lib/qtcreator/qtcomponents/SpinBox.qml @@ -1,32 +1,31 @@ -/************************************************************************** +/**************************************************************************** ** -** This file is part of Qt Creator +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator. ** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. ** ** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this file. -** Please review the following information to ensure the GNU Lesser General -** Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -**************************************************************************/ +****************************************************************************/ import QtQuick 1.0 import "custom" as Components diff --git a/lib/qtcreator/qtcomponents/SplitterRow.qml b/lib/qtcreator/qtcomponents/SplitterRow.qml index a61cfd41a6725a14677b1a392d4833a3b3968279..663777618e2160f0c335845395d839eb1071eb48 100644 --- a/lib/qtcreator/qtcomponents/SplitterRow.qml +++ b/lib/qtcreator/qtcomponents/SplitterRow.qml @@ -1,32 +1,31 @@ -/************************************************************************** +/**************************************************************************** ** -** This file is part of Qt Creator +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator. ** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. ** ** GNU Lesser General Public License Usage -** -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this file. -** Please review the following information to ensure the GNU Lesser General -** Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -**************************************************************************/ +****************************************************************************/ import QtQuick 1.0 import "custom" as Components diff --git a/lib/qtcreator/qtcomponents/Switch.qml b/lib/qtcreator/qtcomponents/Switch.qml index 537942df507d9b506b3a1ef2f9148f21162c06b4..525c654d55c47cab26b8871bc269ae41d4a640ff 100644 --- a/lib/qtcreator/qtcomponents/Switch.qml +++ b/lib/qtcreator/qtcomponents/Switch.qml @@ -1,32 +1,31 @@ -/************************************************************************** +/**************************************************************************** ** -** This file is part of Qt Creator +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator. ** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. ** ** GNU Lesser General Public License Usage -** -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this file. -** Please review the following information to ensure the GNU Lesser General -** Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -**************************************************************************/ +****************************************************************************/ import QtQuick 1.0 import "custom" as Components diff --git a/lib/qtcreator/qtcomponents/Tab.qml b/lib/qtcreator/qtcomponents/Tab.qml index 03e46f317875e501aacbf105ad2bebad16596736..29be95f933c68e14c1352e2d9023af5ca24055bc 100644 --- a/lib/qtcreator/qtcomponents/Tab.qml +++ b/lib/qtcreator/qtcomponents/Tab.qml @@ -1,32 +1,31 @@ -/************************************************************************** +/**************************************************************************** ** -** This file is part of Qt Creator +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator. ** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. ** ** GNU Lesser General Public License Usage -** -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this file. -** Please review the following information to ensure the GNU Lesser General -** Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -**************************************************************************/ +****************************************************************************/ import Qt 4.7 diff --git a/lib/qtcreator/qtcomponents/TabBar.qml b/lib/qtcreator/qtcomponents/TabBar.qml index 167f7c175ef2ab4d461b9bd1af678c25b479e1a6..9f817bddccff3161cd1c7d956c6943ba02128111 100644 --- a/lib/qtcreator/qtcomponents/TabBar.qml +++ b/lib/qtcreator/qtcomponents/TabBar.qml @@ -1,32 +1,31 @@ -/************************************************************************** +/**************************************************************************** ** -** This file is part of Qt Creator +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator. ** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. ** ** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this file. -** Please review the following information to ensure the GNU Lesser General -** Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -**************************************************************************/ +****************************************************************************/ import QtQuick 1.0 import "custom" as Components diff --git a/lib/qtcreator/qtcomponents/TabFrame.qml b/lib/qtcreator/qtcomponents/TabFrame.qml index 7e64ac5e8b9d5761a2a9deed273d1690a7e1f7ec..7f59c9846f1a3baba925d1847d26a4073b73d3a8 100644 --- a/lib/qtcreator/qtcomponents/TabFrame.qml +++ b/lib/qtcreator/qtcomponents/TabFrame.qml @@ -1,32 +1,31 @@ -/************************************************************************** +/**************************************************************************** ** -** This file is part of Qt Creator +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator. ** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. ** ** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this file. -** Please review the following information to ensure the GNU Lesser General -** Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -**************************************************************************/ +****************************************************************************/ import QtQuick 1.0 import "custom" as Components diff --git a/lib/qtcreator/qtcomponents/TableColumn.qml b/lib/qtcreator/qtcomponents/TableColumn.qml index b6d5697860ba27cd8cf6f37e9d6ab8f13d1a2f8f..c3c3f682d699620b81293c54978342dd0826a0c7 100644 --- a/lib/qtcreator/qtcomponents/TableColumn.qml +++ b/lib/qtcreator/qtcomponents/TableColumn.qml @@ -1,32 +1,31 @@ -/************************************************************************** +/**************************************************************************** ** -** This file is part of Qt Creator +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator. ** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. ** ** GNU Lesser General Public License Usage -** -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this file. -** Please review the following information to ensure the GNU Lesser General -** Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -**************************************************************************/ +****************************************************************************/ import QtQuick 1.0 diff --git a/lib/qtcreator/qtcomponents/TableView.qml b/lib/qtcreator/qtcomponents/TableView.qml index 51e685f88d378b8480b38e39be553aa0a2abba49..cbd71dd55bdbebc481163ef3494bb4b958a80c11 100644 --- a/lib/qtcreator/qtcomponents/TableView.qml +++ b/lib/qtcreator/qtcomponents/TableView.qml @@ -1,32 +1,31 @@ -/************************************************************************** +/**************************************************************************** ** -** This file is part of Qt Creator +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator. ** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. ** ** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this file. -** Please review the following information to ensure the GNU Lesser General -** Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -**************************************************************************/ +****************************************************************************/ import QtQuick 1.0 diff --git a/lib/qtcreator/qtcomponents/TextArea.qml b/lib/qtcreator/qtcomponents/TextArea.qml index ff03d912488cbb710545de0a59ecee4f79c26a5d..98af7e717288948da106d37fc33fda77e29ef331 100644 --- a/lib/qtcreator/qtcomponents/TextArea.qml +++ b/lib/qtcreator/qtcomponents/TextArea.qml @@ -1,32 +1,31 @@ -/************************************************************************** +/**************************************************************************** ** -** This file is part of Qt Creator +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator. ** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. ** ** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this file. -** Please review the following information to ensure the GNU Lesser General -** Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -**************************************************************************/ +****************************************************************************/ import QtQuick 1.0 import "custom" as Components diff --git a/lib/qtcreator/qtcomponents/TextField.qml b/lib/qtcreator/qtcomponents/TextField.qml index bee704d62abd1b2da573dfc424aaa293bff16add..174b7e428e84c9b1d5a7f68dff80648ec909c605 100644 --- a/lib/qtcreator/qtcomponents/TextField.qml +++ b/lib/qtcreator/qtcomponents/TextField.qml @@ -1,32 +1,31 @@ -/************************************************************************** +/**************************************************************************** ** -** This file is part of Qt Creator +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator. ** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. ** ** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this file. -** Please review the following information to ensure the GNU Lesser General -** Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -**************************************************************************/ +****************************************************************************/ import QtQuick 1.0 import "custom" as Components diff --git a/lib/qtcreator/qtcomponents/ToolBar.qml b/lib/qtcreator/qtcomponents/ToolBar.qml index eca2041a7bd97e61fefe60d2fcdd95f95316eea3..106c9cd1128706af7ca04c46cd48ce822926faff 100644 --- a/lib/qtcreator/qtcomponents/ToolBar.qml +++ b/lib/qtcreator/qtcomponents/ToolBar.qml @@ -1,32 +1,31 @@ -/************************************************************************** +/**************************************************************************** ** -** This file is part of Qt Creator +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator. ** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. ** ** GNU Lesser General Public License Usage -** -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this file. -** Please review the following information to ensure the GNU Lesser General -** Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -**************************************************************************/ +****************************************************************************/ import QtQuick 1.0 import "custom" as Components diff --git a/lib/qtcreator/qtcomponents/ToolButton.qml b/lib/qtcreator/qtcomponents/ToolButton.qml index cb5a458f76162fcab24a0eaf9d24c8cad8a41c45..6436f4784ada6dca74d659802a6a841576b4ed0d 100644 --- a/lib/qtcreator/qtcomponents/ToolButton.qml +++ b/lib/qtcreator/qtcomponents/ToolButton.qml @@ -1,32 +1,31 @@ -/************************************************************************** +/**************************************************************************** ** -** This file is part of Qt Creator +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator. ** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. ** ** GNU Lesser General Public License Usage -** -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this file. -** Please review the following information to ensure the GNU Lesser General -** Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -**************************************************************************/ +****************************************************************************/ import QtQuick 1.0 import "custom" as Components diff --git a/lib/qtcreator/qtcomponents/custom/BasicButton.qml b/lib/qtcreator/qtcomponents/custom/BasicButton.qml index 746803967e1cfe988af062f607817d9c6316aea2..19d6a7b68f152e5d1f943b676bdf2683b8ea8321 100644 --- a/lib/qtcreator/qtcomponents/custom/BasicButton.qml +++ b/lib/qtcreator/qtcomponents/custom/BasicButton.qml @@ -1,32 +1,31 @@ -/************************************************************************** +/**************************************************************************** ** -** This file is part of Qt Creator +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator. ** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. ** ** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this file. -** Please review the following information to ensure the GNU Lesser General -** Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -**************************************************************************/ +****************************************************************************/ import QtQuick 1.0 import "./behaviors" // ButtonBehavior diff --git a/lib/qtcreator/qtcomponents/custom/Button.qml b/lib/qtcreator/qtcomponents/custom/Button.qml index dec366124b68a21d974a0a4ec976265a2d0c6e23..e259d44dbf534bdedd4a43e63fe4c1c3043d9af6 100644 --- a/lib/qtcreator/qtcomponents/custom/Button.qml +++ b/lib/qtcreator/qtcomponents/custom/Button.qml @@ -1,32 +1,31 @@ -/************************************************************************** +/**************************************************************************** ** -** This file is part of Qt Creator +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator. ** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. ** ** GNU Lesser General Public License Usage -** -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this file. -** Please review the following information to ensure the GNU Lesser General -** Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -**************************************************************************/ +****************************************************************************/ import QtQuick 1.0 diff --git a/lib/qtcreator/qtcomponents/custom/ButtonColumn.qml b/lib/qtcreator/qtcomponents/custom/ButtonColumn.qml index 50908d6b52711ce69dc04e0e6f910fc0b2bfd13e..deba8cdc64d5e959a580868ef8eb3fccdb4958ef 100644 --- a/lib/qtcreator/qtcomponents/custom/ButtonColumn.qml +++ b/lib/qtcreator/qtcomponents/custom/ButtonColumn.qml @@ -1,32 +1,31 @@ -/************************************************************************** +/**************************************************************************** ** -** This file is part of Qt Creator +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator. ** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. ** ** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this file. -** Please review the following information to ensure the GNU Lesser General -** Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -**************************************************************************/ +****************************************************************************/ import Qt 4.7 import "ButtonGroup.js" as Behavior diff --git a/lib/qtcreator/qtcomponents/custom/ButtonRow.qml b/lib/qtcreator/qtcomponents/custom/ButtonRow.qml index 83985798281871f1f8bb7a4e899a60d2b4bd0c04..886e65976c81007af83e0182267a819fb141b8af 100644 --- a/lib/qtcreator/qtcomponents/custom/ButtonRow.qml +++ b/lib/qtcreator/qtcomponents/custom/ButtonRow.qml @@ -1,32 +1,31 @@ -/************************************************************************** +/**************************************************************************** ** -** This file is part of Qt Creator +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator. ** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. ** ** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this file. -** Please review the following information to ensure the GNU Lesser General -** Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -**************************************************************************/ +****************************************************************************/ import Qt 4.7 import "ButtonGroup.js" as Behavior diff --git a/lib/qtcreator/qtcomponents/custom/CheckBox.qml b/lib/qtcreator/qtcomponents/custom/CheckBox.qml index 06e880f9b3d4aa76b0e6e686fd6580ed28f63f70..b4916bb95cd26116ed1624caf1cc6894be39800a 100644 --- a/lib/qtcreator/qtcomponents/custom/CheckBox.qml +++ b/lib/qtcreator/qtcomponents/custom/CheckBox.qml @@ -1,32 +1,31 @@ -/************************************************************************** +/**************************************************************************** ** -** This file is part of Qt Creator +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator. ** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. ** ** GNU Lesser General Public License Usage -** -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this file. -** Please review the following information to ensure the GNU Lesser General -** Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -**************************************************************************/ +****************************************************************************/ import QtQuick 1.0 import "./behaviors" diff --git a/lib/qtcreator/qtcomponents/custom/ChoiceList.qml b/lib/qtcreator/qtcomponents/custom/ChoiceList.qml index b7dde2a3b2559470f46227a4c9e38a04cf368673..b3472801d45f7fc5ee3864da3fb5c5a3633318fc 100644 --- a/lib/qtcreator/qtcomponents/custom/ChoiceList.qml +++ b/lib/qtcreator/qtcomponents/custom/ChoiceList.qml @@ -1,32 +1,31 @@ -/************************************************************************** +/**************************************************************************** ** -** This file is part of Qt Creator +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator. ** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. ** ** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this file. -** Please review the following information to ensure the GNU Lesser General -** Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -**************************************************************************/ +****************************************************************************/ import QtQuick 1.0 import "./private" as Private diff --git a/lib/qtcreator/qtcomponents/custom/GroupBox.qml b/lib/qtcreator/qtcomponents/custom/GroupBox.qml index a9823a604801a1a8bb6f66091b2d8c49fc225128..f62bed33c6e3d6db1ad681871287070b22ab77b1 100644 --- a/lib/qtcreator/qtcomponents/custom/GroupBox.qml +++ b/lib/qtcreator/qtcomponents/custom/GroupBox.qml @@ -1,32 +1,31 @@ -/************************************************************************** +/**************************************************************************** ** -** This file is part of Qt Creator +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator. ** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. ** ** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this file. -** Please review the following information to ensure the GNU Lesser General -** Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -**************************************************************************/ +****************************************************************************/ import QtQuick 1.0 diff --git a/lib/qtcreator/qtcomponents/custom/ProgressBar.qml b/lib/qtcreator/qtcomponents/custom/ProgressBar.qml index 0d0535b13179c2873ac4ecaabd4430e9498e21ef..81eb59d8b4c5a1a4fab739e5f16b1f658c6d020d 100644 --- a/lib/qtcreator/qtcomponents/custom/ProgressBar.qml +++ b/lib/qtcreator/qtcomponents/custom/ProgressBar.qml @@ -1,32 +1,31 @@ -/************************************************************************** +/**************************************************************************** ** -** This file is part of Qt Creator +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator. ** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. ** ** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this file. -** Please review the following information to ensure the GNU Lesser General -** Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -**************************************************************************/ +****************************************************************************/ import QtQuick 1.0 diff --git a/lib/qtcreator/qtcomponents/custom/Slider.qml b/lib/qtcreator/qtcomponents/custom/Slider.qml index 14c8c6d3453d0c5ad63bf17ed8e2423bab1fbd52..cda431cf96cfc7c09b67f9af643c54a2cc222d8e 100644 --- a/lib/qtcreator/qtcomponents/custom/Slider.qml +++ b/lib/qtcreator/qtcomponents/custom/Slider.qml @@ -1,32 +1,31 @@ -/************************************************************************** +/**************************************************************************** ** -** This file is part of Qt Creator +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator. ** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. ** ** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this file. -** Please review the following information to ensure the GNU Lesser General -** Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -**************************************************************************/ +****************************************************************************/ import QtQuick 1.0 import "../" diff --git a/lib/qtcreator/qtcomponents/custom/SpinBox.qml b/lib/qtcreator/qtcomponents/custom/SpinBox.qml index 436691c010e62bb3146d66a7884a01cd9b3ca191..b027457c660e601e8c4b92f5f2b4ceec6e4d3a6a 100644 --- a/lib/qtcreator/qtcomponents/custom/SpinBox.qml +++ b/lib/qtcreator/qtcomponents/custom/SpinBox.qml @@ -1,32 +1,31 @@ -/************************************************************************** +/**************************************************************************** ** -** This file is part of Qt Creator +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator. ** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. ** ** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this file. -** Please review the following information to ensure the GNU Lesser General -** Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -**************************************************************************/ +****************************************************************************/ import QtQuick 1.0 diff --git a/lib/qtcreator/qtcomponents/custom/SplitterRow.qml b/lib/qtcreator/qtcomponents/custom/SplitterRow.qml index aac9cde18de42f76abe186ca0848495087720dd7..63f2861d7d604b46cf3a49a5d768ffa4c535a13f 100644 --- a/lib/qtcreator/qtcomponents/custom/SplitterRow.qml +++ b/lib/qtcreator/qtcomponents/custom/SplitterRow.qml @@ -1,32 +1,31 @@ -/************************************************************************** +/**************************************************************************** ** -** This file is part of Qt Creator +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator. ** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. ** ** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this file. -** Please review the following information to ensure the GNU Lesser General -** Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -**************************************************************************/ +****************************************************************************/ import QtQuick 1.0 import "private" diff --git a/lib/qtcreator/qtcomponents/custom/TextField.qml b/lib/qtcreator/qtcomponents/custom/TextField.qml index 568fbea1b66d606b8000951f802b75ff23091c1e..15ed9741e8c842c640e89ebbc03648b174453c22 100644 --- a/lib/qtcreator/qtcomponents/custom/TextField.qml +++ b/lib/qtcreator/qtcomponents/custom/TextField.qml @@ -1,32 +1,31 @@ -/************************************************************************** +/**************************************************************************** ** -** This file is part of Qt Creator +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator. ** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. ** ** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this file. -** Please review the following information to ensure the GNU Lesser General -** Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -**************************************************************************/ +****************************************************************************/ import QtQuick 1.0 import "./behaviors" // TextEditMouseBehavior diff --git a/lib/qtcreator/qtcomponents/custom/behaviors/ButtonBehavior.qml b/lib/qtcreator/qtcomponents/custom/behaviors/ButtonBehavior.qml index b45507f2dc31a33084793feade2f33d25bff2cfb..bd8dc017d5345faaf786b19f07f92f0304a2f8b9 100644 --- a/lib/qtcreator/qtcomponents/custom/behaviors/ButtonBehavior.qml +++ b/lib/qtcreator/qtcomponents/custom/behaviors/ButtonBehavior.qml @@ -1,32 +1,31 @@ -/************************************************************************** +/**************************************************************************** ** -** This file is part of Qt Creator +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator. ** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. ** ** GNU Lesser General Public License Usage -** -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this file. -** Please review the following information to ensure the GNU Lesser General -** Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -**************************************************************************/ +****************************************************************************/ import QtQuick 1.0 diff --git a/lib/qtcreator/qtcomponents/custom/behaviors/ModalPopupBehavior.qml b/lib/qtcreator/qtcomponents/custom/behaviors/ModalPopupBehavior.qml index c7fb2c5d1a8f9644c537dad4d9bcdbd87354c590..4682a7a0d1be20a5946e427a1a6e49a8f0feabec 100644 --- a/lib/qtcreator/qtcomponents/custom/behaviors/ModalPopupBehavior.qml +++ b/lib/qtcreator/qtcomponents/custom/behaviors/ModalPopupBehavior.qml @@ -1,32 +1,31 @@ -/************************************************************************** +/**************************************************************************** ** -** This file is part of Qt Creator +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator. ** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. ** ** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this file. -** Please review the following information to ensure the GNU Lesser General -** Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -**************************************************************************/ +****************************************************************************/ import QtQuick 1.0 diff --git a/lib/qtcreator/qtcomponents/custom/private/ChoiceListPopup.qml b/lib/qtcreator/qtcomponents/custom/private/ChoiceListPopup.qml index b96b550e280b6ef0efad2bb2918951ce297f6083..5f812add13822c4f2980091697b2d1c0b42c9d32 100644 --- a/lib/qtcreator/qtcomponents/custom/private/ChoiceListPopup.qml +++ b/lib/qtcreator/qtcomponents/custom/private/ChoiceListPopup.qml @@ -1,32 +1,31 @@ -/************************************************************************** +/**************************************************************************** ** -** This file is part of Qt Creator +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator. ** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. ** ** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this file. -** Please review the following information to ensure the GNU Lesser General -** Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -**************************************************************************/ +****************************************************************************/ import QtQuick 1.0 diff --git a/scripts/deployqt.py b/scripts/deployqt.py index e4c1078f5d43376b54e9d4c400e04ce1f7362599..ea44599d8b91133fbe5d3a4bd7aded29360011f3 100755 --- a/scripts/deployqt.py +++ b/scripts/deployqt.py @@ -1,6 +1,6 @@ #!/usr/bin/env python ################################################################################ -# Copyright (c) 2011 Nokia Corporation +# Copyright (C) 2012 Digia Plc # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -11,7 +11,7 @@ # * Redistributions in binary form must reproduce the above copyright notice, # this list of conditions and the following disclaimer in the documentation # and/or other materials provided with the distribution. -# * Neither the name of Nokia Corporation, nor the names of its contributors +# * Neither the name of Digia Plc, nor the names of its contributors # may be used to endorse or promote products derived from this software # without specific prior written permission. # diff --git a/scripts/hasCopyright.pl b/scripts/hasCopyright.pl old mode 100755 new mode 100644 index c80135a7916581448191deba0ded582ac25b7dd5..255d900c32840f625799911efd4343a156fa62a3 --- a/scripts/hasCopyright.pl +++ b/scripts/hasCopyright.pl @@ -66,7 +66,7 @@ while (1) { $hasCurrent = 1 if $_ =~ /\(c\).*\s2012/i; $hasContact = 1 if $_ =~ /Contact: http:\/\/www.qt-project.org\/legal/; - $hasCommercial = 1 if $_ =~ /Commercial License Usage/; + $hasCommercial = 1 if $_ =~ /Commercial (License )?Usage/; $hasDigia = 1 if $_ =~ /Digia Plc/; $hasLGPL = 1 if $_ =~ /GNU Lesser General Public License Usage/; $hasGPL = 1 if $_ =~ /GNU General Public License Usage/; @@ -95,7 +95,7 @@ while (1) { next; } - unless ($hasContact) { + if (!$hasContact && $file !~ /\.pluginspec\.in$/) { print "$file\tERROR\tWrong contact\n"; next; } diff --git a/scripts/packageIfw.py b/scripts/packageIfw.py index b78cb548f280f8b475eec681f761ce9dddd940ff..82bddc7b72dcc135da5ee1914cf370c1f6543108 100755 --- a/scripts/packageIfw.py +++ b/scripts/packageIfw.py @@ -1,6 +1,6 @@ #!/usr/bin/env python ################################################################################ -# Copyright (c) 2011 Nokia Corporation +# Copyright (C) 2012 Digia Plc # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -11,7 +11,7 @@ # * Redistributions in binary form must reproduce the above copyright notice, # this list of conditions and the following disclaimer in the documentation # and/or other materials provided with the distribution. -# * Neither the name of Nokia Corporation, nor the names of its contributors +# * Neither the name of Digia Plc, nor the names of its contributors # may be used to endorse or promote products derived from this software # without specific prior written permission. # diff --git a/scripts/unixdeployqt.sh b/scripts/unixdeployqt.sh index ef59540c9a9d2eb56919285b53262a5d1f4e9d20..16bcacf64d93b543de8f2cb47df6386cee98573f 100755 --- a/scripts/unixdeployqt.sh +++ b/scripts/unixdeployqt.sh @@ -1,6 +1,6 @@ #!/bin/bash ################################################################################ -# Copyright (c) 2011 Nokia Corporation +# Copyright (C) 2012 Digia Plc # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -11,7 +11,7 @@ # * Redistributions in binary form must reproduce the above copyright notice, # this list of conditions and the following disclaimer in the documentation # and/or other materials provided with the distribution. -# * Neither the name of Nokia Corporation, nor the names of its contributors +# * Neither the name of Digia Plc, nor the names of its contributors # may be used to endorse or promote products derived from this software # without specific prior written permission. # diff --git a/share/qtcreator/dumper/LGPL_EXCEPTION.TXT b/share/qtcreator/dumper/LGPL_EXCEPTION.TXT index 8d0f85eba40bb52717cdd79ca238297f5b3e5adc..add80b93182aa3fa2ffd0ae076cccf72ad11e910 100644 --- a/share/qtcreator/dumper/LGPL_EXCEPTION.TXT +++ b/share/qtcreator/dumper/LGPL_EXCEPTION.TXT @@ -1,3 +1,22 @@ -Nokia Qt LGPL Exception version 1.0 +Digia Qt LGPL Exception version 1.1 -As a special exception to the GNU Lesser General Public License version 2.1, the object code form of a "work that uses the Library" may incorporate material from a header file that is part of the Library. You may distribute such object code under terms of your choice, provided that the incorporated material (i) does not exceed more than 5% of the total size of the Library; and (ii) is limited to numerical parameters, data structure layouts, accessors, macros, inline functions and templates. \ No newline at end of file +As an additional permission to the GNU Lesser General Public License version +2.1, the object code form of a "work that uses the Library" may incorporate +material from a header file that is part of the Library. You may distribute +such object code under terms of your choice, provided that: + (i) the header files of the Library have not been modified; and + (ii) the incorporated material is limited to numerical parameters, data + structure layouts, accessors, macros, inline functions and + templates; and + (iii) you comply with the terms of Section 6 of the GNU Lesser General + Public License version 2.1. + +Moreover, you may apply this exception to a modified version of the Library, +provided that such modification does not involve copying material from the +Library into the modified Library's header files unless such material is +limited to (i) numerical parameters; (ii) data structure layouts; +(iii) accessors; and (iv) small macros, templates and inline functions of +five lines or less in length. + +Furthermore, you are not required to apply this additional permission to a +modified version of the Library. diff --git a/share/qtcreator/dumper/dumper.cpp b/share/qtcreator/dumper/dumper.cpp index 581bf38daa95c2bc79e0b772736ec02c1c78d0b0..5e4a4c3dcb2505bd9015bfb268c5b74b8eb5c903 100644 --- a/share/qtcreator/dumper/dumper.cpp +++ b/share/qtcreator/dumper/dumper.cpp @@ -1,32 +1,31 @@ -/************************************************************************** +/**************************************************************************** ** -** This file is part of Qt Creator +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: http://www.qt-project.org/ +** This file is part of Qt Creator. ** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. ** ** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this file. -** Please review the following information to ensure the GNU Lesser General -** Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -**************************************************************************/ +****************************************************************************/ #include