introduce QT_NO_NETWORKDISKCACHE

that was necessary because when defining QT_NO_TEMPORARYFILE there would
be a compile error in qnetworkdisccache.h, which uses a QTemporaryFile.
Moreover, the script "make_qfeatures_dot_h" was updated to generate LGPL
license header.

Reviewed-by: Paul
Task-number: 248807

5 files changed, 74 insertions, 23 deletions

diff --git a/src/corelib/global/qfeatures.h b/src/corelib/global/qfeatures.h
index 6d55f7c..c172f5f 100644
--- a/src/corelib/global/qfeatures.h
+++ b/src/corelib/global/qfeatures.h
@@ -120,6 +120,9 @@
 // QMovie
 //#define QT_NO_MOVIE
 
+// QNetworkInterface
+//#define QT_NO_NETWORKINTERFACE
+
 // QNetworkProxy
 //#define QT_NO_NETWORKPROXY
 
@@ -198,12 +201,12 @@
 // Qt Prerendered Font Format
 //#define QT_NO_QWS_QPF
 
-// Raster Paint Engine callback functions
-//#define QT_NO_RASTERCALLBACKS
-
 // Qt Prerendered Font Format 2
 //#define QT_NO_QWS_QPF2
 
+// Raster Paint Engine callback functions
+//#define QT_NO_RASTERCALLBACKS
+
 // Resize Handler
 //#define QT_NO_RESIZEHANDLER
 
@@ -273,9 +276,6 @@
 // HtmlParser
 //#define QT_NO_TEXTHTMLPARSER
 
-// OdfWriter
-//#define QT_NO_TEXTODFWRITER
-
 // QTextStream
 //#define QT_NO_TEXTSTREAM
 
@@ -316,6 +316,11 @@
 #define QT_NO_BUTTONGROUP
 #endif
 
+// QClipboard
+#if !defined(QT_NO_CLIPBOARD) && (defined(QT_NO_QWS_PROPERTIES))
+#define QT_NO_CLIPBOARD
+#endif
+
 // Codecs
 #if !defined(QT_NO_CODECS) && (defined(QT_NO_TEXTCODEC))
 #define QT_NO_CODECS
@@ -356,6 +361,11 @@
 #define QT_NO_MENU
 #endif
 
+// QNetworkDiskCache
+#if !defined(QT_NO_NETWORKDISKCACHE) && (defined(QT_NO_TEMPORARYFILE))
+#define QT_NO_NETWORKDISKCACHE
+#endif
+
 // Phonon::SeekSlider
 #if !defined(QT_NO_PHONON_SEEKSLIDER) && (defined(QT_NO_SLIDER))
 #define QT_NO_PHONON_SEEKSLIDER
@@ -481,11 +491,6 @@
 #define QT_NO_XMLSTREAMWRITER
 #endif
 
-// Odf Writer 
-#if !defined(QT_NO_TEXTODFWRITER) && (defined(QT_NO_XMLSTREAMWRITER)) 
-#define QT_NO_TEXTODFWRITER 
-#endif 
-
 // Context menu
 #if !defined(QT_NO_CONTEXTMENU) && (defined(QT_NO_MENU))
 #define QT_NO_CONTEXTMENU
@@ -516,6 +521,11 @@
 #define QT_NO_SCROLLAREA
 #endif
 
+// OdfWriter
+#if !defined(QT_NO_TEXTODFWRITER) && (defined(QT_NO_XMLSTREAMWRITER))
+#define QT_NO_TEXTODFWRITER
+#endif
+
 // QToolButton
 #if !defined(QT_NO_TOOLBUTTON) && (defined(QT_NO_ICON) || defined(QT_NO_ACTION))
 #define QT_NO_TOOLBUTTON
@@ -636,11 +646,6 @@
 #define QT_NO_WHATSTHIS
 #endif
 
-// QClipboard
-#if !defined(QT_NO_CLIPBOARD) && (defined(QT_NO_QWS_PROPERTIES))
-#define QT_NO_CLIPBOARD
-#endif
-
 // Common UNIX Printing System
 #if !defined(QT_NO_CUPS) && (defined(QT_NO_PRINTER) || defined(QT_NO_LIBRARY))
 #define QT_NO_CUPS
diff --git a/src/corelib/global/qfeatures.txt b/src/corelib/global/qfeatures.txt
index c26c274..2c5b580 100644
--- a/src/corelib/global/qfeatures.txt
+++ b/src/corelib/global/qfeatures.txt
@@ -1085,6 +1085,13 @@ Requires:
 Name: QNetworkInterface
 SeeAlso: ???
 
+Feature: NETWORKDISKCACHE
+Description: Supports a disk cache for network resources
+Section: Networking
+Requires: TEMPORARYFILE
+Name: QNetworkDiskCache
+SeeAlso: ???
+
 # Utilities
 
 Feature: COMPLETER
diff --git a/src/network/access/qnetworkdiskcache.cpp b/src/network/access/qnetworkdiskcache.cpp
index fa0fccb..e472b9d 100644
--- a/src/network/access/qnetworkdiskcache.cpp
+++ b/src/network/access/qnetworkdiskcache.cpp
@@ -41,6 +41,8 @@
 
 //#define QNETWORKDISKCACHE_DEBUG
 
+#ifndef QT_NO_NETWORKDISKCACHE
+
 #include "qnetworkdiskcache.h"
 #include "qnetworkdiskcache_p.h"
 
@@ -664,3 +666,5 @@ bool QCacheItem::read(QFile *device, bool readData)
 }
 
 QT_END_NAMESPACE
+
+#endif // QT_NO_NETWORKDISKCACHE
diff --git a/src/network/access/qnetworkdiskcache.h b/src/network/access/qnetworkdiskcache.h
index ca4bb94..78e3f6b 100644
--- a/src/network/access/qnetworkdiskcache.h
+++ b/src/network/access/qnetworkdiskcache.h
@@ -50,6 +50,8 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Network)
 
+#ifndef QT_NO_NETWORKDISKCACHE
+
 class QNetworkDiskCachePrivate;
 class Q_NETWORK_EXPORT QNetworkDiskCache : public QAbstractNetworkCache
 {
@@ -86,9 +88,10 @@ private:
     Q_DISABLE_COPY(QNetworkDiskCache)
 };
 
+#endif // QT_NO_NETWORKDISKCACHE
+
 QT_END_NAMESPACE
 
 QT_END_HEADER
 
 #endif // QNETWORKDISKCACHE_H
-
diff --git a/util/scripts/make_qfeatures_dot_h b/util/scripts/make_qfeatures_dot_h
index c434649..056c113 100755
--- a/util/scripts/make_qfeatures_dot_h
+++ b/util/scripts/make_qfeatures_dot_h
@@ -83,23 +83,55 @@ open OUT, ">$ENV{QTDIR}/src/corelib/global/qfeatures.h"
     or die "Cannot open $ENV{QTDIR}/src/corelib/global/qfeatures.h for writing";
 
 print OUT
-"/****************************************************************************
+'/****************************************************************************
 **
-** Copyright (C) 1992-\$THISYEAR\$ \$TROLLTECH\$. All rights reserved.
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
 **
-** This file is part of the \$MODULE\$ of the Qt Toolkit.
+** This file is part of the QtCore module of the Qt Toolkit.
 **
-** \$TROLLTECH_DUAL_LICENSE\$
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** 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.
+** $QT_END_LICENSE$
 **
 ****************************************************************************/
 
 /*
  * All features and their dependencies.
  *
- * This list is generated from \$QTDIR/src/corelib/global/qfeatures.txt
+ * This list is generated from $QTDIR/src/corelib/global/qfeatures.txt
  */
 
-";
+';
+
 
 for $macro ( @macros ) {
     print OUT "// $label{$macro}\n";