summaryrefslogtreecommitdiffstats
path: root/tools/qtconcurrent
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2009-06-16 12:08:09 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2009-06-16 12:08:09 (GMT)
commit858c70f768eeb2d65cefd4115f4e9089b588b2d0 (patch)
treeae24d25b16318a3c479c30096985f4aac4bd2ff3 /tools/qtconcurrent
parent7f00209fe9face275e068d889973aa943cdfcb00 (diff)
downloadQt-858c70f768eeb2d65cefd4115f4e9089b588b2d0.zip
Qt-858c70f768eeb2d65cefd4115f4e9089b588b2d0.tar.gz
Qt-858c70f768eeb2d65cefd4115f4e9089b588b2d0.tar.bz2
Update license headers as requested by the marketing department.
Reviewed-by: Trust Me
Diffstat (limited to 'tools/qtconcurrent')
-rw-r--r--tools/qtconcurrent/codegenerator/example/main.cpp4
-rw-r--r--tools/qtconcurrent/codegenerator/src/codegenerator.cpp4
-rw-r--r--tools/qtconcurrent/codegenerator/src/codegenerator.h4
-rw-r--r--tools/qtconcurrent/generaterun/main.cpp16
4 files changed, 12 insertions, 16 deletions
diff --git a/tools/qtconcurrent/codegenerator/example/main.cpp b/tools/qtconcurrent/codegenerator/example/main.cpp
index 0cd4c49..9859c9a 100644
--- a/tools/qtconcurrent/codegenerator/example/main.cpp
+++ b/tools/qtconcurrent/codegenerator/example/main.cpp
@@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the tools applications of the Qt Toolkit.
**
@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** contact the sales department at http://www.qtsoftware.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/tools/qtconcurrent/codegenerator/src/codegenerator.cpp b/tools/qtconcurrent/codegenerator/src/codegenerator.cpp
index 62b66cc..7ae99d0 100644
--- a/tools/qtconcurrent/codegenerator/src/codegenerator.cpp
+++ b/tools/qtconcurrent/codegenerator/src/codegenerator.cpp
@@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the tools applications of the Qt Toolkit.
**
@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** contact the sales department at http://www.qtsoftware.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/tools/qtconcurrent/codegenerator/src/codegenerator.h b/tools/qtconcurrent/codegenerator/src/codegenerator.h
index 260ba8c..8ecc7cb 100644
--- a/tools/qtconcurrent/codegenerator/src/codegenerator.h
+++ b/tools/qtconcurrent/codegenerator/src/codegenerator.h
@@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the tools applications of the Qt Toolkit.
**
@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** contact the sales department at http://www.qtsoftware.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/tools/qtconcurrent/generaterun/main.cpp b/tools/qtconcurrent/generaterun/main.cpp
index 5dd18fb..43b338e 100644
--- a/tools/qtconcurrent/generaterun/main.cpp
+++ b/tools/qtconcurrent/generaterun/main.cpp
@@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the tools applications of the Qt Toolkit.
**
@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** contact the sales department at http://www.qtsoftware.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
@@ -326,11 +326,9 @@ int main()
Line("/****************************************************************************") +
Line("**") +
Line("** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).") +
- Line("** Contact: Qt Software Information (qt-info@nokia.com)") +
+ Line("** Contact: Nokia Corporation (qt-info@nokia.com)") +
Line("**") +
- Line("** This file is part of the " + dollarQuote("MODULE") + " of the Qt Toolkit.") +
- Line("**") +
- Line("** " + dollarQuote("TROLLTECH_DUAL_LICENSE")) +
+ Line("** This file is part of the Qt Toolkit.") +
Line("**") +
Line("****************************************************************************/") +
Line("") +
@@ -378,11 +376,9 @@ int main()
Line("/****************************************************************************") +
Line("**") +
Line("** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).") +
- Line("** Contact: Qt Software Information (qt-info@nokia.com)") +
- Line("**") +
- Line("** This file is part of the " + dollarQuote("MODULE") + " of the Qt Toolkit.") +
+ Line("** Contact: Nokia Corporation (qt-info@nokia.com)") +
Line("**") +
- Line("** " + dollarQuote("TROLLTECH_DUAL_LICENSE")) +
+ Line("** This file is part of the Qt Toolkit.") +
Line("**") +
Line("****************************************************************************/") +
Line("") +