improve Qt4 compatibility

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 24d4aac..cab3927 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -576,7 +576,7 @@ add_subdirectory(util/unicode)
 add_subdirectory(util/xkbdatagen)
 add_subdirectory(util/generaterun)
 
-# obsolete but still widely required headers
+# obsolete but still widely required headers, unlikely to go away
 katie_generate_obsolete(qtglobal.h QtCore qglobal.h)
 katie_generate_obsolete(qmultihash.h QtCore qhash.h)
 katie_generate_obsolete(qscopedarraypointer.h QtCore qscopedpointer.h)
@@ -594,8 +594,13 @@ 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)
+# obsolete, not so important
+katie_generate_obsolete(qflags.h QtCore qglobal.h)
+katie_generate_obsolete(qdbuspendingcallwatcher.h QtDBus qdbuspendingcall.h)
 # mixed headers
+katie_generate_obsolete(qvariantmap.h QtCore qvariant.h)
 katie_generate_obsolete(qdbusobjectpath.h QtDBus qdbusextratypes.h)
+katie_generate_obsolete(qnetworkaddressentry.h QtNetwork qnetworkinterface.h)
 # those are aliases
 if(UNIX AND WITH_X11 AND X11_FOUND)
     katie_generate_obsolete(qx11info.h QtGui qx11info_x11.h)

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 4de21ce..bdc4a0f 100644 (file)
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -244,6 +244,9 @@ set(CORE_PUBLIC_HEADERS
     QJsonValue
     QCommandLineOption
     QCommandLineParser
+    # obsolete
+    QVariantMap
+    QFlags
 )
 
 include(animation/animation.cmake)

diff --git a/src/dbus/CMakeLists.txt b/src/dbus/CMakeLists.txt
index 424ea2a..0d9dc9d 100644 (file)
--- a/src/dbus/CMakeLists.txt
+++ b/src/dbus/CMakeLists.txt
@@ -25,6 +25,7 @@ set(DBUS_PUBLIC_HEADERS
     QDBusVirtualObject
     # mixed
     QDBusObjectPath
+    QDBusPendingCallWatcher
 )
 
 set(DBUS_HEADERS

diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt
index 441b8d1..ad410f5 100644 (file)
--- a/src/network/CMakeLists.txt
+++ b/src/network/CMakeLists.txt
@@ -20,7 +20,6 @@ set(NETWORK_PUBLIC_HEADERS
     QLocalServer
     QLocalSocket
     QNetworkAccessManager
-    QNetworkAddressEntry
     QNetworkCacheMetaData
     QNetworkConfiguration
     QNetworkConfigurationManager
@@ -45,6 +44,8 @@ set(NETWORK_PUBLIC_HEADERS
     QTcpSocket
     QUdpSocket
     QUrlInfo
+    # mixed
+    QNetworkAddressEntry
 )
 
 include(access/access.cmake)