deal with some obsolete headers

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ab8a9d0..37718c6 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -595,6 +595,8 @@ katie_generate_obsolete(global.h Phonon ../phonon/phononnamespace.h)
 katie_generate_obsolete(qxmlstream.h QtXml ../QtCore/qxmlstream.h)
 katie_generate_obsolete(qxmlstreamwriter.h QtXml ../QtCore/qxmlstream.h)
 katie_generate_obsolete(qxmlstreamreader.h QtXml ../QtCore/qxmlstream.h)
+katie_generate_obsolete(qnetworkconfigurationmanager.h QtNetwork qnetworkconfigmanager.h)
+katie_generate_obsolete(qnetworkcachemetadata.h QtNetwork qabstractnetworkcache.h)
 # those are aliases
 if(UNIX AND WITH_X11 AND X11_FOUND)
     katie_generate_obsolete(qx11info.h QtGui qx11info_x11.h)

diff --git a/scripts/incfsck.py b/scripts/incfsck.py
index e35ae4f..5dbc914 100755 (executable)
--- a/scripts/incfsck.py
+++ b/scripts/incfsck.py
@@ -257,6 +257,7 @@ incmap = {
         'QHttpHeader': 'qhttp.h',
         'QNetworkConfigurationManager': 'qnetworkconfigmanager.h',
         'QNetworkAddressEntry': 'qnetworkinterface.h',
+        'QNetworkCacheMetaData': 'qabstractnetworkcache.h',
         },
     'QtTest': {
         'QEventSizeOfChecker': 'qtestspontaneevent.h',