Merge branch '4.5' into 4.6

Conflicts:
	tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro
	tests/auto/qhttpnetworkreply/qhttpnetworkreply.pro

2 files changed, 57 insertions, 4 deletions

diff --git a/src/opengl/util/fragmentprograms_p.h b/src/opengl/util/fragmentprograms_p.h
index dad8795..18da5c8 100644
--- a/src/opengl/util/fragmentprograms_p.h
+++ b/src/opengl/util/fragmentprograms_p.h
@@ -38,8 +38,8 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#ifndef FRAGMENTPROGRAMS_H
-#define FRAGMENTPROGRAMS_H
+#ifndef FRAGMENTPROGRAMS_P_H
+#define FRAGMENTPROGRAMS_P_H
 
 //
 //  W A R N I N G
diff --git a/src/opengl/util/generator.cpp b/src/opengl/util/generator.cpp
index 548a97b..62d19ff 100644
--- a/src/opengl/util/generator.cpp
+++ b/src/opengl/util/generator.cpp
@@ -259,8 +259,61 @@ void writeIncludeFile(const QSet<QString> &variables,
 
     QLatin1String tab("    ");
 
-    out << "#ifndef FRAGMENTPROGRAMS_H\n"
-        << "#define FRAGMENTPROGRAMS_H\n\n";
+    out << "/****************************************************************************\n"
+           "**\n"
+           "** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).\n"
+           "** All rights reserved.\n"
+           "** Contact: Nokia Corporation (qt-info@nokia.com)\n"
+           "**\n"
+           "** This file is part of the test suite of the Qt Toolkit.\n"
+           "**\n"
+           "** $QT_BEGIN_LICENSE:LGPL$\n"
+           "** No Commercial Usage\n"
+           "** This file contains pre-release code and may not be distributed.\n"
+           "** You may use this file in accordance with the terms and conditions\n"
+           "** contained in the Technology Preview License Agreement accompanying\n"
+           "** this package.\n"
+           "**\n"
+           "** GNU Lesser General Public License Usage\n"
+           "** Alternatively, this file may be used under the terms of the GNU Lesser\n"
+           "** General Public License version 2.1 as published by the Free Software\n"
+           "** Foundation and appearing in the file LICENSE.LGPL included in the\n"
+           "** packaging of this file.  Please review the following information to\n"
+           "** ensure the GNU Lesser General Public License version 2.1 requirements\n"
+           "** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\n"
+           "**\n"
+           "** In addition, as a special exception, Nokia gives you certain additional\n"
+           "** rights.  These rights are described in the Nokia Qt LGPL Exception\n"
+           "** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.\n"
+           "**\n"
+           "** If you have questions regarding the use of this file, please contact\n"
+           "** Nokia at qt-info@nokia.com.\n"
+           "**\n"
+           "**\n"
+           "**\n"
+           "**\n"
+           "**\n"
+           "**\n"
+           "**\n"
+           "**\n"
+           "** $QT_END_LICENSE$\n"
+           "**\n"
+           "****************************************************************************/\n"
+           "\n"
+           "#ifndef FRAGMENTPROGRAMS_P_H\n"
+           "#define FRAGMENTPROGRAMS_P_H\n"
+           "\n"
+           "//\n"
+           "//  W A R N I N G\n"
+           "//  -------------\n"
+           "//\n"
+           "// This file is not part of the Qt API.  It exists purely as an\n"
+           "// implementation detail.  This header file may change from version to\n"
+           "// version without notice, or even be removed.\n"
+           "//\n"
+           "// We mean it.\n"
+           "//\n"
+           "\n";
 
     out << "enum FragmentVariable {\n";
     foreach (QString str, variables)