diff options
Diffstat (limited to 'src/plugins/todo')
31 files changed, 211 insertions, 211 deletions
diff --git a/src/plugins/todo/Todo.json.in b/src/plugins/todo/Todo.json.in index 5ccf83b852..130171155e 100644 --- a/src/plugins/todo/Todo.json.in +++ b/src/plugins/todo/Todo.json.in @@ -4,16 +4,16 @@ \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", \"Experimental\" : true, \"Vendor\" : \"Dmitry Savchenko\", - \"Copyright\" : \"(C) 2014 Dmitry Savchenko, (C) 2014 Vasiliy Sorokin\", + \"Copyright\" : \"(C) 2015 Dmitry Savchenko, (C) 2015 Vasiliy Sorokin\", \"License\" : [ \"Commercial Usage\", \"\", - \"Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia.\", + \"Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and The Qt Company.\", \"\", \"GNU Lesser General Public License Usage\", \"\", \"Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 or version 3 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License requirements will be met: https://www.gnu.org/licenses/lgpl.html and http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\" ], \"Description\" : \"Adds pane that lists all TODO, FIXME, etc. entries in comments.\", - \"Url\" : \"http://www.qt-project.org\", + \"Url\" : \"http://www.qt.io\", $$dependencyList } diff --git a/src/plugins/todo/constants.h b/src/plugins/todo/constants.h index 04baf5266b..be84c10248 100644 --- a/src/plugins/todo/constants.h +++ b/src/plugins/todo/constants.h @@ -1,8 +1,8 @@ /************************************************************************** ** -** Copyright (c) 2014 Dmitry Savchenko -** Copyright (c) 2014 Vasiliy Sorokin -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 Dmitry Savchenko +** Copyright (C) 2015 Vasiliy Sorokin +** Contact: http://www.qt.io/licensing ** ** This file is part of Qt Creator. ** @@ -10,8 +10,8 @@ ** 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://www.qt.io/licensing. For further information +** a written agreement between you and The Qt Company. For licensing terms and +** conditions see http://www.qt.io/terms-conditions. For further information ** use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** In addition, as a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ****************************************************************************/ diff --git a/src/plugins/todo/cpptodoitemsscanner.cpp b/src/plugins/todo/cpptodoitemsscanner.cpp index bb74b91d2f..70a8901f53 100644 --- a/src/plugins/todo/cpptodoitemsscanner.cpp +++ b/src/plugins/todo/cpptodoitemsscanner.cpp @@ -1,8 +1,8 @@ /************************************************************************** ** -** Copyright (c) 2014 Dmitry Savchenko -** Copyright (c) 2014 Vasiliy Sorokin -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 Dmitry Savchenko +** Copyright (C) 2015 Vasiliy Sorokin +** Contact: http://www.qt.io/licensing ** ** This file is part of Qt Creator. ** @@ -10,8 +10,8 @@ ** 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://www.qt.io/licensing. For further information +** a written agreement between you and The Qt Company. For licensing terms and +** conditions see http://www.qt.io/terms-conditions. For further information ** use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** In addition, as a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ****************************************************************************/ diff --git a/src/plugins/todo/cpptodoitemsscanner.h b/src/plugins/todo/cpptodoitemsscanner.h index 9f263a3479..771be2fdbc 100644 --- a/src/plugins/todo/cpptodoitemsscanner.h +++ b/src/plugins/todo/cpptodoitemsscanner.h @@ -1,8 +1,8 @@ /************************************************************************** ** -** Copyright (c) 2014 Dmitry Savchenko -** Copyright (c) 2014 Vasiliy Sorokin -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 Dmitry Savchenko +** Copyright (C) 2015 Vasiliy Sorokin +** Contact: http://www.qt.io/licensing ** ** This file is part of Qt Creator. ** @@ -10,8 +10,8 @@ ** 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://www.qt.io/licensing. For further information +** a written agreement between you and The Qt Company. For licensing terms and +** conditions see http://www.qt.io/terms-conditions. For further information ** use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** In addition, as a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ****************************************************************************/ diff --git a/src/plugins/todo/keyword.cpp b/src/plugins/todo/keyword.cpp index 13b5ec4510..fbae123a28 100644 --- a/src/plugins/todo/keyword.cpp +++ b/src/plugins/todo/keyword.cpp @@ -1,8 +1,8 @@ /************************************************************************** ** -** Copyright (c) 2014 Dmitry Savchenko -** Copyright (c) 2014 Vasiliy Sorokin -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 Dmitry Savchenko +** Copyright (C) 2015 Vasiliy Sorokin +** Contact: http://www.qt.io/licensing ** ** This file is part of Qt Creator. ** @@ -10,8 +10,8 @@ ** 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://www.qt.io/licensing. For further information +** a written agreement between you and The Qt Company. For licensing terms and +** conditions see http://www.qt.io/terms-conditions. For further information ** use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** In addition, as a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ****************************************************************************/ diff --git a/src/plugins/todo/keyword.h b/src/plugins/todo/keyword.h index 4e69c0d6b0..1ba8c5be1b 100644 --- a/src/plugins/todo/keyword.h +++ b/src/plugins/todo/keyword.h @@ -1,8 +1,8 @@ /************************************************************************** ** -** Copyright (c) 2014 Dmitry Savchenko -** Copyright (c) 2014 Vasiliy Sorokin -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 Dmitry Savchenko +** Copyright (C) 2015 Vasiliy Sorokin +** Contact: http://www.qt.io/licensing ** ** This file is part of Qt Creator. ** @@ -10,8 +10,8 @@ ** 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://www.qt.io/licensing. For further information +** a written agreement between you and The Qt Company. For licensing terms and +** conditions see http://www.qt.io/terms-conditions. For further information ** use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** In addition, as a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ****************************************************************************/ diff --git a/src/plugins/todo/keyworddialog.cpp b/src/plugins/todo/keyworddialog.cpp index 7d71c540b3..7110db011b 100644 --- a/src/plugins/todo/keyworddialog.cpp +++ b/src/plugins/todo/keyworddialog.cpp @@ -1,8 +1,8 @@ /************************************************************************** ** -** Copyright (c) 2014 Dmitry Savchenko -** Copyright (c) 2014 Vasiliy Sorokin -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 Dmitry Savchenko +** Copyright (C) 2015 Vasiliy Sorokin +** Contact: http://www.qt.io/licensing ** ** This file is part of Qt Creator. ** @@ -10,8 +10,8 @@ ** 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://www.qt.io/licensing. For further information +** a written agreement between you and The Qt Company. For licensing terms and +** conditions see http://www.qt.io/terms-conditions. For further information ** use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** In addition, as a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ****************************************************************************/ diff --git a/src/plugins/todo/keyworddialog.h b/src/plugins/todo/keyworddialog.h index ce0100a44e..a22fbd3421 100644 --- a/src/plugins/todo/keyworddialog.h +++ b/src/plugins/todo/keyworddialog.h @@ -1,8 +1,8 @@ /************************************************************************** ** -** Copyright (c) 2014 Dmitry Savchenko -** Copyright (c) 2014 Vasiliy Sorokin -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 Dmitry Savchenko +** Copyright (C) 2015 Vasiliy Sorokin +** Contact: http://www.qt.io/licensing ** ** This file is part of Qt Creator. ** @@ -10,8 +10,8 @@ ** 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://www.qt.io/licensing. For further information +** a written agreement between you and The Qt Company. For licensing terms and +** conditions see http://www.qt.io/terms-conditions. For further information ** use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** In addition, as a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ****************************************************************************/ diff --git a/src/plugins/todo/lineparser.cpp b/src/plugins/todo/lineparser.cpp index 00a8e50b06..fefc7338a8 100644 --- a/src/plugins/todo/lineparser.cpp +++ b/src/plugins/todo/lineparser.cpp @@ -1,8 +1,8 @@ /************************************************************************** ** -** Copyright (c) 2014 Dmitry Savchenko -** Copyright (c) 2014 Vasiliy Sorokin -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 Dmitry Savchenko +** Copyright (C) 2015 Vasiliy Sorokin +** Contact: http://www.qt.io/licensing ** ** This file is part of Qt Creator. ** @@ -10,8 +10,8 @@ ** 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://www.qt.io/licensing. For further information +** a written agreement between you and The Qt Company. For licensing terms and +** conditions see http://www.qt.io/terms-conditions. For further information ** use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** In addition, as a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ****************************************************************************/ diff --git a/src/plugins/todo/lineparser.h b/src/plugins/todo/lineparser.h index 73fa1d931a..f07f902003 100644 --- a/src/plugins/todo/lineparser.h +++ b/src/plugins/todo/lineparser.h @@ -1,8 +1,8 @@ /************************************************************************** ** -** Copyright (c) 2014 Dmitry Savchenko -** Copyright (c) 2014 Vasiliy Sorokin -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 Dmitry Savchenko +** Copyright (C) 2015 Vasiliy Sorokin +** Contact: http://www.qt.io/licensing ** ** This file is part of Qt Creator. ** @@ -10,8 +10,8 @@ ** 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://www.qt.io/licensing. For further information +** a written agreement between you and The Qt Company. For licensing terms and +** conditions see http://www.qt.io/terms-conditions. For further information ** use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** In addition, as a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ****************************************************************************/ diff --git a/src/plugins/todo/optionsdialog.cpp b/src/plugins/todo/optionsdialog.cpp index 0064eddb8b..8f675a647f 100644 --- a/src/plugins/todo/optionsdialog.cpp +++ b/src/plugins/todo/optionsdialog.cpp @@ -1,8 +1,8 @@ /************************************************************************** ** -** Copyright (c) 2014 Dmitry Savchenko -** Copyright (c) 2014 Vasiliy Sorokin -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 Dmitry Savchenko +** Copyright (C) 2015 Vasiliy Sorokin +** Contact: http://www.qt.io/licensing ** ** This file is part of Qt Creator. ** @@ -10,8 +10,8 @@ ** 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://www.qt.io/licensing. For further information +** a written agreement between you and The Qt Company. For licensing terms and +** conditions see http://www.qt.io/terms-conditions. For further information ** use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** In addition, as a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ****************************************************************************/ diff --git a/src/plugins/todo/optionsdialog.h b/src/plugins/todo/optionsdialog.h index de3679c179..5ea22c51b9 100644 --- a/src/plugins/todo/optionsdialog.h +++ b/src/plugins/todo/optionsdialog.h @@ -1,8 +1,8 @@ /************************************************************************** ** -** Copyright (c) 2014 Dmitry Savchenko -** Copyright (c) 2014 Vasiliy Sorokin -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 Dmitry Savchenko +** Copyright (C) 2015 Vasiliy Sorokin +** Contact: http://www.qt.io/licensing ** ** This file is part of Qt Creator. ** @@ -10,8 +10,8 @@ ** 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://www.qt.io/licensing. For further information +** a written agreement between you and The Qt Company. For licensing terms and +** conditions see http://www.qt.io/terms-conditions. For further information ** use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** In addition, as a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ****************************************************************************/ diff --git a/src/plugins/todo/optionspage.cpp b/src/plugins/todo/optionspage.cpp index aacbb065e8..5f369c13ef 100644 --- a/src/plugins/todo/optionspage.cpp +++ b/src/plugins/todo/optionspage.cpp @@ -1,8 +1,8 @@ /************************************************************************** ** -** Copyright (c) 2014 Dmitry Savchenko -** Copyright (c) 2014 Vasiliy Sorokin -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 Dmitry Savchenko +** Copyright (C) 2015 Vasiliy Sorokin +** Contact: http://www.qt.io/licensing ** ** This file is part of Qt Creator. ** @@ -10,8 +10,8 @@ ** 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://www.qt.io/licensing. For further information +** a written agreement between you and The Qt Company. For licensing terms and +** conditions see http://www.qt.io/terms-conditions. For further information ** use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** In addition, as a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ****************************************************************************/ diff --git a/src/plugins/todo/optionspage.h b/src/plugins/todo/optionspage.h index 088f42eaaf..c2b9ca9b77 100644 --- a/src/plugins/todo/optionspage.h +++ b/src/plugins/todo/optionspage.h @@ -1,8 +1,8 @@ /************************************************************************** ** -** Copyright (c) 2014 Dmitry Savchenko -** Copyright (c) 2014 Vasiliy Sorokin -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 Dmitry Savchenko +** Copyright (C) 2015 Vasiliy Sorokin +** Contact: http://www.qt.io/licensing ** ** This file is part of Qt Creator. ** @@ -10,8 +10,8 @@ ** 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://www.qt.io/licensing. For further information +** a written agreement between you and The Qt Company. For licensing terms and +** conditions see http://www.qt.io/terms-conditions. For further information ** use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** In addition, as a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ****************************************************************************/ diff --git a/src/plugins/todo/qmljstodoitemsscanner.cpp b/src/plugins/todo/qmljstodoitemsscanner.cpp index 3b0a7e7e1a..54fc73cb27 100644 --- a/src/plugins/todo/qmljstodoitemsscanner.cpp +++ b/src/plugins/todo/qmljstodoitemsscanner.cpp @@ -1,8 +1,8 @@ /************************************************************************** ** -** Copyright (c) 2014 Dmitry Savchenko -** Copyright (c) 2014 Vasiliy Sorokin -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 Dmitry Savchenko +** Copyright (C) 2015 Vasiliy Sorokin +** Contact: http://www.qt.io/licensing ** ** This file is part of Qt Creator. ** @@ -10,8 +10,8 @@ ** 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://www.qt.io/licensing. For further information +** a written agreement between you and The Qt Company. For licensing terms and +** conditions see http://www.qt.io/terms-conditions. For further information ** use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** In addition, as a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ****************************************************************************/ diff --git a/src/plugins/todo/qmljstodoitemsscanner.h b/src/plugins/todo/qmljstodoitemsscanner.h index 55c263c7c3..3ade03166f 100644 --- a/src/plugins/todo/qmljstodoitemsscanner.h +++ b/src/plugins/todo/qmljstodoitemsscanner.h @@ -1,8 +1,8 @@ /************************************************************************** ** -** Copyright (c) 2014 Dmitry Savchenko -** Copyright (c) 2014 Vasiliy Sorokin -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 Dmitry Savchenko +** Copyright (C) 2015 Vasiliy Sorokin +** Contact: http://www.qt.io/licensing ** ** This file is part of Qt Creator. ** @@ -10,8 +10,8 @@ ** 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://www.qt.io/licensing. For further information +** a written agreement between you and The Qt Company. For licensing terms and +** conditions see http://www.qt.io/terms-conditions. For further information ** use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** In addition, as a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ****************************************************************************/ diff --git a/src/plugins/todo/settings.cpp b/src/plugins/todo/settings.cpp index 3e46f4579b..35d351d601 100644 --- a/src/plugins/todo/settings.cpp +++ b/src/plugins/todo/settings.cpp @@ -1,8 +1,8 @@ /************************************************************************** ** -** Copyright (c) 2014 Dmitry Savchenko -** Copyright (c) 2014 Vasiliy Sorokin -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 Dmitry Savchenko +** Copyright (C) 2015 Vasiliy Sorokin +** Contact: http://www.qt.io/licensing ** ** This file is part of Qt Creator. ** @@ -10,8 +10,8 @@ ** 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://www.qt.io/licensing. For further information +** a written agreement between you and The Qt Company. For licensing terms and +** conditions see http://www.qt.io/terms-conditions. For further information ** use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** In addition, as a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ****************************************************************************/ diff --git a/src/plugins/todo/settings.h b/src/plugins/todo/settings.h index a261ea8474..b41d48a1fc 100644 --- a/src/plugins/todo/settings.h +++ b/src/plugins/todo/settings.h @@ -1,8 +1,8 @@ /************************************************************************** ** -** Copyright (c) 2014 Dmitry Savchenko -** Copyright (c) 2014 Vasiliy Sorokin -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 Dmitry Savchenko +** Copyright (C) 2015 Vasiliy Sorokin +** Contact: http://www.qt.io/licensing ** ** This file is part of Qt Creator. ** @@ -10,8 +10,8 @@ ** 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://www.qt.io/licensing. For further information +** a written agreement between you and The Qt Company. For licensing terms and +** conditions see http://www.qt.io/terms-conditions. For further information ** use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** In addition, as a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ****************************************************************************/ diff --git a/src/plugins/todo/todoitem.h b/src/plugins/todo/todoitem.h index 23c1550f5f..1e95f35904 100644 --- a/src/plugins/todo/todoitem.h +++ b/src/plugins/todo/todoitem.h @@ -1,8 +1,8 @@ /************************************************************************** ** -** Copyright (c) 2014 Dmitry Savchenko -** Copyright (c) 2014 Vasiliy Sorokin -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 Dmitry Savchenko +** Copyright (C) 2015 Vasiliy Sorokin +** Contact: http://www.qt.io/licensing ** ** This file is part of Qt Creator. ** @@ -10,8 +10,8 @@ ** 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://www.qt.io/licensing. For further information +** a written agreement between you and The Qt Company. For licensing terms and +** conditions see http://www.qt.io/terms-conditions. For further information ** use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** In addition, as a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ****************************************************************************/ diff --git a/src/plugins/todo/todoitemsmodel.cpp b/src/plugins/todo/todoitemsmodel.cpp index 183f1d927e..68c07bf647 100644 --- a/src/plugins/todo/todoitemsmodel.cpp +++ b/src/plugins/todo/todoitemsmodel.cpp @@ -1,8 +1,8 @@ /************************************************************************** ** -** Copyright (c) 2014 Dmitry Savchenko -** Copyright (c) 2014 Vasiliy Sorokin -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 Dmitry Savchenko +** Copyright (C) 2015 Vasiliy Sorokin +** Contact: http://www.qt.io/licensing ** ** This file is part of Qt Creator. ** @@ -10,8 +10,8 @@ ** 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://www.qt.io/licensing. For further information +** a written agreement between you and The Qt Company. For licensing terms and +** conditions see http://www.qt.io/terms-conditions. For further information ** use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** In addition, as a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ****************************************************************************/ diff --git a/src/plugins/todo/todoitemsmodel.h b/src/plugins/todo/todoitemsmodel.h index 8e7ff3e296..487601852b 100644 --- a/src/plugins/todo/todoitemsmodel.h +++ b/src/plugins/todo/todoitemsmodel.h @@ -1,8 +1,8 @@ /************************************************************************** ** -** Copyright (c) 2014 Dmitry Savchenko -** Copyright (c) 2014 Vasiliy Sorokin -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 Dmitry Savchenko +** Copyright (C) 2015 Vasiliy Sorokin +** Contact: http://www.qt.io/licensing ** ** This file is part of Qt Creator. ** @@ -10,8 +10,8 @@ ** 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://www.qt.io/licensing. For further information +** a written agreement between you and The Qt Company. For licensing terms and +** conditions see http://www.qt.io/terms-conditions. For further information ** use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** In addition, as a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ****************************************************************************/ diff --git a/src/plugins/todo/todoitemsprovider.cpp b/src/plugins/todo/todoitemsprovider.cpp index 24ddabdeec..9538f89856 100644 --- a/src/plugins/todo/todoitemsprovider.cpp +++ b/src/plugins/todo/todoitemsprovider.cpp @@ -1,8 +1,8 @@ /************************************************************************** ** -** Copyright (c) 2014 Dmitry Savchenko -** Copyright (c) 2014 Vasiliy Sorokin -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 Dmitry Savchenko +** Copyright (C) 2015 Vasiliy Sorokin +** Contact: http://www.qt.io/licensing ** ** This file is part of Qt Creator. ** @@ -10,8 +10,8 @@ ** 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://www.qt.io/licensing. For further information +** a written agreement between you and The Qt Company. For licensing terms and +** conditions see http://www.qt.io/terms-conditions. For further information ** use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** In addition, as a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ****************************************************************************/ diff --git a/src/plugins/todo/todoitemsprovider.h b/src/plugins/todo/todoitemsprovider.h index 27d9ce837c..dfb209e044 100644 --- a/src/plugins/todo/todoitemsprovider.h +++ b/src/plugins/todo/todoitemsprovider.h @@ -1,8 +1,8 @@ /************************************************************************** ** -** Copyright (c) 2014 Dmitry Savchenko -** Copyright (c) 2014 Vasiliy Sorokin -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 Dmitry Savchenko +** Copyright (C) 2015 Vasiliy Sorokin +** Contact: http://www.qt.io/licensing ** ** This file is part of Qt Creator. ** @@ -10,8 +10,8 @@ ** 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://www.qt.io/licensing. For further information +** a written agreement between you and The Qt Company. For licensing terms and +** conditions see http://www.qt.io/terms-conditions. For further information ** use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** In addition, as a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ****************************************************************************/ diff --git a/src/plugins/todo/todoitemsscanner.cpp b/src/plugins/todo/todoitemsscanner.cpp index 9750d4cfe7..31826bb3c9 100644 --- a/src/plugins/todo/todoitemsscanner.cpp +++ b/src/plugins/todo/todoitemsscanner.cpp @@ -1,8 +1,8 @@ /************************************************************************** ** -** Copyright (c) 2014 Dmitry Savchenko -** Copyright (c) 2014 Vasiliy Sorokin -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 Dmitry Savchenko +** Copyright (C) 2015 Vasiliy Sorokin +** Contact: http://www.qt.io/licensing ** ** This file is part of Qt Creator. ** @@ -10,8 +10,8 @@ ** 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://www.qt.io/licensing. For further information +** a written agreement between you and The Qt Company. For licensing terms and +** conditions see http://www.qt.io/terms-conditions. For further information ** use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** In addition, as a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ****************************************************************************/ diff --git a/src/plugins/todo/todoitemsscanner.h b/src/plugins/todo/todoitemsscanner.h index fac814ef60..32286d7e58 100644 --- a/src/plugins/todo/todoitemsscanner.h +++ b/src/plugins/todo/todoitemsscanner.h @@ -1,8 +1,8 @@ /************************************************************************** ** -** Copyright (c) 2014 Dmitry Savchenko -** Copyright (c) 2014 Vasiliy Sorokin -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 Dmitry Savchenko +** Copyright (C) 2015 Vasiliy Sorokin +** Contact: http://www.qt.io/licensing ** ** This file is part of Qt Creator. ** @@ -10,8 +10,8 @@ ** 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://www.qt.io/licensing. For further information +** a written agreement between you and The Qt Company. For licensing terms and +** conditions see http://www.qt.io/terms-conditions. For further information ** use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** In addition, as a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ****************************************************************************/ diff --git a/src/plugins/todo/todooutputpane.cpp b/src/plugins/todo/todooutputpane.cpp index eeabbc55bc..b2330a5f45 100755 --- a/src/plugins/todo/todooutputpane.cpp +++ b/src/plugins/todo/todooutputpane.cpp @@ -1,8 +1,8 @@ /************************************************************************** ** -** Copyright (c) 2014 Dmitry Savchenko -** Copyright (c) 2014 Vasiliy Sorokin -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 Dmitry Savchenko +** Copyright (C) 2015 Vasiliy Sorokin +** Contact: http://www.qt.io/licensing ** ** This file is part of Qt Creator. ** @@ -10,8 +10,8 @@ ** 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://www.qt.io/licensing. For further information +** a written agreement between you and The Qt Company. For licensing terms and +** conditions see http://www.qt.io/terms-conditions. For further information ** use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** In addition, as a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ****************************************************************************/ diff --git a/src/plugins/todo/todooutputpane.h b/src/plugins/todo/todooutputpane.h index 0cd265f518..ab5f55932d 100755 --- a/src/plugins/todo/todooutputpane.h +++ b/src/plugins/todo/todooutputpane.h @@ -1,8 +1,8 @@ /************************************************************************** ** -** Copyright (c) 2014 Dmitry Savchenko -** Copyright (c) 2014 Vasiliy Sorokin -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 Dmitry Savchenko +** Copyright (C) 2015 Vasiliy Sorokin +** Contact: http://www.qt.io/licensing ** ** This file is part of Qt Creator. ** @@ -10,8 +10,8 @@ ** 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://www.qt.io/licensing. For further information +** a written agreement between you and The Qt Company. For licensing terms and +** conditions see http://www.qt.io/terms-conditions. For further information ** use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** In addition, as a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ****************************************************************************/ diff --git a/src/plugins/todo/todooutputtreeview.cpp b/src/plugins/todo/todooutputtreeview.cpp index 6840255b0d..612d1761b1 100644 --- a/src/plugins/todo/todooutputtreeview.cpp +++ b/src/plugins/todo/todooutputtreeview.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing ** ** This file is part of Qt Creator. ** @@ -9,8 +9,8 @@ ** 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://www.qt.io/licensing. For further information +** a written agreement between you and The Qt Company. For licensing terms and +** conditions see http://www.qt.io/terms-conditions. For further information ** use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage @@ -22,8 +22,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** In addition, as a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ****************************************************************************/ diff --git a/src/plugins/todo/todooutputtreeview.h b/src/plugins/todo/todooutputtreeview.h index 9dbd986707..306328bb15 100644 --- a/src/plugins/todo/todooutputtreeview.h +++ b/src/plugins/todo/todooutputtreeview.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing ** ** This file is part of Qt Creator. ** @@ -9,8 +9,8 @@ ** 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://www.qt.io/licensing. For further information +** a written agreement between you and The Qt Company. For licensing terms and +** conditions see http://www.qt.io/terms-conditions. For further information ** use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage @@ -22,8 +22,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** In addition, as a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ****************************************************************************/ diff --git a/src/plugins/todo/todoplugin.cpp b/src/plugins/todo/todoplugin.cpp index 4922e564ae..46a1b4bdaa 100755 --- a/src/plugins/todo/todoplugin.cpp +++ b/src/plugins/todo/todoplugin.cpp @@ -1,8 +1,8 @@ /************************************************************************** ** -** Copyright (c) 2014 Dmitry Savchenko -** Copyright (c) 2014 Vasiliy Sorokin -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 Dmitry Savchenko +** Copyright (C) 2015 Vasiliy Sorokin +** Contact: http://www.qt.io/licensing ** ** This file is part of Qt Creator. ** @@ -10,8 +10,8 @@ ** 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://www.qt.io/licensing. For further information +** a written agreement between you and The Qt Company. For licensing terms and +** conditions see http://www.qt.io/terms-conditions. For further information ** use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** In addition, as a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ****************************************************************************/ diff --git a/src/plugins/todo/todoplugin.h b/src/plugins/todo/todoplugin.h index 006a99d60b..83776d7ddd 100755 --- a/src/plugins/todo/todoplugin.h +++ b/src/plugins/todo/todoplugin.h @@ -1,8 +1,8 @@ /************************************************************************** ** -** Copyright (c) 2014 Dmitry Savchenko -** Copyright (c) 2014 Vasiliy Sorokin -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 Dmitry Savchenko +** Copyright (C) 2015 Vasiliy Sorokin +** Contact: http://www.qt.io/licensing ** ** This file is part of Qt Creator. ** @@ -10,8 +10,8 @@ ** 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://www.qt.io/licensing. For further information +** a written agreement between you and The Qt Company. For licensing terms and +** conditions see http://www.qt.io/terms-conditions. For further information ** use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** In addition, as a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ****************************************************************************/ |