summaryrefslogtreecommitdiff
path: root/src/app
diff options
context:
space:
mode:
authorhjk <qthjk@ovi.com>2012-10-02 09:12:39 +0200
committerEike Ziller <eike.ziller@digia.com>2012-10-05 17:12:56 +0200
commit386ca7c8dd71047fb70fdcfeb78042d4eda30f17 (patch)
tree200b067711a64d369ba699032d42952a997790d9 /src/app
parent0fc9e7c87735d5cc4ecadbe6d4656f620e2259cd (diff)
downloadqt-creator-386ca7c8dd71047fb70fdcfeb78042d4eda30f17.tar.gz
Adjust license headers
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Diffstat (limited to 'src/app')
-rw-r--r--src/app/Info.plist.in2
-rw-r--r--src/app/app_version.h.in43
-rw-r--r--src/app/main.cpp41
3 files changed, 42 insertions, 44 deletions
diff --git a/src/app/Info.plist.in b/src/app/Info.plist.in
index 4ee4721450..67c1679956 100644
--- a/src/app/Info.plist.in
+++ b/src/app/Info.plist.in
@@ -202,7 +202,7 @@
</dict>
</array>
<key>NSHumanReadableCopyright</key>
- <string>(C) 2008-2011 Nokia Corporation</string>
+ <string>(C) 2012 Digia Plc</string>
<key>CFBundleIconFile</key>
<string>$$ICON</string>
<key>CFBundlePackageType</key>
diff --git a/src/app/app_version.h.in b/src/app/app_version.h.in
index 6b332ffd6b..09d26adedc 100644
--- a/src/app/app_version.h.in
+++ b/src/app/app_version.h.in
@@ -1,32 +1,31 @@
-/**************************************************************************
+/****************************************************************************
**
-** This file is part of Qt Creator
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
**
-** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: http://www.qt-project.org/
+** This file is part of Qt Creator.
**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
**
** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
-** Other Usage
-**
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**************************************************************************/
+****************************************************************************/
#ifndef APP_VERSION_H
#define APP_VERSION_H
@@ -45,7 +44,7 @@ namespace Constants {
#define IDE_VERSION_RELEASE $$replace(QTCREATOR_VERSION, "^\\d+\\.\\d+\\.(\\d+)(-.*)?$", \\1)
const char * const IDE_VERSION_LONG = IDE_VERSION_STR;
-const char * const IDE_AUTHOR = \"Nokia Corporation\";
+const char * const IDE_AUTHOR = \"Digia Plc\";
const char * const IDE_YEAR = \"2012\";
#ifdef IDE_VERSION_DESCRIPTION
diff --git a/src/app/main.cpp b/src/app/main.cpp
index 42d63559f7..e9db0a152f 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -1,32 +1,31 @@
-/**************************************************************************
+/****************************************************************************
**
-** This file is part of Qt Creator
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
**
-** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: http://www.qt-project.org/
+** This file is part of Qt Creator.
**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
**
** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
-** Other Usage
-**
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**************************************************************************/
+****************************************************************************/
#include "qtsingleapplication.h"