diff options
47 files changed, 611 insertions, 558 deletions
diff --git a/installerbuilder/libinstaller/globalsettingsoperation.cpp b/installerbuilder/libinstaller/globalsettingsoperation.cpp index ecc03318f..b23be16a6 100644 --- a/installerbuilder/libinstaller/globalsettingsoperation.cpp +++ b/installerbuilder/libinstaller/globalsettingsoperation.cpp @@ -1,17 +1,11 @@ /************************************************************************** ** -** This file is part of Installer Framework** +** This file is part of Installer Framework ** -** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies).* +** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation qt-info@nokia.com** +** Contact: Nokia Corporation (info@qt.nokia.com) ** -** No Commercial Usage -** -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. ** ** GNU Lesser General Public License Usage ** @@ -23,13 +17,19 @@ ** 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 version -** 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** Other Usage ** -** If you are unsure which license is appropriate for your use, please contact -** (qt-info@nokia.com). +** 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. ** **************************************************************************/ + #include "globalsettingsoperation.h" #include "qsettingswrapper.h" diff --git a/installerbuilder/libinstaller/init.cpp b/installerbuilder/libinstaller/init.cpp index 97745ffa1..04fece37f 100644 --- a/installerbuilder/libinstaller/init.cpp +++ b/installerbuilder/libinstaller/init.cpp @@ -1,17 +1,11 @@ /************************************************************************** ** -** This file is part of Installer Framework** +** This file is part of Installer Framework ** -** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies).* +** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation qt-info@nokia.com** +** Contact: Nokia Corporation (info@qt.nokia.com) ** -** No Commercial Usage -** -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. ** ** GNU Lesser General Public License Usage ** @@ -23,13 +17,19 @@ ** 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 version -** 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** Other Usage ** -** If you are unsure which license is appropriate for your use, please contact -** (qt-info@nokia.com). +** 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. ** **************************************************************************/ + #include "init.h" #include "createshortcutoperation.h" diff --git a/installerbuilder/libinstaller/installiconsoperation.cpp b/installerbuilder/libinstaller/installiconsoperation.cpp index 4716a3493..be5d6e078 100644 --- a/installerbuilder/libinstaller/installiconsoperation.cpp +++ b/installerbuilder/libinstaller/installiconsoperation.cpp @@ -1,17 +1,11 @@ /************************************************************************** ** -** This file is part of Installer Framework** +** This file is part of Installer Framework ** -** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies).* +** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation qt-info@nokia.com** +** Contact: Nokia Corporation (info@qt.nokia.com) ** -** No Commercial Usage -** -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. ** ** GNU Lesser General Public License Usage ** @@ -23,13 +17,19 @@ ** 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 version -** 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** Other Usage ** -** If you are unsure which license is appropriate for your use, please contact -** (qt-info@nokia.com). +** 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. ** **************************************************************************/ + #include "installiconsoperation.h" #include "common/fileutils.h" diff --git a/installerbuilder/libinstaller/lazyplaintextedit.cpp b/installerbuilder/libinstaller/lazyplaintextedit.cpp index 702e3624c..8e5790f92 100644 --- a/installerbuilder/libinstaller/lazyplaintextedit.cpp +++ b/installerbuilder/libinstaller/lazyplaintextedit.cpp @@ -1,17 +1,11 @@ /************************************************************************** ** -** This file is part of Installer Framework** +** This file is part of Installer Framework ** -** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies).* +** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation qt-info@nokia.com** +** Contact: Nokia Corporation (info@qt.nokia.com) ** -** No Commercial Usage -** -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. ** ** GNU Lesser General Public License Usage ** @@ -23,13 +17,19 @@ ** 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 version -** 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** Other Usage ** -** If you are unsure which license is appropriate for your use, please contact -** (qt-info@nokia.com). +** 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. ** **************************************************************************/ + #include "lazyplaintextedit.h" #include <QScrollBar> diff --git a/installerbuilder/libinstaller/licenseoperation.cpp b/installerbuilder/libinstaller/licenseoperation.cpp index 8aed63fed..fbb0ed1c6 100644 --- a/installerbuilder/libinstaller/licenseoperation.cpp +++ b/installerbuilder/libinstaller/licenseoperation.cpp @@ -1,17 +1,11 @@ /************************************************************************** ** -** This file is part of Installer Framework** +** This file is part of Installer Framework ** -** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies).* +** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation qt-info@nokia.com** +** Contact: Nokia Corporation (info@qt.nokia.com) ** -** No Commercial Usage -** -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. ** ** GNU Lesser General Public License Usage ** @@ -23,13 +17,19 @@ ** 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 version -** 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** Other Usage ** -** If you are unsure which license is appropriate for your use, please contact -** (qt-info@nokia.com). +** 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. ** **************************************************************************/ + #include "licenseoperation.h" #include "packagemanagercore.h" diff --git a/installerbuilder/libinstaller/linereplaceoperation.cpp b/installerbuilder/libinstaller/linereplaceoperation.cpp index 05ddc33fd..8627fd61b 100644 --- a/installerbuilder/libinstaller/linereplaceoperation.cpp +++ b/installerbuilder/libinstaller/linereplaceoperation.cpp @@ -1,17 +1,11 @@ /************************************************************************** ** -** This file is part of Installer Framework** +** This file is part of Installer Framework ** -** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies).* +** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation qt-info@nokia.com** +** Contact: Nokia Corporation (info@qt.nokia.com) ** -** No Commercial Usage -** -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. ** ** GNU Lesser General Public License Usage ** @@ -23,13 +17,19 @@ ** 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 version -** 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** Other Usage ** -** If you are unsure which license is appropriate for your use, please contact -** (qt-info@nokia.com). +** 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. ** **************************************************************************/ + #include "linereplaceoperation.h" #include <QtCore/QDir> diff --git a/installerbuilder/libinstaller/macrelocateqt.cpp b/installerbuilder/libinstaller/macrelocateqt.cpp index 09c360540..c3cc754ec 100644 --- a/installerbuilder/libinstaller/macrelocateqt.cpp +++ b/installerbuilder/libinstaller/macrelocateqt.cpp @@ -1,17 +1,11 @@ /************************************************************************** ** -** This file is part of Installer Framework** +** This file is part of Installer Framework ** -** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies).* +** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation qt-info@nokia.com** +** Contact: Nokia Corporation (info@qt.nokia.com) ** -** No Commercial Usage -** -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. ** ** GNU Lesser General Public License Usage ** @@ -23,13 +17,19 @@ ** 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 version -** 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** Other Usage ** -** If you are unsure which license is appropriate for your use, please contact -** (qt-info@nokia.com). +** 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. ** **************************************************************************/ + #include "macrelocateqt.h" #include "macreplaceinstallnamesoperation.h" diff --git a/installerbuilder/libinstaller/macreplaceinstallnamesoperation.cpp b/installerbuilder/libinstaller/macreplaceinstallnamesoperation.cpp index 4d1b3a2c2..14f744674 100644 --- a/installerbuilder/libinstaller/macreplaceinstallnamesoperation.cpp +++ b/installerbuilder/libinstaller/macreplaceinstallnamesoperation.cpp @@ -1,17 +1,11 @@ /************************************************************************** ** -** This file is part of Installer Framework** +** This file is part of Installer Framework ** -** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies).* +** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation qt-info@nokia.com** +** Contact: Nokia Corporation (info@qt.nokia.com) ** -** No Commercial Usage -** -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. ** ** GNU Lesser General Public License Usage ** @@ -23,13 +17,19 @@ ** 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 version -** 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** Other Usage ** -** If you are unsure which license is appropriate for your use, please contact -** (qt-info@nokia.com). +** 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. ** **************************************************************************/ + #include "macreplaceinstallnamesoperation.h" #include "qprocesswrapper.h" diff --git a/installerbuilder/libinstaller/messageboxhandler.cpp b/installerbuilder/libinstaller/messageboxhandler.cpp index 167ad5ba7..242bba5ce 100644 --- a/installerbuilder/libinstaller/messageboxhandler.cpp +++ b/installerbuilder/libinstaller/messageboxhandler.cpp @@ -1,17 +1,11 @@ /************************************************************************** ** -** This file is part of Installer Framework** +** This file is part of Installer Framework ** -** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies).* +** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation qt-info@nokia.com** +** Contact: Nokia Corporation (info@qt.nokia.com) ** -** No Commercial Usage -** -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. ** ** GNU Lesser General Public License Usage ** @@ -23,13 +17,19 @@ ** 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 version -** 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** Other Usage ** -** If you are unsure which license is appropriate for your use, please contact -** (qt-info@nokia.com). +** 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. ** **************************************************************************/ + #include "messageboxhandler.h" #include <QtCore/QDebug> diff --git a/installerbuilder/libinstaller/minimumprogressoperation.cpp b/installerbuilder/libinstaller/minimumprogressoperation.cpp index 6e5d847db..5a1ab30de 100644 --- a/installerbuilder/libinstaller/minimumprogressoperation.cpp +++ b/installerbuilder/libinstaller/minimumprogressoperation.cpp @@ -1,17 +1,11 @@ /************************************************************************** ** -** This file is part of Installer Framework** +** This file is part of Installer Framework ** -** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies).* +** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation qt-info@nokia.com** +** Contact: Nokia Corporation (info@qt.nokia.com) ** -** No Commercial Usage -** -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. ** ** GNU Lesser General Public License Usage ** @@ -23,13 +17,19 @@ ** 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 version -** 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** Other Usage ** -** If you are unsure which license is appropriate for your use, please contact -** (qt-info@nokia.com). +** 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. ** **************************************************************************/ + #include "minimumprogressoperation.h" using namespace QInstaller; diff --git a/installerbuilder/libinstaller/operationrunner.cpp b/installerbuilder/libinstaller/operationrunner.cpp index 6c78d9006..12af4c6d8 100644 --- a/installerbuilder/libinstaller/operationrunner.cpp +++ b/installerbuilder/libinstaller/operationrunner.cpp @@ -1,17 +1,11 @@ /************************************************************************** ** -** This file is part of Installer Framework** +** This file is part of Installer Framework ** -** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies).* +** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation qt-info@nokia.com** +** Contact: Nokia Corporation (info@qt.nokia.com) ** -** No Commercial Usage -** -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. ** ** GNU Lesser General Public License Usage ** @@ -23,13 +17,19 @@ ** 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 version -** 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** Other Usage ** -** If you are unsure which license is appropriate for your use, please contact -** (qt-info@nokia.com). +** 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. ** **************************************************************************/ + #include "operationrunner.h" #include "common/errors.h" diff --git a/installerbuilder/libinstaller/packagemanagercore.cpp b/installerbuilder/libinstaller/packagemanagercore.cpp index 319e67853..ebd970401 100644 --- a/installerbuilder/libinstaller/packagemanagercore.cpp +++ b/installerbuilder/libinstaller/packagemanagercore.cpp @@ -1,17 +1,11 @@ /************************************************************************** ** -** This file is part of Installer Framework** +** This file is part of Installer Framework ** -** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies).* +** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation qt-info@nokia.com** +** Contact: Nokia Corporation (info@qt.nokia.com) ** -** No Commercial Usage -** -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. ** ** GNU Lesser General Public License Usage ** @@ -23,13 +17,19 @@ ** 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 version -** 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** Other Usage ** -** If you are unsure which license is appropriate for your use, please contact -** (qt-info@nokia.com). +** 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. ** **************************************************************************/ + #include "packagemanagercore.h" #include "adminauthorization.h" diff --git a/installerbuilder/libinstaller/packagemanagercore_p.cpp b/installerbuilder/libinstaller/packagemanagercore_p.cpp index 2e1bd1e56..9de281ced 100644 --- a/installerbuilder/libinstaller/packagemanagercore_p.cpp +++ b/installerbuilder/libinstaller/packagemanagercore_p.cpp @@ -1,17 +1,11 @@ /************************************************************************** ** -** This file is part of Installer Framework** +** This file is part of Installer Framework ** -** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies).* +** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation qt-info@nokia.com** +** Contact: Nokia Corporation (info@qt.nokia.com) ** -** No Commercial Usage -** -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. ** ** GNU Lesser General Public License Usage ** @@ -23,13 +17,19 @@ ** 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 version -** 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** Other Usage ** -** If you are unsure which license is appropriate for your use, please contact -** (qt-info@nokia.com). +** 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. ** **************************************************************************/ + #include "packagemanagercore_p.h" #include "adminauthorization.h" diff --git a/installerbuilder/libinstaller/packagemanagergui.cpp b/installerbuilder/libinstaller/packagemanagergui.cpp index 1c51a46ab..863be8f03 100644 --- a/installerbuilder/libinstaller/packagemanagergui.cpp +++ b/installerbuilder/libinstaller/packagemanagergui.cpp @@ -1,17 +1,11 @@ /************************************************************************** ** -** This file is part of Installer Framework** +** This file is part of Installer Framework ** -** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies).* +** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation qt-info@nokia.com** +** Contact: Nokia Corporation (info@qt.nokia.com) ** -** No Commercial Usage -** -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. ** ** GNU Lesser General Public License Usage ** @@ -23,11 +17,16 @@ ** 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 version -** 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** rights. These rights are described in the Nokia 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 are unsure which license is appropriate for your use, please contact -** (qt-info@nokia.com). +** If you have questions regarding the use of this file, please contact +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/installerbuilder/libinstaller/packagemanagerproxyfactory.cpp b/installerbuilder/libinstaller/packagemanagerproxyfactory.cpp index bb5689625..0ccd33909 100644 --- a/installerbuilder/libinstaller/packagemanagerproxyfactory.cpp +++ b/installerbuilder/libinstaller/packagemanagerproxyfactory.cpp @@ -29,6 +29,7 @@ ** Nokia at info@qt.nokia.com. ** **************************************************************************/ + #include "packagemanagerproxyfactory.h" #include "packagemanagercore.h" diff --git a/installerbuilder/libinstaller/performinstallationform.cpp b/installerbuilder/libinstaller/performinstallationform.cpp index 85a6e9ce9..fae7c04b6 100644 --- a/installerbuilder/libinstaller/performinstallationform.cpp +++ b/installerbuilder/libinstaller/performinstallationform.cpp @@ -1,17 +1,11 @@ /************************************************************************** ** -** This file is part of Installer Framework** +** This file is part of Installer Framework ** -** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies).* +** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation qt-info@nokia.com** +** Contact: Nokia Corporation (info@qt.nokia.com) ** -** No Commercial Usage -** -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. ** ** GNU Lesser General Public License Usage ** @@ -23,13 +17,19 @@ ** 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 version -** 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** Other Usage ** -** If you are unsure which license is appropriate for your use, please contact -** (qt-info@nokia.com). +** 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. ** **************************************************************************/ + #include "performinstallationform.h" #include "lazyplaintextedit.h" diff --git a/installerbuilder/libinstaller/persistentsettings.cpp b/installerbuilder/libinstaller/persistentsettings.cpp index 904c8a31f..b7c9f0a0c 100644 --- a/installerbuilder/libinstaller/persistentsettings.cpp +++ b/installerbuilder/libinstaller/persistentsettings.cpp @@ -1,33 +1,32 @@ /************************************************************************** ** -** This file is part of Qt Creator +** This file is part of Installer Framework ** ** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: Nokia Corporation (info@qt.nokia.com) ** -** No Commercial Usage -** -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. ** ** 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 +** rights. These rights are described in the Nokia 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 qt-info@nokia.com. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/installerbuilder/libinstaller/progresscoordinator.cpp b/installerbuilder/libinstaller/progresscoordinator.cpp index d46515ac9..19f6c3fca 100644 --- a/installerbuilder/libinstaller/progresscoordinator.cpp +++ b/installerbuilder/libinstaller/progresscoordinator.cpp @@ -1,17 +1,11 @@ /************************************************************************** ** -** This file is part of Installer Framework** +** This file is part of Installer Framework ** -** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies).* +** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation qt-info@nokia.com** +** Contact: Nokia Corporation (info@qt.nokia.com) ** -** No Commercial Usage -** -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. ** ** GNU Lesser General Public License Usage ** @@ -23,13 +17,19 @@ ** 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 version -** 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** Other Usage ** -** If you are unsure which license is appropriate for your use, please contact -** (qt-info@nokia.com). +** 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. ** **************************************************************************/ + #include "progresscoordinator.h" #include <QtCore/QCoreApplication> diff --git a/installerbuilder/libinstaller/qprocesswrapper.cpp b/installerbuilder/libinstaller/qprocesswrapper.cpp index 7d972ba83..ff338c689 100644 --- a/installerbuilder/libinstaller/qprocesswrapper.cpp +++ b/installerbuilder/libinstaller/qprocesswrapper.cpp @@ -1,10 +1,11 @@ /************************************************************************** ** -** This file is part of Installer Framework** +** This file is part of Installer Framework ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).* +** Copyright (c) 2010-2012 Nokia Corporation and/or its subsidiary(-ies). +** +** Contact: Nokia Corporation (info@qt.nokia.com) ** -** Contact: Nokia Corporation qt-info@nokia.com** ** ** GNU Lesser General Public License Usage ** @@ -16,13 +17,19 @@ ** 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 version -** 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** Other Usage ** -** If you are unsure which license is appropriate for your use, please contact -** (qt-info@nokia.com). +** 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. ** **************************************************************************/ + #include "qprocesswrapper.h" #include "fsengineclient.h" diff --git a/installerbuilder/libinstaller/qsettingswrapper.cpp b/installerbuilder/libinstaller/qsettingswrapper.cpp index bd655a340..379c2b116 100644 --- a/installerbuilder/libinstaller/qsettingswrapper.cpp +++ b/installerbuilder/libinstaller/qsettingswrapper.cpp @@ -1,17 +1,11 @@ /************************************************************************** ** -** This file is part of Installer Framework** +** This file is part of Installer Framework ** -** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies).* +** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation qt-info@nokia.com** +** Contact: Nokia Corporation (info@qt.nokia.com) ** -** No Commercial Usage -** -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. ** ** GNU Lesser General Public License Usage ** @@ -23,13 +17,19 @@ ** 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 version -** 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** Other Usage ** -** If you are unsure which license is appropriate for your use, please contact -** (qt-info@nokia.com). +** 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. ** **************************************************************************/ + #include "qsettingswrapper.h" #include "fsengineclient.h" diff --git a/installerbuilder/libinstaller/qtcreatorpersistentsettings.cpp b/installerbuilder/libinstaller/qtcreatorpersistentsettings.cpp index fe40ccb22..5647d9d43 100644 --- a/installerbuilder/libinstaller/qtcreatorpersistentsettings.cpp +++ b/installerbuilder/libinstaller/qtcreatorpersistentsettings.cpp @@ -1,3 +1,35 @@ +/************************************************************************** +** +** This file is part of Installer Framework +** +** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies). +** +** Contact: Nokia Corporation (info@qt.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. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia 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. +** +**************************************************************************/ + #include "qtcreatorpersistentsettings.h" #include "qtcreator_constants.h" diff --git a/installerbuilder/libinstaller/qtpatch.cpp b/installerbuilder/libinstaller/qtpatch.cpp index cfcaeabdf..99f669fba 100644 --- a/installerbuilder/libinstaller/qtpatch.cpp +++ b/installerbuilder/libinstaller/qtpatch.cpp @@ -1,17 +1,11 @@ /************************************************************************** ** -** This file is part of Installer Framework** +** This file is part of Installer Framework ** -** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies).* +** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation qt-info@nokia.com** +** Contact: Nokia Corporation (info@qt.nokia.com) ** -** No Commercial Usage -** -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. ** ** GNU Lesser General Public License Usage ** @@ -23,13 +17,19 @@ ** 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 version -** 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** Other Usage ** -** If you are unsure which license is appropriate for your use, please contact -** (qt-info@nokia.com). +** 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. ** **************************************************************************/ + #include "qtpatch.h" #include <QString> diff --git a/installerbuilder/libinstaller/qtpatchoperation.cpp b/installerbuilder/libinstaller/qtpatchoperation.cpp index 5b3a80229..cecdcbbb1 100644 --- a/installerbuilder/libinstaller/qtpatchoperation.cpp +++ b/installerbuilder/libinstaller/qtpatchoperation.cpp @@ -1,17 +1,11 @@ /************************************************************************** ** -** This file is part of Installer Framework** +** This file is part of Installer Framework ** -** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies).* +** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation qt-info@nokia.com** +** Contact: Nokia Corporation (info@qt.nokia.com) ** -** No Commercial Usage -** -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. ** ** GNU Lesser General Public License Usage ** @@ -23,13 +17,19 @@ ** 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 version -** 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** Other Usage ** -** If you are unsure which license is appropriate for your use, please contact -** (qt-info@nokia.com). +** 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. ** **************************************************************************/ + #include "qtpatchoperation.h" #include "qtpatch.h" #ifdef Q_OS_MAC diff --git a/installerbuilder/libinstaller/registerdefaultdebuggeroperation.cpp b/installerbuilder/libinstaller/registerdefaultdebuggeroperation.cpp index 74a1aee53..5f1a40083 100644 --- a/installerbuilder/libinstaller/registerdefaultdebuggeroperation.cpp +++ b/installerbuilder/libinstaller/registerdefaultdebuggeroperation.cpp @@ -1,17 +1,11 @@ /************************************************************************** ** -** This file is part of Installer Framework** +** This file is part of Installer Framework ** -** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies).* +** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation qt-info@nokia.com** +** Contact: Nokia Corporation (info@qt.nokia.com) ** -** No Commercial Usage -** -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. ** ** GNU Lesser General Public License Usage ** @@ -23,13 +17,19 @@ ** 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 version -** 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** Other Usage ** -** If you are unsure which license is appropriate for your use, please contact -** (qt-info@nokia.com). +** 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. ** **************************************************************************/ + #include "registerdefaultdebuggeroperation.h" #include "constants.h" diff --git a/installerbuilder/libinstaller/registerdocumentationoperation.cpp b/installerbuilder/libinstaller/registerdocumentationoperation.cpp index 69404b070..5399c85bc 100644 --- a/installerbuilder/libinstaller/registerdocumentationoperation.cpp +++ b/installerbuilder/libinstaller/registerdocumentationoperation.cpp @@ -1,17 +1,11 @@ /************************************************************************** ** -** This file is part of Installer Framework** +** This file is part of Installer Framework ** -** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies).* +** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation qt-info@nokia.com** +** Contact: Nokia Corporation (info@qt.nokia.com) ** -** No Commercial Usage -** -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. ** ** GNU Lesser General Public License Usage ** @@ -23,13 +17,19 @@ ** 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 version -** 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** Other Usage ** -** If you are unsure which license is appropriate for your use, please contact -** (qt-info@nokia.com). +** 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. ** **************************************************************************/ + #include "registerdocumentationoperation.h" #include <QSettings> diff --git a/installerbuilder/libinstaller/registerfiletypeoperation.cpp b/installerbuilder/libinstaller/registerfiletypeoperation.cpp index 88ceb3073..b97ab7984 100644 --- a/installerbuilder/libinstaller/registerfiletypeoperation.cpp +++ b/installerbuilder/libinstaller/registerfiletypeoperation.cpp @@ -1,17 +1,11 @@ /************************************************************************** ** -** This file is part of Installer Framework** +** This file is part of Installer Framework ** -** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies).* +** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation qt-info@nokia.com** +** Contact: Nokia Corporation (info@qt.nokia.com) ** -** No Commercial Usage -** -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. ** ** GNU Lesser General Public License Usage ** @@ -23,13 +17,19 @@ ** 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 version -** 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** Other Usage ** -** If you are unsure which license is appropriate for your use, please contact -** (qt-info@nokia.com). +** 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. ** **************************************************************************/ + #include "registerfiletypeoperation.h" #include "qsettingswrapper.h" diff --git a/installerbuilder/libinstaller/registerqtoperation.cpp b/installerbuilder/libinstaller/registerqtoperation.cpp index 823d67ee4..78d1ff8fe 100644 --- a/installerbuilder/libinstaller/registerqtoperation.cpp +++ b/installerbuilder/libinstaller/registerqtoperation.cpp @@ -1,17 +1,11 @@ /************************************************************************** ** -** This file is part of Installer Framework** +** This file is part of Installer Framework ** -** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies).* +** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation qt-info@nokia.com** +** Contact: Nokia Corporation (info@qt.nokia.com) ** -** No Commercial Usage -** -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. ** ** GNU Lesser General Public License Usage ** @@ -23,13 +17,19 @@ ** 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 version -** 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** Other Usage ** -** If you are unsure which license is appropriate for your use, please contact -** (qt-info@nokia.com). +** 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. ** **************************************************************************/ + #include "registerqtoperation.h" #include "component.h" diff --git a/installerbuilder/libinstaller/registerqtv23operation.cpp b/installerbuilder/libinstaller/registerqtv23operation.cpp index 6fb449c1c..4ec8d7756 100644 --- a/installerbuilder/libinstaller/registerqtv23operation.cpp +++ b/installerbuilder/libinstaller/registerqtv23operation.cpp @@ -1,17 +1,11 @@ /************************************************************************** ** -** This file is part of Installer Framework** +** This file is part of Installer Framework ** -** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies).* +** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation qt-info@nokia.com** +** Contact: Nokia Corporation (info@qt.nokia.com) ** -** No Commercial Usage -** -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. ** ** GNU Lesser General Public License Usage ** @@ -23,13 +17,19 @@ ** 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 version -** 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** Other Usage ** -** If you are unsure which license is appropriate for your use, please contact -** (qt-info@nokia.com). +** 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. ** **************************************************************************/ + #include "registerqtv23operation.h" #include "constants.h" diff --git a/installerbuilder/libinstaller/registerqtv2operation.cpp b/installerbuilder/libinstaller/registerqtv2operation.cpp index f5ed5b120..9ad5acb10 100644 --- a/installerbuilder/libinstaller/registerqtv2operation.cpp +++ b/installerbuilder/libinstaller/registerqtv2operation.cpp @@ -1,17 +1,11 @@ /************************************************************************** ** -** This file is part of Installer Framework** +** This file is part of Installer Framework ** -** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies).* +** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation qt-info@nokia.com** +** Contact: Nokia Corporation (info@qt.nokia.com) ** -** No Commercial Usage -** -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. ** ** GNU Lesser General Public License Usage ** @@ -23,13 +17,19 @@ ** 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 version -** 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** Other Usage ** -** If you are unsure which license is appropriate for your use, please contact -** (qt-info@nokia.com). +** 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. ** **************************************************************************/ + #include "registerqtv2operation.h" #include "constants.h" diff --git a/installerbuilder/libinstaller/registertoolchainoperation.cpp b/installerbuilder/libinstaller/registertoolchainoperation.cpp index da859bd50..1abdcbaa1 100644 --- a/installerbuilder/libinstaller/registertoolchainoperation.cpp +++ b/installerbuilder/libinstaller/registertoolchainoperation.cpp @@ -1,17 +1,11 @@ /************************************************************************** ** -** This file is part of Installer Framework** +** This file is part of Installer Framework ** -** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies).* +** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation qt-info@nokia.com** +** Contact: Nokia Corporation (info@qt.nokia.com) ** -** No Commercial Usage -** -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. ** ** GNU Lesser General Public License Usage ** @@ -23,13 +17,19 @@ ** 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 version -** 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** Other Usage ** -** If you are unsure which license is appropriate for your use, please contact -** (qt-info@nokia.com). +** 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. ** **************************************************************************/ + #include "registertoolchainoperation.h" #include "constants.h" diff --git a/installerbuilder/libinstaller/replaceoperation.cpp b/installerbuilder/libinstaller/replaceoperation.cpp index eb99ceccc..21f61eac2 100644 --- a/installerbuilder/libinstaller/replaceoperation.cpp +++ b/installerbuilder/libinstaller/replaceoperation.cpp @@ -1,17 +1,11 @@ /************************************************************************** ** -** This file is part of Installer Framework** +** This file is part of Installer Framework ** -** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies).* +** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation qt-info@nokia.com** +** Contact: Nokia Corporation (info@qt.nokia.com) ** -** No Commercial Usage -** -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. ** ** GNU Lesser General Public License Usage ** @@ -23,13 +17,19 @@ ** 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 version -** 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** Other Usage ** -** If you are unsure which license is appropriate for your use, please contact -** (qt-info@nokia.com). +** 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. ** **************************************************************************/ + #include "replaceoperation.h" #include <QtCore/QDir> diff --git a/installerbuilder/libinstaller/selfrestartoperation.cpp b/installerbuilder/libinstaller/selfrestartoperation.cpp index 6d09379b8..36925293b 100644 --- a/installerbuilder/libinstaller/selfrestartoperation.cpp +++ b/installerbuilder/libinstaller/selfrestartoperation.cpp @@ -1,17 +1,11 @@ /************************************************************************** ** -** This file is part of Installer Framework** +** This file is part of Installer Framework ** -** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies).* +** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation qt-info@nokia.com** +** Contact: Nokia Corporation (info@qt.nokia.com) ** -** No Commercial Usage -** -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. ** ** GNU Lesser General Public License Usage ** @@ -23,13 +17,19 @@ ** 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 version -** 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** Other Usage ** -** If you are unsure which license is appropriate for your use, please contact -** (qt-info@nokia.com). +** 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. ** **************************************************************************/ + #include "selfrestartoperation.h" #include "packagemanagercore.h" diff --git a/installerbuilder/libinstaller/setdemospathonqtoperation.cpp b/installerbuilder/libinstaller/setdemospathonqtoperation.cpp index 2a5a590f0..d7cd7e06c 100644 --- a/installerbuilder/libinstaller/setdemospathonqtoperation.cpp +++ b/installerbuilder/libinstaller/setdemospathonqtoperation.cpp @@ -1,17 +1,11 @@ /************************************************************************** ** -** This file is part of Installer Framework** +** This file is part of Installer Framework ** -** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies).* +** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation qt-info@nokia.com** +** Contact: Nokia Corporation (info@qt.nokia.com) ** -** No Commercial Usage -** -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. ** ** GNU Lesser General Public License Usage ** @@ -23,13 +17,19 @@ ** 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 version -** 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** Other Usage ** -** If you are unsure which license is appropriate for your use, please contact -** (qt-info@nokia.com). +** 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. ** **************************************************************************/ + #include "setdemospathonqtoperation.h" #include "qtpatch.h" diff --git a/installerbuilder/libinstaller/setexamplespathonqtoperation.cpp b/installerbuilder/libinstaller/setexamplespathonqtoperation.cpp index 41eb33a5a..d29d43333 100644 --- a/installerbuilder/libinstaller/setexamplespathonqtoperation.cpp +++ b/installerbuilder/libinstaller/setexamplespathonqtoperation.cpp @@ -1,17 +1,11 @@ /************************************************************************** ** -** This file is part of Installer Framework** +** This file is part of Installer Framework ** -** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies).* +** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation qt-info@nokia.com** +** Contact: Nokia Corporation (info@qt.nokia.com) ** -** No Commercial Usage -** -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. ** ** GNU Lesser General Public License Usage ** @@ -23,13 +17,19 @@ ** 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 version -** 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** Other Usage ** -** If you are unsure which license is appropriate for your use, please contact -** (qt-info@nokia.com). +** 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. ** **************************************************************************/ + #include "setexamplespathonqtoperation.h" #include "qtpatch.h" diff --git a/installerbuilder/libinstaller/setimportspathonqtcoreoperation.cpp b/installerbuilder/libinstaller/setimportspathonqtcoreoperation.cpp index 8ab3e2c46..10335ba9d 100644 --- a/installerbuilder/libinstaller/setimportspathonqtcoreoperation.cpp +++ b/installerbuilder/libinstaller/setimportspathonqtcoreoperation.cpp @@ -1,17 +1,11 @@ /************************************************************************** ** -** This file is part of Installer Framework** +** This file is part of Installer Framework ** -** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies).* +** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation qt-info@nokia.com** +** Contact: Nokia Corporation (info@qt.nokia.com) ** -** No Commercial Usage -** -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. ** ** GNU Lesser General Public License Usage ** @@ -23,13 +17,19 @@ ** 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 version -** 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** Other Usage ** -** If you are unsure which license is appropriate for your use, please contact -** (qt-info@nokia.com). +** 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. ** **************************************************************************/ + #include "setimportspathonqtcoreoperation.h" #include "qtpatch.h" diff --git a/installerbuilder/libinstaller/setpathonqtcoreoperation.cpp b/installerbuilder/libinstaller/setpathonqtcoreoperation.cpp index 033d43800..c05868c82 100644 --- a/installerbuilder/libinstaller/setpathonqtcoreoperation.cpp +++ b/installerbuilder/libinstaller/setpathonqtcoreoperation.cpp @@ -1,6 +1,6 @@ /************************************************************************** ** -** This file is part of Qt Installer Framework +** This file is part of Installer Framework ** ** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies). ** @@ -29,6 +29,7 @@ ** Nokia at info@qt.nokia.com. ** **************************************************************************/ + #include "setpathonqtcoreoperation.h" #include "qtpatch.h" diff --git a/installerbuilder/libinstaller/setpluginpathonqtcoreoperation.cpp b/installerbuilder/libinstaller/setpluginpathonqtcoreoperation.cpp index db37ae7c0..3948dbded 100644 --- a/installerbuilder/libinstaller/setpluginpathonqtcoreoperation.cpp +++ b/installerbuilder/libinstaller/setpluginpathonqtcoreoperation.cpp @@ -1,17 +1,11 @@ /************************************************************************** ** -** This file is part of Installer Framework** +** This file is part of Installer Framework ** -** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies).* +** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation qt-info@nokia.com** +** Contact: Nokia Corporation (info@qt.nokia.com) ** -** No Commercial Usage -** -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. ** ** GNU Lesser General Public License Usage ** @@ -23,13 +17,19 @@ ** 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 version -** 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** Other Usage ** -** If you are unsure which license is appropriate for your use, please contact -** (qt-info@nokia.com). +** 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. ** **************************************************************************/ + #include "setpluginpathonqtcoreoperation.h" #include "qtpatch.h" diff --git a/installerbuilder/libinstaller/setqtcreatorvalueoperation.cpp b/installerbuilder/libinstaller/setqtcreatorvalueoperation.cpp index 36a39d211..0dc8df991 100644 --- a/installerbuilder/libinstaller/setqtcreatorvalueoperation.cpp +++ b/installerbuilder/libinstaller/setqtcreatorvalueoperation.cpp @@ -1,17 +1,11 @@ /************************************************************************** ** -** This file is part of Installer Framework** +** This file is part of Installer Framework ** -** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies).* +** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation qt-info@nokia.com** +** Contact: Nokia Corporation (info@qt.nokia.com) ** -** No Commercial Usage -** -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. ** ** GNU Lesser General Public License Usage ** @@ -23,13 +17,19 @@ ** 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 version -** 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** Other Usage ** -** If you are unsure which license is appropriate for your use, please contact -** (qt-info@nokia.com). +** 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. ** **************************************************************************/ + #include "setqtcreatorvalueoperation.h" #include "qtcreator_constants.h" diff --git a/installerbuilder/libinstaller/settings.cpp b/installerbuilder/libinstaller/settings.cpp index b9d454fa0..4a7d24309 100644 --- a/installerbuilder/libinstaller/settings.cpp +++ b/installerbuilder/libinstaller/settings.cpp @@ -1,17 +1,11 @@ /************************************************************************** ** -** This file is part of Installer Framework** +** This file is part of Installer Framework ** -** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies).* +** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation qt-info@nokia.com** +** Contact: Nokia Corporation (info@qt.nokia.com) ** -** No Commercial Usage -** -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. ** ** GNU Lesser General Public License Usage ** @@ -23,13 +17,19 @@ ** 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 version -** 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** Other Usage ** -** If you are unsure which license is appropriate for your use, please contact -** (qt-info@nokia.com). +** 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. ** **************************************************************************/ + #include "settings.h" #include "common/errors.h" diff --git a/installerbuilder/libinstaller/simplemovefileoperation.cpp b/installerbuilder/libinstaller/simplemovefileoperation.cpp index 75f656f64..d1bf4f08a 100644 --- a/installerbuilder/libinstaller/simplemovefileoperation.cpp +++ b/installerbuilder/libinstaller/simplemovefileoperation.cpp @@ -1,17 +1,11 @@ /************************************************************************** ** -** This file is part of Installer Framework** +** This file is part of Installer Framework ** -** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies).* +** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation qt-info@nokia.com** +** Contact: Nokia Corporation (info@qt.nokia.com) ** -** No Commercial Usage -** -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. ** ** GNU Lesser General Public License Usage ** @@ -23,13 +17,19 @@ ** 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 version -** 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** Other Usage ** -** If you are unsure which license is appropriate for your use, please contact -** (qt-info@nokia.com). +** 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. ** **************************************************************************/ + #include "simplemovefileoperation.h" #include <QtCore/QFileInfo> diff --git a/installerbuilder/libinstaller/templates.cpp b/installerbuilder/libinstaller/templates.cpp index 2f02fb2d3..5afc0037d 100644 --- a/installerbuilder/libinstaller/templates.cpp +++ b/installerbuilder/libinstaller/templates.cpp @@ -1,10 +1,11 @@ /************************************************************************** ** -** This file is part of Installer Framework** +** This file is part of Installer Framework ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).* +** Copyright (c) 2010-2012 Nokia Corporation and/or its subsidiary(-ies). +** +** Contact: Nokia Corporation (info@qt.nokia.com) ** -** Contact: Nokia Corporation qt-info@nokia.com** ** ** GNU Lesser General Public License Usage ** @@ -16,13 +17,19 @@ ** 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 version -** 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** Other Usage ** -** If you are unsure which license is appropriate for your use, please contact -** (qt-info@nokia.com). +** 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. ** **************************************************************************/ + #include<QtCore/QIODevice> template<typename T> diff --git a/installerbuilder/libinstaller/updatecreatorsettingsfrom21to22operation.cpp b/installerbuilder/libinstaller/updatecreatorsettingsfrom21to22operation.cpp index 5603bc11b..22978af5e 100644 --- a/installerbuilder/libinstaller/updatecreatorsettingsfrom21to22operation.cpp +++ b/installerbuilder/libinstaller/updatecreatorsettingsfrom21to22operation.cpp @@ -1,17 +1,11 @@ /************************************************************************** ** -** This file is part of Installer Framework** +** This file is part of Installer Framework ** -** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies).* +** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation qt-info@nokia.com** +** Contact: Nokia Corporation (info@qt.nokia.com) ** -** No Commercial Usage -** -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. ** ** GNU Lesser General Public License Usage ** @@ -23,13 +17,19 @@ ** 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 version -** 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** Other Usage ** -** If you are unsure which license is appropriate for your use, please contact -** (qt-info@nokia.com). +** 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. ** **************************************************************************/ + #include "updatecreatorsettingsfrom21to22operation.h" #include "constants.h" diff --git a/installerbuilder/libinstaller/updater.cpp b/installerbuilder/libinstaller/updater.cpp index 6946ec2df..43148edb0 100644 --- a/installerbuilder/libinstaller/updater.cpp +++ b/installerbuilder/libinstaller/updater.cpp @@ -1,17 +1,11 @@ /************************************************************************** ** -** This file is part of Installer Framework** +** This file is part of Installer Framework ** -** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies).* +** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation qt-info@nokia.com** +** Contact: Nokia Corporation (info@qt.nokia.com) ** -** No Commercial Usage -** -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. ** ** GNU Lesser General Public License Usage ** @@ -23,13 +17,19 @@ ** 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 version -** 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** Other Usage ** -** If you are unsure which license is appropriate for your use, please contact -** (qt-info@nokia.com). +** 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. ** **************************************************************************/ + #include "updater.h" #include "common/binaryformat.h" diff --git a/installerbuilder/libinstaller/updatesettings.cpp b/installerbuilder/libinstaller/updatesettings.cpp index fe341fc90..6134be044 100644 --- a/installerbuilder/libinstaller/updatesettings.cpp +++ b/installerbuilder/libinstaller/updatesettings.cpp @@ -1,17 +1,11 @@ /************************************************************************** ** -** This file is part of Installer Framework** +** This file is part of Installer Framework ** -** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies).* +** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation qt-info@nokia.com** +** Contact: Nokia Corporation (info@qt.nokia.com) ** -** No Commercial Usage -** -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. ** ** GNU Lesser General Public License Usage ** @@ -23,13 +17,19 @@ ** 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 version -** 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** Other Usage ** -** If you are unsure which license is appropriate for your use, please contact -** (qt-info@nokia.com). +** 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. ** **************************************************************************/ + #include "updatesettings.h" #include "common/errors.h" diff --git a/installerbuilder/repogen/repogen.cpp b/installerbuilder/repogen/repogen.cpp index e9ac7373f..cfc1d2e36 100644 --- a/installerbuilder/repogen/repogen.cpp +++ b/installerbuilder/repogen/repogen.cpp @@ -1,17 +1,11 @@ /************************************************************************** ** -** This file is part of Installer Framework** +** This file is part of Installer Framework ** -** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies).* +** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation qt-info@nokia.com** +** Contact: Nokia Corporation (info@qt.nokia.com) ** -** No Commercial Usage -** -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. ** ** GNU Lesser General Public License Usage ** @@ -23,13 +17,19 @@ ** 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 version -** 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** Other Usage ** -** If you are unsure which license is appropriate for your use, please contact -** (qt-info@nokia.com). +** 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. ** **************************************************************************/ + #include <common/errors.h> #include <common/fileutils.h> #include <common/utils.h> diff --git a/installerbuilder/tests/environmentvariable/environmentvariabletest.cpp b/installerbuilder/tests/environmentvariable/environmentvariabletest.cpp index 2f4f8b204..e33be38a2 100644 --- a/installerbuilder/tests/environmentvariable/environmentvariabletest.cpp +++ b/installerbuilder/tests/environmentvariable/environmentvariabletest.cpp @@ -1,17 +1,11 @@ /************************************************************************** ** -** This file is part of Installer Framework** +** This file is part of Installer Framework ** -** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies).* +** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation qt-info@nokia.com** +** Contact: Nokia Corporation (info@qt.nokia.com) ** -** No Commercial Usage -** -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. ** ** GNU Lesser General Public License Usage ** @@ -23,13 +17,19 @@ ** 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 version -** 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** Other Usage ** -** If you are unsure which license is appropriate for your use, please contact -** (qt-info@nokia.com). +** 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. ** **************************************************************************/ + #include "environmentvariabletest.h" #include "environmentvariablesoperation.h" diff --git a/installerbuilder/tests/environmentvariable/environmentvariabletest.h b/installerbuilder/tests/environmentvariable/environmentvariabletest.h index 321a0dded..e76316637 100644 --- a/installerbuilder/tests/environmentvariable/environmentvariabletest.h +++ b/installerbuilder/tests/environmentvariable/environmentvariabletest.h @@ -1,10 +1,11 @@ /************************************************************************** ** -** This file is part of Installer Framework** +** This file is part of Installer Framework ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).* +** Copyright (c) 2010-2012 Nokia Corporation and/or its subsidiary(-ies). +** +** Contact: Nokia Corporation (info@qt.nokia.com) ** -** Contact: Nokia Corporation qt-info@nokia.com** ** ** GNU Lesser General Public License Usage ** @@ -16,13 +17,19 @@ ** 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 version -** 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** Other Usage ** -** If you are unsure which license is appropriate for your use, please contact -** (qt-info@nokia.com). +** 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. ** **************************************************************************/ + #ifndef EXTRACTIONARCHIVEOPERATIONTEST_H #define EXTRACTIONARCHIVEOPERATIONTEST_H |