summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@digia.com>2012-11-18 15:18:13 +0100
committerJoerg Bornemann <joerg.bornemann@digia.com>2012-11-19 11:12:33 +0100
commit3d66b4da57ad61fd8ac6065bde8c6bba12fed02e (patch)
treeef0f4773ef4078557718fac7bed7a69de4457672
parent7002ca6899c72ceca73b260fc3bae09aa19bcc04 (diff)
license headers updated
Change-Id: I2a4444e68e0fbd11827ee3aa01794e4c64824d2f Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
-rw-r--r--src/app/application.cpp7
-rw-r--r--src/app/application.h7
-rw-r--r--src/app/main.cpp7
-rw-r--r--src/jomlib/commandexecutor.cpp7
-rw-r--r--src/jomlib/commandexecutor.h7
-rw-r--r--src/jomlib/dependencygraph.cpp7
-rw-r--r--src/jomlib/dependencygraph.h7
-rw-r--r--src/jomlib/exception.cpp7
-rw-r--r--src/jomlib/exception.h7
-rw-r--r--src/jomlib/fastfileinfo.cpp7
-rw-r--r--src/jomlib/fastfileinfo.h7
-rw-r--r--src/jomlib/filetime.cpp7
-rw-r--r--src/jomlib/filetime.h7
-rw-r--r--src/jomlib/helperfunctions.cpp7
-rw-r--r--src/jomlib/helperfunctions.h7
-rw-r--r--src/jomlib/iocompletionport.cpp7
-rw-r--r--src/jomlib/iocompletionport.h7
-rw-r--r--src/jomlib/macrotable.cpp7
-rw-r--r--src/jomlib/macrotable.h7
-rw-r--r--src/jomlib/makefile.cpp7
-rw-r--r--src/jomlib/makefile.h7
-rw-r--r--src/jomlib/makefilefactory.cpp7
-rw-r--r--src/jomlib/makefilefactory.h7
-rw-r--r--src/jomlib/makefilelinereader.cpp7
-rw-r--r--src/jomlib/makefilelinereader.h7
-rw-r--r--src/jomlib/options.cpp7
-rw-r--r--src/jomlib/options.h7
-rw-r--r--src/jomlib/parser.cpp7
-rw-r--r--src/jomlib/parser.h7
-rw-r--r--src/jomlib/ppexpr-lex.inc7
-rw-r--r--src/jomlib/ppexpr.g7
-rw-r--r--src/jomlib/ppexpr.l7
-rw-r--r--src/jomlib/preprocessor.cpp7
-rw-r--r--src/jomlib/preprocessor.h7
-rw-r--r--src/jomlib/process.cpp7
-rw-r--r--src/jomlib/process.h7
-rw-r--r--src/jomlib/stable.h7
-rw-r--r--src/jomlib/targetexecutor.cpp7
-rw-r--r--src/jomlib/targetexecutor.h7
-rw-r--r--tests/tests.cpp7
-rw-r--r--tests/tests.h7
41 files changed, 82 insertions, 205 deletions
diff --git a/src/app/application.cpp b/src/app/application.cpp
index 31dd8e5..7ef6663 100644
--- a/src/app/application.cpp
+++ b/src/app/application.cpp
@@ -1,7 +1,7 @@
/****************************************************************************
**
- ** Copyright (C) 2008-2012 Nokia Corporation and/or its subsidiary(-ies).
- ** Contact: Nokia Corporation (info@qt.nokia.com)
+ ** Copyright (C) 2008-2012 Digia Plc and/or its subsidiary(-ies).
+ ** Contact: http://www.qt-project.org/legal
**
** This file is part of the jom project on Trolltech Labs.
**
@@ -13,9 +13,6 @@
** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
** 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.
- **
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
diff --git a/src/app/application.h b/src/app/application.h
index b89cc74..3f46524 100644
--- a/src/app/application.h
+++ b/src/app/application.h
@@ -1,7 +1,7 @@
/****************************************************************************
**
- ** Copyright (C) 2008-2012 Nokia Corporation and/or its subsidiary(-ies).
- ** Contact: Nokia Corporation (info@qt.nokia.com)
+ ** Copyright (C) 2008-2012 Digia Plc and/or its subsidiary(-ies).
+ ** Contact: http://www.qt-project.org/legal
**
** This file is part of the jom project on Trolltech Labs.
**
@@ -13,9 +13,6 @@
** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
** 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.
- **
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
diff --git a/src/app/main.cpp b/src/app/main.cpp
index 2771041..cbedcfb 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -1,7 +1,7 @@
/****************************************************************************
**
- ** Copyright (C) 2008-2012 Nokia Corporation and/or its subsidiary(-ies).
- ** Contact: Nokia Corporation (info@qt.nokia.com)
+ ** Copyright (C) 2008-2012 Digia Plc and/or its subsidiary(-ies).
+ ** Contact: http://www.qt-project.org/legal
**
** This file is part of the jom project on Trolltech Labs.
**
@@ -13,9 +13,6 @@
** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
** 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.
- **
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
diff --git a/src/jomlib/commandexecutor.cpp b/src/jomlib/commandexecutor.cpp
index fc7fa8b..6fbd359 100644
--- a/src/jomlib/commandexecutor.cpp
+++ b/src/jomlib/commandexecutor.cpp
@@ -1,7 +1,7 @@
/****************************************************************************
**
- ** Copyright (C) 2008-2012 Nokia Corporation and/or its subsidiary(-ies).
- ** Contact: Nokia Corporation (info@qt.nokia.com)
+ ** Copyright (C) 2008-2012 Digia Plc and/or its subsidiary(-ies).
+ ** Contact: http://www.qt-project.org/legal
**
** This file is part of the jom project on Trolltech Labs.
**
@@ -13,9 +13,6 @@
** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
** 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.
- **
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
diff --git a/src/jomlib/commandexecutor.h b/src/jomlib/commandexecutor.h
index 5d6fe03..c8d9651 100644
--- a/src/jomlib/commandexecutor.h
+++ b/src/jomlib/commandexecutor.h
@@ -1,7 +1,7 @@
/****************************************************************************
**
- ** Copyright (C) 2008-2012 Nokia Corporation and/or its subsidiary(-ies).
- ** Contact: Nokia Corporation (info@qt.nokia.com)
+ ** Copyright (C) 2008-2012 Digia Plc and/or its subsidiary(-ies).
+ ** Contact: http://www.qt-project.org/legal
**
** This file is part of the jom project on Trolltech Labs.
**
@@ -13,9 +13,6 @@
** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
** 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.
- **
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
diff --git a/src/jomlib/dependencygraph.cpp b/src/jomlib/dependencygraph.cpp
index 51bae06..2eb6676 100644
--- a/src/jomlib/dependencygraph.cpp
+++ b/src/jomlib/dependencygraph.cpp
@@ -1,7 +1,7 @@
/****************************************************************************
**
- ** Copyright (C) 2008-2012 Nokia Corporation and/or its subsidiary(-ies).
- ** Contact: Nokia Corporation (info@qt.nokia.com)
+ ** Copyright (C) 2008-2012 Digia Plc and/or its subsidiary(-ies).
+ ** Contact: http://www.qt-project.org/legal
**
** This file is part of the jom project on Trolltech Labs.
**
@@ -13,9 +13,6 @@
** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
** 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.
- **
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
diff --git a/src/jomlib/dependencygraph.h b/src/jomlib/dependencygraph.h
index 9418d7d..0ffdfe6 100644
--- a/src/jomlib/dependencygraph.h
+++ b/src/jomlib/dependencygraph.h
@@ -1,7 +1,7 @@
/****************************************************************************
**
- ** Copyright (C) 2008-2012 Nokia Corporation and/or its subsidiary(-ies).
- ** Contact: Nokia Corporation (info@qt.nokia.com)
+ ** Copyright (C) 2008-2012 Digia Plc and/or its subsidiary(-ies).
+ ** Contact: http://www.qt-project.org/legal
**
** This file is part of the jom project on Trolltech Labs.
**
@@ -13,9 +13,6 @@
** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
** 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.
- **
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
diff --git a/src/jomlib/exception.cpp b/src/jomlib/exception.cpp
index 66ec6a6..13d23a6 100644
--- a/src/jomlib/exception.cpp
+++ b/src/jomlib/exception.cpp
@@ -1,7 +1,7 @@
/****************************************************************************
**
- ** Copyright (C) 2008-2012 Nokia Corporation and/or its subsidiary(-ies).
- ** Contact: Nokia Corporation (info@qt.nokia.com)
+ ** Copyright (C) 2008-2012 Digia Plc and/or its subsidiary(-ies).
+ ** Contact: http://www.qt-project.org/legal
**
** This file is part of the jom project on Trolltech Labs.
**
@@ -13,9 +13,6 @@
** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
** 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.
- **
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
diff --git a/src/jomlib/exception.h b/src/jomlib/exception.h
index bba4750..73bbd21 100644
--- a/src/jomlib/exception.h
+++ b/src/jomlib/exception.h
@@ -1,7 +1,7 @@
/****************************************************************************
**
- ** Copyright (C) 2008-2012 Nokia Corporation and/or its subsidiary(-ies).
- ** Contact: Nokia Corporation (info@qt.nokia.com)
+ ** Copyright (C) 2008-2012 Digia Plc and/or its subsidiary(-ies).
+ ** Contact: http://www.qt-project.org/legal
**
** This file is part of the jom project on Trolltech Labs.
**
@@ -13,9 +13,6 @@
** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
** 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.
- **
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
diff --git a/src/jomlib/fastfileinfo.cpp b/src/jomlib/fastfileinfo.cpp
index 69c7e94..0b00efe 100644
--- a/src/jomlib/fastfileinfo.cpp
+++ b/src/jomlib/fastfileinfo.cpp
@@ -1,7 +1,7 @@
/****************************************************************************
**
- ** Copyright (C) 2008-2012 Nokia Corporation and/or its subsidiary(-ies).
- ** Contact: Nokia Corporation (info@qt.nokia.com)
+ ** Copyright (C) 2008-2012 Digia Plc and/or its subsidiary(-ies).
+ ** Contact: http://www.qt-project.org/legal
**
** This file is part of the jom project on Trolltech Labs.
**
@@ -13,9 +13,6 @@
** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
** 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.
- **
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
diff --git a/src/jomlib/fastfileinfo.h b/src/jomlib/fastfileinfo.h
index 856acee..808348f 100644
--- a/src/jomlib/fastfileinfo.h
+++ b/src/jomlib/fastfileinfo.h
@@ -1,7 +1,7 @@
/****************************************************************************
**
- ** Copyright (C) 2008-2012 Nokia Corporation and/or its subsidiary(-ies).
- ** Contact: Nokia Corporation (info@qt.nokia.com)
+ ** Copyright (C) 2008-2012 Digia Plc and/or its subsidiary(-ies).
+ ** Contact: http://www.qt-project.org/legal
**
** This file is part of the jom project on Trolltech Labs.
**
@@ -13,9 +13,6 @@
** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
** 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.
- **
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
diff --git a/src/jomlib/filetime.cpp b/src/jomlib/filetime.cpp
index 540e24b..c73a00c 100644
--- a/src/jomlib/filetime.cpp
+++ b/src/jomlib/filetime.cpp
@@ -1,7 +1,7 @@
/****************************************************************************
**
- ** Copyright (C) 2008-2012 Nokia Corporation and/or its subsidiary(-ies).
- ** Contact: Nokia Corporation (info@qt.nokia.com)
+ ** Copyright (C) 2008-2012 Digia Plc and/or its subsidiary(-ies).
+ ** Contact: http://www.qt-project.org/legal
**
** This file is part of the jom project on Trolltech Labs.
**
@@ -13,9 +13,6 @@
** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
** 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.
- **
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
diff --git a/src/jomlib/filetime.h b/src/jomlib/filetime.h
index 1e331f1..ac17c81 100644
--- a/src/jomlib/filetime.h
+++ b/src/jomlib/filetime.h
@@ -1,7 +1,7 @@
/****************************************************************************
**
- ** Copyright (C) 2008-2012 Nokia Corporation and/or its subsidiary(-ies).
- ** Contact: Nokia Corporation (info@qt.nokia.com)
+ ** Copyright (C) 2008-2012 Digia Plc and/or its subsidiary(-ies).
+ ** Contact: http://www.qt-project.org/legal
**
** This file is part of the jom project on Trolltech Labs.
**
@@ -13,9 +13,6 @@
** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
** 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.
- **
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
diff --git a/src/jomlib/helperfunctions.cpp b/src/jomlib/helperfunctions.cpp
index aa184d6..df9af44 100644
--- a/src/jomlib/helperfunctions.cpp
+++ b/src/jomlib/helperfunctions.cpp
@@ -1,7 +1,7 @@
/****************************************************************************
**
- ** Copyright (C) 2008-2012 Nokia Corporation and/or its subsidiary(-ies).
- ** Contact: Nokia Corporation (info@qt.nokia.com)
+ ** Copyright (C) 2008-2012 Digia Plc and/or its subsidiary(-ies).
+ ** Contact: http://www.qt-project.org/legal
**
** This file is part of the jom project on Trolltech Labs.
**
@@ -13,9 +13,6 @@
** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
** 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.
- **
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
diff --git a/src/jomlib/helperfunctions.h b/src/jomlib/helperfunctions.h
index f2c80a8..5955c86 100644
--- a/src/jomlib/helperfunctions.h
+++ b/src/jomlib/helperfunctions.h
@@ -1,7 +1,7 @@
/****************************************************************************
**
- ** Copyright (C) 2008-2012 Nokia Corporation and/or its subsidiary(-ies).
- ** Contact: Nokia Corporation (info@qt.nokia.com)
+ ** Copyright (C) 2008-2012 Digia Plc and/or its subsidiary(-ies).
+ ** Contact: http://www.qt-project.org/legal
**
** This file is part of the jom project on Trolltech Labs.
**
@@ -13,9 +13,6 @@
** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
** 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.
- **
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
diff --git a/src/jomlib/iocompletionport.cpp b/src/jomlib/iocompletionport.cpp
index 789bda8..abec950 100644
--- a/src/jomlib/iocompletionport.cpp
+++ b/src/jomlib/iocompletionport.cpp
@@ -1,7 +1,7 @@
/****************************************************************************
**
- ** Copyright (C) 2008-2012 Nokia Corporation and/or its subsidiary(-ies).
- ** Contact: Nokia Corporation (info@qt.nokia.com)
+ ** Copyright (C) 2008-2012 Digia Plc and/or its subsidiary(-ies).
+ ** Contact: http://www.qt-project.org/legal
**
** This file is part of the jom project on Trolltech Labs.
**
@@ -13,9 +13,6 @@
** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
** 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.
- **
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
diff --git a/src/jomlib/iocompletionport.h b/src/jomlib/iocompletionport.h
index 9304036..6ebd0f5 100644
--- a/src/jomlib/iocompletionport.h
+++ b/src/jomlib/iocompletionport.h
@@ -1,7 +1,7 @@
/****************************************************************************
**
- ** Copyright (C) 2008-2012 Nokia Corporation and/or its subsidiary(-ies).
- ** Contact: Nokia Corporation (info@qt.nokia.com)
+ ** Copyright (C) 2008-2012 Digia Plc and/or its subsidiary(-ies).
+ ** Contact: http://www.qt-project.org/legal
**
** This file is part of the jom project on Trolltech Labs.
**
@@ -13,9 +13,6 @@
** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
** 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.
- **
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
diff --git a/src/jomlib/macrotable.cpp b/src/jomlib/macrotable.cpp
index 6ecc9bc..eae391c 100644
--- a/src/jomlib/macrotable.cpp
+++ b/src/jomlib/macrotable.cpp
@@ -1,7 +1,7 @@
/****************************************************************************
**
- ** Copyright (C) 2008-2012 Nokia Corporation and/or its subsidiary(-ies).
- ** Contact: Nokia Corporation (info@qt.nokia.com)
+ ** Copyright (C) 2008-2012 Digia Plc and/or its subsidiary(-ies).
+ ** Contact: http://www.qt-project.org/legal
**
** This file is part of the jom project on Trolltech Labs.
**
@@ -13,9 +13,6 @@
** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
** 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.
- **
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
diff --git a/src/jomlib/macrotable.h b/src/jomlib/macrotable.h
index 83be883..c12fa0e 100644
--- a/src/jomlib/macrotable.h
+++ b/src/jomlib/macrotable.h
@@ -1,7 +1,7 @@
/****************************************************************************
**
- ** Copyright (C) 2008-2012 Nokia Corporation and/or its subsidiary(-ies).
- ** Contact: Nokia Corporation (info@qt.nokia.com)
+ ** Copyright (C) 2008-2012 Digia Plc and/or its subsidiary(-ies).
+ ** Contact: http://www.qt-project.org/legal
**
** This file is part of the jom project on Trolltech Labs.
**
@@ -13,9 +13,6 @@
** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
** 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.
- **
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
diff --git a/src/jomlib/makefile.cpp b/src/jomlib/makefile.cpp
index d86f280..2e9c347 100644
--- a/src/jomlib/makefile.cpp
+++ b/src/jomlib/makefile.cpp
@@ -1,7 +1,7 @@
/****************************************************************************
**
- ** Copyright (C) 2008-2012 Nokia Corporation and/or its subsidiary(-ies).
- ** Contact: Nokia Corporation (info@qt.nokia.com)
+ ** Copyright (C) 2008-2012 Digia Plc and/or its subsidiary(-ies).
+ ** Contact: http://www.qt-project.org/legal
**
** This file is part of the jom project on Trolltech Labs.
**
@@ -13,9 +13,6 @@
** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
** 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.
- **
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
diff --git a/src/jomlib/makefile.h b/src/jomlib/makefile.h
index 43ed045..8d505cf 100644
--- a/src/jomlib/makefile.h
+++ b/src/jomlib/makefile.h
@@ -1,7 +1,7 @@
/****************************************************************************
**
- ** Copyright (C) 2008-2012 Nokia Corporation and/or its subsidiary(-ies).
- ** Contact: Nokia Corporation (info@qt.nokia.com)
+ ** Copyright (C) 2008-2012 Digia Plc and/or its subsidiary(-ies).
+ ** Contact: http://www.qt-project.org/legal
**
** This file is part of the jom project on Trolltech Labs.
**
@@ -13,9 +13,6 @@
** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
** 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.
- **
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
diff --git a/src/jomlib/makefilefactory.cpp b/src/jomlib/makefilefactory.cpp
index 9abf2fa..3c5fddc 100644
--- a/src/jomlib/makefilefactory.cpp
+++ b/src/jomlib/makefilefactory.cpp
@@ -1,7 +1,7 @@
/****************************************************************************
**
- ** Copyright (C) 2008-2012 Nokia Corporation and/or its subsidiary(-ies).
- ** Contact: Nokia Corporation (info@qt.nokia.com)
+ ** Copyright (C) 2008-2012 Digia Plc and/or its subsidiary(-ies).
+ ** Contact: http://www.qt-project.org/legal
**
** This file is part of the jom project on Trolltech Labs.
**
@@ -13,9 +13,6 @@
** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
** 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.
- **
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
diff --git a/src/jomlib/makefilefactory.h b/src/jomlib/makefilefactory.h
index aa49aa9..b70dd0b 100644
--- a/src/jomlib/makefilefactory.h
+++ b/src/jomlib/makefilefactory.h
@@ -1,7 +1,7 @@
/****************************************************************************
**
- ** Copyright (C) 2008-2012 Nokia Corporation and/or its subsidiary(-ies).
- ** Contact: Nokia Corporation (info@qt.nokia.com)
+ ** Copyright (C) 2008-2012 Digia Plc and/or its subsidiary(-ies).
+ ** Contact: http://www.qt-project.org/legal
**
** This file is part of the jom project on Trolltech Labs.
**
@@ -13,9 +13,6 @@
** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
** 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.
- **
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
diff --git a/src/jomlib/makefilelinereader.cpp b/src/jomlib/makefilelinereader.cpp
index 16ad9ab..2291937 100644
--- a/src/jomlib/makefilelinereader.cpp
+++ b/src/jomlib/makefilelinereader.cpp
@@ -1,7 +1,7 @@
/****************************************************************************
**
- ** Copyright (C) 2008-2012 Nokia Corporation and/or its subsidiary(-ies).
- ** Contact: Nokia Corporation (info@qt.nokia.com)
+ ** Copyright (C) 2008-2012 Digia Plc and/or its subsidiary(-ies).
+ ** Contact: http://www.qt-project.org/legal
**
** This file is part of the jom project on Trolltech Labs.
**
@@ -13,9 +13,6 @@
** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
** 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.
- **
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
diff --git a/src/jomlib/makefilelinereader.h b/src/jomlib/makefilelinereader.h
index 7a6b6cb..f701787 100644
--- a/src/jomlib/makefilelinereader.h
+++ b/src/jomlib/makefilelinereader.h
@@ -1,7 +1,7 @@
/****************************************************************************
**
- ** Copyright (C) 2008-2012 Nokia Corporation and/or its subsidiary(-ies).
- ** Contact: Nokia Corporation (info@qt.nokia.com)
+ ** Copyright (C) 2008-2012 Digia Plc and/or its subsidiary(-ies).
+ ** Contact: http://www.qt-project.org/legal
**
** This file is part of the jom project on Trolltech Labs.
**
@@ -13,9 +13,6 @@
** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
** 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.
- **
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
diff --git a/src/jomlib/options.cpp b/src/jomlib/options.cpp
index 17bebe2..99205ec 100644
--- a/src/jomlib/options.cpp
+++ b/src/jomlib/options.cpp
@@ -1,7 +1,7 @@
/****************************************************************************
**
- ** Copyright (C) 2008-2012 Nokia Corporation and/or its subsidiary(-ies).
- ** Contact: Nokia Corporation (info@qt.nokia.com)
+ ** Copyright (C) 2008-2012 Digia Plc and/or its subsidiary(-ies).
+ ** Contact: http://www.qt-project.org/legal
**
** This file is part of the jom project on Trolltech Labs.
**
@@ -13,9 +13,6 @@
** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
** 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.
- **
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
diff --git a/src/jomlib/options.h b/src/jomlib/options.h
index f5d8cbb..ca2671f 100644
--- a/src/jomlib/options.h
+++ b/src/jomlib/options.h
@@ -1,7 +1,7 @@
/****************************************************************************
**
- ** Copyright (C) 2008-2012 Nokia Corporation and/or its subsidiary(-ies).
- ** Contact: Nokia Corporation (info@qt.nokia.com)
+ ** Copyright (C) 2008-2012 Digia Plc and/or its subsidiary(-ies).
+ ** Contact: http://www.qt-project.org/legal
**
** This file is part of the jom project on Trolltech Labs.
**
@@ -13,9 +13,6 @@
** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
** 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.
- **
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
diff --git a/src/jomlib/parser.cpp b/src/jomlib/parser.cpp
index f5a51e9..d617779 100644
--- a/src/jomlib/parser.cpp
+++ b/src/jomlib/parser.cpp
@@ -1,7 +1,7 @@
/****************************************************************************
**
- ** Copyright (C) 2008-2012 Nokia Corporation and/or its subsidiary(-ies).
- ** Contact: Nokia Corporation (info@qt.nokia.com)
+ ** Copyright (C) 2008-2012 Digia Plc and/or its subsidiary(-ies).
+ ** Contact: http://www.qt-project.org/legal
**
** This file is part of the jom project on Trolltech Labs.
**
@@ -13,9 +13,6 @@
** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
** 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.
- **
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
diff --git a/src/jomlib/parser.h b/src/jomlib/parser.h
index b5d1683..f1334e8 100644
--- a/src/jomlib/parser.h
+++ b/src/jomlib/parser.h
@@ -1,7 +1,7 @@
/****************************************************************************
**
- ** Copyright (C) 2008-2012 Nokia Corporation and/or its subsidiary(-ies).
- ** Contact: Nokia Corporation (info@qt.nokia.com)
+ ** Copyright (C) 2008-2012 Digia Plc and/or its subsidiary(-ies).
+ ** Contact: http://www.qt-project.org/legal
**
** This file is part of the jom project on Trolltech Labs.
**
@@ -13,9 +13,6 @@
** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
** 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.
- **
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
diff --git a/src/jomlib/ppexpr-lex.inc b/src/jomlib/ppexpr-lex.inc
index 004eb77..e74b9c2 100644
--- a/src/jomlib/ppexpr-lex.inc
+++ b/src/jomlib/ppexpr-lex.inc
@@ -530,8 +530,8 @@ int yy_flex_debug = 0;
char *yytext;
/****************************************************************************
**
- ** Copyright (C) 2008-2012 Nokia Corporation and/or its subsidiary(-ies).
- ** Contact: Nokia Corporation (info@qt.nokia.com)
+ ** Copyright (C) 2008-2012 Digia Plc and/or its subsidiary(-ies).
+ ** Contact: http://www.qt-project.org/legal
**
** This file is part of the jom project on Trolltech Labs.
**
@@ -543,9 +543,6 @@ char *yytext;
** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
** 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.
- **
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
diff --git a/src/jomlib/ppexpr.g b/src/jomlib/ppexpr.g
index 23c815b..80ad729 100644
--- a/src/jomlib/ppexpr.g
+++ b/src/jomlib/ppexpr.g
@@ -1,7 +1,7 @@
----------------------------------------------------------------------------
--
--- Copyright (C) 2008-2012 Nokia Corporation and/or its subsidiary(-ies).
--- Contact: Nokia Corporation (info@qt.nokia.com)
+-- Copyright (C) 2008-2012 Digia Plc and/or its subsidiary(-ies).
+-- Contact: http://www.qt-project.org/legal
--
-- This file is part of the jom project on Trolltech Labs.
--
@@ -13,9 +13,6 @@
-- http://www.fsf.org/licensing/licenses/info/GPLv2.html and
-- 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.
---
-- This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-- WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
--
diff --git a/src/jomlib/ppexpr.l b/src/jomlib/ppexpr.l
index 5e15feb..5a249f2 100644
--- a/src/jomlib/ppexpr.l
+++ b/src/jomlib/ppexpr.l
@@ -1,7 +1,7 @@
/****************************************************************************
**
- ** Copyright (C) 2008-2012 Nokia Corporation and/or its subsidiary(-ies).
- ** Contact: Nokia Corporation (info@qt.nokia.com)
+ ** Copyright (C) 2008-2012 Digia Plc and/or its subsidiary(-ies).
+ ** Contact: http://www.qt-project.org/legal
**
** This file is part of the jom project on Trolltech Labs.
**
@@ -13,9 +13,6 @@
** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
** 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.
- **
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
diff --git a/src/jomlib/preprocessor.cpp b/src/jomlib/preprocessor.cpp
index 3dabeaf..9f9de02 100644
--- a/src/jomlib/preprocessor.cpp
+++ b/src/jomlib/preprocessor.cpp
@@ -1,7 +1,7 @@
/****************************************************************************
**
- ** Copyright (C) 2008-2012 Nokia Corporation and/or its subsidiary(-ies).
- ** Contact: Nokia Corporation (info@qt.nokia.com)
+ ** Copyright (C) 2008-2012 Digia Plc and/or its subsidiary(-ies).
+ ** Contact: http://www.qt-project.org/legal
**
** This file is part of the jom project on Trolltech Labs.
**
@@ -13,9 +13,6 @@
** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
** 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.
- **
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
diff --git a/src/jomlib/preprocessor.h b/src/jomlib/preprocessor.h
index 1ba1c3f..a52de53 100644
--- a/src/jomlib/preprocessor.h
+++ b/src/jomlib/preprocessor.h
@@ -1,7 +1,7 @@
/****************************************************************************
**
- ** Copyright (C) 2008-2012 Nokia Corporation and/or its subsidiary(-ies).
- ** Contact: Nokia Corporation (info@qt.nokia.com)
+ ** Copyright (C) 2008-2012 Digia Plc and/or its subsidiary(-ies).
+ ** Contact: http://www.qt-project.org/legal
**
** This file is part of the jom project on Trolltech Labs.
**
@@ -13,9 +13,6 @@
** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
** 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.
- **
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
diff --git a/src/jomlib/process.cpp b/src/jomlib/process.cpp
index 9d60336..a23b858 100644
--- a/src/jomlib/process.cpp
+++ b/src/jomlib/process.cpp
@@ -1,7 +1,7 @@
/****************************************************************************
**
- ** Copyright (C) 2008-2012 Nokia Corporation and/or its subsidiary(-ies).
- ** Contact: Nokia Corporation (info@qt.nokia.com)
+ ** Copyright (C) 2008-2012 Digia Plc and/or its subsidiary(-ies).
+ ** Contact: http://www.qt-project.org/legal
**
** This file is part of the jom project on Trolltech Labs.
**
@@ -13,9 +13,6 @@
** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
** 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.
- **
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
diff --git a/src/jomlib/process.h b/src/jomlib/process.h
index fd53257..ad61db3 100644
--- a/src/jomlib/process.h
+++ b/src/jomlib/process.h
@@ -1,7 +1,7 @@
/****************************************************************************
**
- ** Copyright (C) 2008-2012 Nokia Corporation and/or its subsidiary(-ies).
- ** Contact: Nokia Corporation (info@qt.nokia.com)
+ ** Copyright (C) 2008-2012 Digia Plc and/or its subsidiary(-ies).
+ ** Contact: http://www.qt-project.org/legal
**
** This file is part of the jom project on Trolltech Labs.
**
@@ -13,9 +13,6 @@
** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
** 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.
- **
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
diff --git a/src/jomlib/stable.h b/src/jomlib/stable.h
index b29b39e..d171507 100644
--- a/src/jomlib/stable.h
+++ b/src/jomlib/stable.h
@@ -1,7 +1,7 @@
/****************************************************************************
**
- ** Copyright (C) 2008-2012 Nokia Corporation and/or its subsidiary(-ies).
- ** Contact: Nokia Corporation (info@qt.nokia.com)
+ ** Copyright (C) 2008-2012 Digia Plc and/or its subsidiary(-ies).
+ ** Contact: http://www.qt-project.org/legal
**
** This file is part of the jom project on Trolltech Labs.
**
@@ -13,9 +13,6 @@
** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
** 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.
- **
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
diff --git a/src/jomlib/targetexecutor.cpp b/src/jomlib/targetexecutor.cpp
index 5e1c328..948deeb 100644
--- a/src/jomlib/targetexecutor.cpp
+++ b/src/jomlib/targetexecutor.cpp
@@ -1,7 +1,7 @@
/****************************************************************************
**
- ** Copyright (C) 2008-2012 Nokia Corporation and/or its subsidiary(-ies).
- ** Contact: Nokia Corporation (info@qt.nokia.com)
+ ** Copyright (C) 2008-2012 Digia Plc and/or its subsidiary(-ies).
+ ** Contact: http://www.qt-project.org/legal
**
** This file is part of the jom project on Trolltech Labs.
**
@@ -13,9 +13,6 @@
** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
** 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.
- **
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
diff --git a/src/jomlib/targetexecutor.h b/src/jomlib/targetexecutor.h
index f435f83..29d4ec6 100644
--- a/src/jomlib/targetexecutor.h
+++ b/src/jomlib/targetexecutor.h
@@ -1,7 +1,7 @@
/****************************************************************************
**
- ** Copyright (C) 2008-2012 Nokia Corporation and/or its subsidiary(-ies).
- ** Contact: Nokia Corporation (info@qt.nokia.com)
+ ** Copyright (C) 2008-2012 Digia Plc and/or its subsidiary(-ies).
+ ** Contact: http://www.qt-project.org/legal
**
** This file is part of the jom project on Trolltech Labs.
**
@@ -13,9 +13,6 @@
** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
** 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.
- **
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
diff --git a/tests/tests.cpp b/tests/tests.cpp
index 4aff11a..76d0791 100644
--- a/tests/tests.cpp
+++ b/tests/tests.cpp
@@ -1,7 +1,7 @@
/****************************************************************************
**
- ** Copyright (C) 2008-2012 Nokia Corporation and/or its subsidiary(-ies).
- ** Contact: Nokia Corporation (info@qt.nokia.com)
+ ** Copyright (C) 2008-2012 Digia Plc and/or its subsidiary(-ies).
+ ** Contact: http://www.qt-project.org/legal
**
** This file is part of the jom project on Trolltech Labs.
**
@@ -13,9 +13,6 @@
** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
** 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.
- **
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
diff --git a/tests/tests.h b/tests/tests.h
index b96c243..be77426 100644
--- a/tests/tests.h
+++ b/tests/tests.h
@@ -1,7 +1,7 @@
/****************************************************************************
**
- ** Copyright (C) 2008-2012 Nokia Corporation and/or its subsidiary(-ies).
- ** Contact: Nokia Corporation (info@qt.nokia.com)
+ ** Copyright (C) 2008-2012 Digia Plc and/or its subsidiary(-ies).
+ ** Contact: http://www.qt-project.org/legal
**
** This file is part of the jom project on Trolltech Labs.
**
@@ -13,9 +13,6 @@
** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
** 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.
- **
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**