From: Ivailo Monev <xakepa10@gmail.com>
Date: Mon, 18 Apr 2016 10:23:04 +0000 (+0000)
Subject: improve Qt4 compatibility
X-Git-Tag: 4.12.0~7353
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6d343001803384406eb1986d9d8d6b8ef9818859;p=kde%2FKatie.git

improve Qt4 compatibility

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cab39277b..6e58005a5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -596,10 +596,13 @@ katie_generate_obsolete(qnetworkconfigurationmanager.h QtNetwork qnetworkconfigm
 katie_generate_obsolete(qnetworkcachemetadata.h QtNetwork qabstractnetworkcache.h)
 # obsolete, not so important
 katie_generate_obsolete(qflags.h QtCore qglobal.h)
+katie_generate_obsolete(qtplugin.h QtCore qplugin.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(qlistwidgetitem.h QtGui qlistwidget.h)
+katie_generate_obsolete(qstandarditem.h QtGui qstandarditemmodel.h)
 katie_generate_obsolete(qnetworkaddressentry.h QtNetwork qnetworkinterface.h)
 # those are aliases
 if(UNIX AND WITH_X11 AND X11_FOUND)
@@ -609,6 +612,7 @@ if(UNIX AND WITH_X11 AND X11_FOUND)
 endif()
 # those have shuffled, e.g. from QtDesginer to QtUiTools
 katie_generate_obsolete(customwidget.h QtDesginer ../QtUiTools/customwidget.h)
+katie_generate_obsolete(qdesignercustomwidgetinterface.h QtDesigner ../QtUiTools/customwidget.h)
 # TODO: deal with those and many more
 # QMacStyle
 # QAbstractFontEngine
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index bdc4a0f75..c8e387aa8 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -23,7 +23,6 @@ set(CORE_PUBLIC_HEADERS
     QDynamicPropertyChangeEvent
     QHash
     QThreadStorage
-    QtPlugin
     QTextStreamManipulator
     QMutableMapIterator
     QXmlStreamNotationDeclaration
@@ -244,6 +243,8 @@ set(CORE_PUBLIC_HEADERS
     QJsonValue
     QCommandLineOption
     QCommandLineParser
+    # aliases
+    QtPlugin
     # obsolete
     QVariantMap
     QFlags
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index b404d4d61..71edc7885 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -375,6 +375,9 @@ set(GUI_PUBLIC_HEADERS
     QX11Info
     QX11EmbedContainer
     QX11EmbedWidget
+    # mixed
+    QListWidgetItem
+    QStandardItem
     # pure aliases, but required by UI generator
     QTimeEdit
     QDateEdit