Merge remote branch 'mainline/4.6' into 4.6

1 files changed, 0 insertions, 40 deletions

diff --git a/src/tools/rcc/rcc.cpp b/src/tools/rcc/rcc.cpp
index 51f850a..6b3227a 100644
--- a/src/tools/rcc/rcc.cpp
+++ b/src/tools/rcc/rcc.cpp
@@ -709,46 +709,6 @@ bool RCCResourceLibrary::writeHeader()
 {
     if (m_format == C_Code) {
         writeString("/****************************************************************************\n");
-        writeString("**\n");
-        writeString("** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).\n");
-        writeString("** All rights reserved.\n");
-        writeString("** Contact: Nokia Corporation (qt-info@nokia.com)\n");
-        writeString("**\n");
-        writeString("** This file is part of the tools applications of the Qt Toolkit.\n");
-        writeString("**\n");
-        writeString("** $QT_BEGIN_LICENSE:LGPL$\n");
-        writeString("** No Commercial Usage\n");
-        writeString("** This file contains pre-release code and may not be distributed.\n");
-        writeString("** You may use this file in accordance with the terms and conditions\n");
-        writeString("** contained in the Technology Preview License Agreement accompanying\n");
-        writeString("** this package.\n");
-        writeString("**\n");
-        writeString("** GNU Lesser General Public License Usage\n");
-        writeString("** Alternatively, this file may be used under the terms of the GNU Lesser\n");
-        writeString("** General Public License version 2.1 as published by the Free Software\n");
-        writeString("** Foundation and appearing in the file LICENSE.LGPL included in the\n");
-        writeString("** packaging of this file.  Please review the following information to\n");
-        writeString("** ensure the GNU Lesser General Public License version 2.1 requirements\n");
-        writeString("** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\n");
-        writeString("**\n");
-        writeString("** In addition, as a special exception, Nokia gives you certain additional\n");
-        writeString("** rights.  These rights are described in the Nokia Qt LGPL Exception\n");
-        writeString("** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.\n");
-        writeString("**\n");
-        writeString("** If you have questions regarding the use of this file, please contact\n");
-        writeString("** Nokia at qt-info@nokia.com.\n");
-        writeString("**\n");
-        writeString("**\n");
-        writeString("**\n");
-        writeString("**\n");
-        writeString("**\n");
-        writeString("**\n");
-        writeString("**\n");
-        writeString("**\n");
-        writeString("** $QT_END_LICENSE$\n");
-        writeString("**\n");
-        writeString("****************************************************************************/\n");
-        writeString("/****************************************************************************\n");
         writeString("** Resource object code\n");
         writeString("**\n");
         writeString("** Created: ");