Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-23 18:32:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

generic: make changes required for building against katie

Browse source
This commit is contained in:
Ivailo Monev 2015-08-11 05:56:07 +03:00
parent f2b9d47f8e
commit 21ad0df488
561 changed files with 802 additions and 2102 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmake/modules/CMakeLists.txt
View file

@ -85,10 +85,12 @@ set(cmakeFiles
FindPyQt4.cmake FindPyQt4.cmake
Qt4Macros.cmake Qt4Macros.cmake
Qt4ConfigDependentSettings.cmake Qt4ConfigDependentSettings.cmake
KatieMacros.cmake
FindPythonLibrary.cmake FindPythonLibrary.cmake
FindQCA2.cmake FindQCA2.cmake
FindQImageBlitz.cmake FindQImageBlitz.cmake
FindQt4.cmake FindQt4.cmake
FindKatie.cmake
FindRUBY.cmake FindRUBY.cmake
FindSIP.cmake FindSIP.cmake
FindSamba.cmake FindSamba.cmake

4
cmake/modules/FindKDE4Internal.cmake
View file

@ -375,11 +375,9 @@ set(QT_USE_IMPORTED_TARGETS TRUE)
#this line includes FindQt4.cmake, which searches the Qt library and headers #this line includes FindQt4.cmake, which searches the Qt library and headers
# TODO: we should check here that all necessary modules of Qt have been found, e.g. QtDBus # TODO: we should check here that all necessary modules of Qt have been found, e.g. QtDBus
# TODO: use _REQ_STRING_KDE4
set(KATIE_COMPAT TRUE) set(KATIE_COMPAT TRUE)
find_package(Katie) find_package(Katie)
if(NOT KATIE_FOUND)
find_package(Qt4 ${_REQ_STRING_KDE4})
endif()
# Perl is not required for building KDE software, but we had that here since 4.0 # Perl is not required for building KDE software, but we had that here since 4.0
find_package(Perl) find_package(Perl)

128
cmake/modules/FindKatie.cmake
View file

@ -13,8 +13,13 @@
# KATIE_MOC_EXECUTABLE # KATIE_MOC_EXECUTABLE
# KATIE_UIC_EXECUTABLE # KATIE_UIC_EXECUTABLE
# KATIE_RCC_EXECUTABLE # KATIE_RCC_EXECUTABLE
# KATIE_DBUSXML2CPP_EXECUTABLE # KATIE_QDBUSXML2CPP_EXECUTABLE
# KATIE_DBUSCPP2XML_EXECUTABLE # KATIE_QDBUSCPP2XML_EXECUTABLE
# KATIE_QHELPGENERATOR_EXECUTABLE
# KATIE_QCOLLECTIONGENERATOR_EXECUTABLE
# KATIE_LUPDATE_EXECUTABLE
# KATIE_LRELEASE_EXECUTABLE
# KATIE_LCONVERT_EXECUTABLE
# #
# In addition the following macros will be defined: # In addition the following macros will be defined:
# #
@ -34,8 +39,11 @@ endif(KATIE_INCLUDES AND KATIE_LIBRARIES)
if(Katie_FIND_COMPONENTS) if(Katie_FIND_COMPONENTS)
set(KATIECOMPONENTS ${Katie_FIND_COMPONENTS}) set(KATIECOMPONENTS ${Katie_FIND_COMPONENTS})
else() else()
set(KATIECOMPONENTS Core Gui Network Multimedia OpenGL Sql Svg Test DBus Xml XmlPatterns Script ScriptTools WebKit Declarative) # TODO: add Multimedia once it builds
set(KATIECOMPONENTS Core Gui Network OpenGL Sql Svg Test DBus Xml XmlPatterns Script ScriptTools WebKit Declarative Help UiTools)
endif() endif()
# TODO: designer, linguist?
set(KATIETOOLS moc uic rcc qdbusxml2cpp qdbuscpp2xml qhelpgenerator qcollectiongenerator lupdate lrelease lconvert)
set(KATIE_FOUND TRUE) set(KATIE_FOUND TRUE)
set(KATIE_INCLUDES ${CMAKE_BINARY_DIR}/_generated_) set(KATIE_INCLUDES ${CMAKE_BINARY_DIR}/_generated_)
@ -52,55 +60,18 @@ find_path(KATIE_MKSPECS_DIR
$ENV{QTDIR}/share $ENV{QTDIR}/share
) )
find_program(KATIE_MOC_EXECUTABLE foreach(tool ${KATIETOOLS})
string(TOUPPER ${tool} uppertool)
find_program(KATIE_${uppertool}_EXECUTABLE
NAMES NAMES
moc moc-qt4 ${tool} ${tool}-qt4 ${tool}-katie
HINTS
/bin
/usr/bin
/usr/local/bin
$ENV{QTDIR}/bin
)
find_program(KATIE_UIC_EXECUTABLE
NAMES
uic uic-qt4
HINTS
/bin
/usr/bin
/usr/local/bin
$ENV{QTDIR}/bin
)
find_program(KATIE_RCC_EXECUTABLE
NAMES
rcc rcc-qt4
HINTS
/bin
/usr/bin
/usr/local/bin
$ENV{QTDIR}/bin
)
find_program(KATIE_DBUSXML2CPP_EXECUTABLE
NAMES
qdbusxml2cpp qdbusxml2cpp-qt4
HINTS
/bin
/usr/bin
/usr/local/bin
$ENV{QTDIR}/bin
)
find_program(KATIE_DBUSCPP2XML_EXECUTABLE
NAMES
qdbuscpp2xml qdbuscpp2xml-qt4
HINTS HINTS
/bin /bin
/usr/bin /usr/bin
/usr/local/bin /usr/local/bin
$ENV{QTDIR}/bin $ENV{QTDIR}/bin
) )
endforeach()
foreach(component ${KATIECOMPONENTS}) foreach(component ${KATIECOMPONENTS})
string(TOUPPER KATIE_${component} uppercomp) string(TOUPPER KATIE_${component} uppercomp)
@ -170,7 +141,7 @@ if(${KATIE_COMPAT} AND KATIE_FOUND)
set(QT_FOUND TRUE) set(QT_FOUND TRUE)
set(QT4_FOUND TRUE) set(QT4_FOUND TRUE)
set(QT_VERSION_MAJOR ${KATIE_MAJOR}) set(QT_VERSION_MAJOR ${KATIE_MAJOR})
set(QT_VERSION_MINOR.${KATIE_MINOR}) set(QT_VERSION_MINOR ${KATIE_MINOR})
set(QT_VERSION_PATCH ${KATIE_MICRO}) set(QT_VERSION_PATCH ${KATIE_MICRO})
set(QT_VERSION ${KATIE_VERSION}) set(QT_VERSION ${KATIE_VERSION})
set(QT_INCLUDES ${KATIE_INCLUDES}) set(QT_INCLUDES ${KATIE_INCLUDES})
@ -179,47 +150,36 @@ if(${KATIE_COMPAT} AND KATIE_FOUND)
set(QT_MOC_EXECUTABLE ${KATIE_MOC_EXECUTABLE}) set(QT_MOC_EXECUTABLE ${KATIE_MOC_EXECUTABLE})
set(QT_UIC_EXECUTABLE ${KATIE_UIC_EXECUTABLE}) set(QT_UIC_EXECUTABLE ${KATIE_UIC_EXECUTABLE})
set(QT_RCC_EXECUTABLE ${KATIE_RCC_EXECUTABLE}) set(QT_RCC_EXECUTABLE ${KATIE_RCC_EXECUTABLE})
set(QT_DBUSXML2CPP_EXECUTABLE ${KATIE_DBUSXML2CPP_EXECUTABLE}) set(QT_DBUSXML2CPP_EXECUTABLE ${KATIE_QDBUSXML2CPP_EXECUTABLE})
set(QT_DBUSCPP2XML_EXECUTABLE ${KATIE_DBUSCPP2XML_EXECUTABLE}) set(QT_DBUSCPP2XML_EXECUTABLE ${KATIE_QDBUSCPP2XML_EXECUTABLE})
set(QT_LUPDATE_EXECUTABLE ${KATIE_LUPDATE_EXECUTABLE})
set(QT_LRELEASE_EXECUTABLE ${KATIE_LRELEASE_EXECUTABLE})
set(QT_MKSPECS_DIR ${KATIE_MKSPECS_DIR}) set(QT_MKSPECS_DIR ${KATIE_MKSPECS_DIR})
add_executable(Qt4::moc IMPORTED) if(NOT "${KATIE_FIND_QUIETLY}")
set_property(TARGET Qt4::moc PROPERTY IMPORTED_LOCATION ${KATIE_MOC_EXECUTABLE}) foreach(tool ${KATIETOOLS})
add_executable(Qt4::uic IMPORTED) string(TOUPPER ${tool} uppertool)
set_property(TARGET Qt4::uic PROPERTY IMPORTED_LOCATION ${KATIE_UIC_EXECUTABLE}) add_executable(Qt4::${tool} IMPORTED)
add_executable(Qt4::rcc IMPORTED) set_property(TARGET Qt4::${tool} PROPERTY IMPORTED_LOCATION ${KATIE_${uppertool}_EXECUTABLE})
set_property(TARGET Qt4::rcc PROPERTY IMPORTED_LOCATION ${KATIE_RCC_EXECUTABLE}) endforeach()
set(QT_QTCORE_FOUND "${KATIE_CORE_FOUND}") # XXX: should those be defined conditionally based on requested components?
set(QT_QTCORE_LIBRARY "${KATIE_CORE_LIBRARIES}") foreach(component ${KATIECOMPONENTS})
set(QT_QTGUI_FOUND "${KATIE_GUI_FOUND}") add_library(Qt4::Qt${component} ${KATIE_TYPE} IMPORTED)
set(QT_QTGUI_LIBRARY "${KATIE_GUI_LIBRARIES}") endforeach()
set(QT_QTNETWORK_FOUND "${KATIE_NETWORK_FOUND}") endif()
set(QT_QTNETWORK_LIBRARY "${KATIE_NETWORK_LIBRARIES}")
set(QT_QTMULTIMEDIA_FOUND "${KATIE_MULTIMEDIA_FOUND}") # bad assumption
set(QT_QTMULTIMEDIA_LIBRARY "${KATIE_MULTIMEDIA_LIBRARIES}") if(UNIX)
set(QT_QTOPENGL_FOUND "${KATIE_OPENGL_FOUND}") set(Q_WS_X11 TRUE)
set(QT_QTOPENGL_LIBRARY "${KATIE_OPENGL_LIBRARIES}") find_package(X11 REQUIRED)
set(QT_QTSQL_FOUND "${KATIE_SQL_FOUND}") endif()
set(QT_QTSQL_LIBRARY "${KATIE_SQL_LIBRARIES}")
set(QT_QTSVG_FOUND "${KATIE_SVG_FOUND}") foreach(component ${KATIECOMPONENTS})
set(QT_QTSVG_LIBRARY "${KATIE_SVG_LIBRARIES}") string(TOUPPER ${component} uppercomp)
set(QT_QTTEST_FOUND "${KATIE_TEST_FOUND}") set(QT_QT${uppercomp}_FOUND "${KATIE_${uppercomp}_FOUND}")
set(QT_QTTEST_LIBRARY "${KATIE_TEST_LIBRARIES}") set(QT_QT${uppercomp}_LIBRARY "${KATIE_${uppercomp}_LIBRARIES}")
set(QT_QTDBUS_LIBRARY "${KATIE_DBUS_LIBRARIES}") endforeach()
set(QT_QTDBUS_FOUND "${KATIE_DBUS_FOUND}")
set(QT_QTXML_FOUND "${KATIE_XML_FOUND}")
set(QT_QTXML_LIBRARY "${KATIE_XML_LIBRARIES}")
set(QT_QTXMLPATTERNS_FOUND "${KATIE_XMLPATTERNS_FOUND}")
set(QT_QTXMLPATTERNS_LIBRARY "${KATIE_XMLPATTERNS_LIBRARIES}")
set(QT_QTSCRIPT_FOUND "${KATIE_SCRIPT_FOUND}")
set(QT_QTSCRIPT_LIBRARY "${KATIE_SCRIPT_LIBRARIES}")
set(QT_QTSCRIPTTOOLS_FOUND "${KATIE_SCRIPTTOOLS_FOUND}")
set(QT_QTSCRIPTTOOLS_LIBRARY "${KATIE_SCRIPTTOOLS_LIBRARIES}")
set(QT_QTWEBKIT_FOUND "${KATIE_WEBKIT_FOUND}")
set(QT_QTWEBKIT_LIBRARY "${KATIE_WEBKIT_LIBRARIES}")
set(QT_QTDECLARATIVE_FOUND "${KATIE_DECLARATIVE_FOUND}")
set(QT_QTDECLARATIVE_LIBRARY "${KATIE_DECLARATIVE_LIBRARIES}")
include(Qt4Macros) include(Qt4Macros)
endif() endif()

1215
cmake/modules/FindQt4.cmake
View file

File diff suppressed because it is too large Load diff

1
cmake/modules/FindQt4.cmake Symbolic link
View file

@ -0,0 +1 @@
FindKatie.cmake

2
cmake/modules/KatieMacros.cmake
View file

@ -11,7 +11,7 @@ if(NOT "${KATIE_MOC_EXECUTABLE}")
set(KATIE_MOC_EXECUTABLE "moc") set(KATIE_MOC_EXECUTABLE "moc")
endif() endif()
if(NOT "${KATIE_DBUSXML2CPP_EXECUTABLE}") if(NOT "${KATIE_DBUSXML2CPP_EXECUTABLE}")
set(KATIE_DBUSXML2CPP_EXECUTABLE "dbusxml2cpp") set(KATIE_DBUSXML2CPP_EXECUTABLE "qdbusxml2cpp")
endif() endif()
macro(KATIE_RESOURCES RESOURCES) macro(KATIE_RESOURCES RESOURCES)

2
dnssd/avahi_entrygroup_interface.h
View file

@ -12,7 +12,7 @@
#define AVAHI_ENTRYGROUP_INTERFACE_H_1175536773 #define AVAHI_ENTRYGROUP_INTERFACE_H_1175536773
#include <QtCore/QObject> #include <QtCore/QObject>
#include <QtCore/QByteRef> #include <QtCore/qbytearray.h>
#include <QtCore/QList> #include <QtCore/QList>
#include <QtCore/QMap> #include <QtCore/QMap>
#include <QtCore/QString> #include <QtCore/QString>

2
dnssd/avahi_server_interface.h
View file

@ -12,7 +12,7 @@
#define AVAHI_SERVER_INTERFACE_H_1175535514 #define AVAHI_SERVER_INTERFACE_H_1175535514
#include <QtCore/QObject> #include <QtCore/QObject>
#include <QtCore/QByteRef> #include <QtCore/qbytearray.h>
#include <QtCore/QList> #include <QtCore/QList>
#include <QtCore/QMap> #include <QtCore/QMap>
#include <QtCore/QString> #include <QtCore/QString>

2
dnssd/avahi_serviceresolver_interface.h
View file

@ -12,7 +12,7 @@
#define AVAHI_SERVICERESOLVER_INTERFACE_H_1175536773 #define AVAHI_SERVICERESOLVER_INTERFACE_H_1175536773
#include <QtCore/QObject> #include <QtCore/QObject>
#include <QtCore/QByteRef> #include <QtCore/qbytearray.h>
#include <QtCore/QList> #include <QtCore/QList>
#include <QtCore/QMap> #include <QtCore/QMap>
#include <QtCore/QString> #include <QtCore/QString>

2
experimental/libkdeclarative/kdeclarative.cpp
View file

@ -30,7 +30,7 @@
#include <QtDeclarative/qdeclarativedebug.h> #include <QtDeclarative/qdeclarativedebug.h>
#include <QtScript/QScriptEngine> #include <QtScript/QScriptEngine>
#include <QtScript/QScriptValueIterator> #include <QtScript/QScriptValueIterator>
#include <QtCore/QWeakPointer> #include <QtCore/qsharedpointer.h>
#include <kcmdlineargs.h> #include <kcmdlineargs.h>
#include <kdebug.h> #include <kdebug.h>

2
experimental/libkdeclarative/private/kdeclarative_p.h
View file

@ -22,7 +22,7 @@
#include "kdeclarative.h" #include "kdeclarative.h"
#include <QtCore/QWeakPointer> #include <QtCore/qsharedpointer.h>
class KDeclarativePrivate class KDeclarativePrivate
{ {

2
interfaces/kimproxy/library/kimproxy.cpp
View file

@ -23,7 +23,7 @@
#include "kimproxy.h" #include "kimproxy.h"
#include <QtCore/QBool> #include <QtCore/qglobal.h>
#include <QtGui/QPixmapCache> #include <QtGui/QPixmapCache>
#include <kapplication.h> #include <kapplication.h>

4
interfaces/kmediaplayer/kmediaplayeradaptor.cpp
View file

@ -8,8 +8,8 @@
*/ */
#include "kmediaplayeradaptor_p.h" #include "kmediaplayeradaptor_p.h"
#include <QtCore/QArgument> #include <QtCore/qobjectdefs.h>
#include <QtCore/QByteRef> #include <QtCore/qbytearray.h>
#include <QtCore/QList> #include <QtCore/QList>
#include <QtCore/QMap> #include <QtCore/QMap>
#include <QtCore/QString> #include <QtCore/QString>

2
interfaces/ktexteditor/codecompletionmodel.h
View file

@ -21,7 +21,7 @@
#define KDELIBS_KTEXTEDITOR_CODECOMPLETIONMODEL_H #define KDELIBS_KTEXTEDITOR_CODECOMPLETIONMODEL_H
#include <ktexteditor/ktexteditor_export.h> #include <ktexteditor/ktexteditor_export.h>
#include <QtCore/QModelIndex> #include <QtCore/qabstractitemmodel.h>
#include <ktexteditor/range.h> #include <ktexteditor/range.h>
namespace KTextEditor { namespace KTextEditor {

2
interfaces/ktexteditor/codecompletionmodelcontrollerinterface.cpp
View file

@ -19,7 +19,7 @@
#include "codecompletionmodelcontrollerinterface.h" #include "codecompletionmodelcontrollerinterface.h"
#include <QtCore/QModelIndex> #include <QtCore/qabstractitemmodel.h>
#include <ktexteditor/view.h> #include <ktexteditor/view.h>
#include <ktexteditor/document.h> #include <ktexteditor/document.h>

1
interfaces/ktexteditor/ktexteditor.cpp
View file

@ -17,6 +17,7 @@
Boston, MA 02110-1301, USA. Boston, MA 02110-1301, USA.
*/ */
#include <QtCore/qcoreapplication.h>
#include <QtDBus/QtDBus> #include <QtDBus/QtDBus>
#include "cursor.h" #include "cursor.h"

2
interfaces/ktexteditor/templateinterface.cpp
View file

@ -22,7 +22,7 @@
#include <QtCore/QString> #include <QtCore/QString>
#include <klocale.h> #include <klocale.h>
#include <kglobal.h> #include <kglobal.h>
#include <QtCore/QDate> #include <QtCore/qdatetime.h>
#include <QtCore/QRegExp> #include <QtCore/QRegExp>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kcalendarsystem.h> #include <kcalendarsystem.h>

2
kdecore/auth/backends/dbus/DBusBackend.cpp
View file

@ -23,7 +23,7 @@
#include <QtDBus/QDBusMessage> #include <QtDBus/QDBusMessage>
#include <QtDBus/QDBusConnection> #include <QtDBus/QDBusConnection>
#include <QtDBus/QDBusPendingCall> #include <QtDBus/QDBusPendingCall>
#include <QtCore/QLatin1String> #include <QtCore/qstring.h>
#include <QtCore/QStringList> #include <QtCore/QStringList>
#include <QtCore/QRegExp> #include <QtCore/QRegExp>

1
kdecore/auth/backends/dbus/DBusHelperProxy.cpp
View file

@ -27,6 +27,7 @@
#include <QtDBus/QDBusConnection> #include <QtDBus/QDBusConnection>
#include <QDebug> #include <QDebug>
#include <QTimer> #include <QTimer>
#include <QtCore/qeventloop.h>
#include <klocalizedstring.h> #include <klocalizedstring.h>

2
kdecore/config/conversion_check.h
View file

@ -25,7 +25,7 @@
#include <QtCore/QString> #include <QtCore/QString>
#include <QtGui/QColor> #include <QtGui/QColor>
#include <QtGui/QFont> #include <QtGui/QFont>
#include <QtCore/QDate> #include <QtCore/qdatetime.h>
#include <QtCore/QPoint> #include <QtCore/QPoint>
#include <QtCore/QSize> #include <QtCore/QSize>
#include <QtCore/QRect> #include <QtCore/QRect>

2
kdecore/config/kconfiggroup.cpp
View file

@ -31,7 +31,7 @@
#include "kconfigdata.h" #include "kconfigdata.h"
#include <kdebug.h> #include <kdebug.h>
#include <QtCore/QDate> #include <QtCore/qdatetime.h>
#include <QtCore/QSharedData> #include <QtCore/QSharedData>
#include <QtCore/QFile> #include <QtCore/QFile>
#include <QtCore/QPoint> #include <QtCore/QPoint>

2
kdecore/config/kconfiggroup.h
View file

@ -28,7 +28,7 @@
#include <kdecore_export.h> #include <kdecore_export.h>
#include <QtCore/QExplicitlySharedDataPointer> #include <QtCore/qsharedpointer.h>
#include <QtCore/QVariant> #include <QtCore/QVariant>
#include <QtCore/QStringList> #include <QtCore/QStringList>

2
kdecore/config/kcoreconfigskeleton.h
View file

@ -29,7 +29,7 @@
#include <ksharedconfig.h> #include <ksharedconfig.h>
#include <kconfiggroup.h> #include <kconfiggroup.h>
#include <QtCore/QDate> #include <QtCore/qdatetime.h>
#include <QtCore/QHash> #include <QtCore/QHash>
#include <QtCore/QRect> #include <QtCore/QRect>
#include <QtCore/QStringList> #include <QtCore/QStringList>

2
kdecore/date/kcalendarera.cpp
View file

@ -23,7 +23,7 @@
#include "kdebug.h" #include "kdebug.h"
#include <QtCore/QDate> #include <QtCore/qdatetime.h>
KCalendarEra::KCalendarEra() KCalendarEra::KCalendarEra()
{ {

2
kdecore/date/kcalendarera_p.h
View file

@ -21,7 +21,7 @@
#define KCALENDARERA_H #define KCALENDARERA_H
#include <QtCore/QString> #include <QtCore/QString>
#include <QtCore/QDate> #include <QtCore/qdatetime.h>
#include "klocale.h" #include "klocale.h"

2
kdecore/date/kcalendarsystem.h
View file

@ -27,7 +27,7 @@
#include "kglobal.h" #include "kglobal.h"
#include <QtCore/QStringList> #include <QtCore/QStringList>
#include <QtCore/QDate> #include <QtCore/qdatetime.h>
class KCalendarSystemPrivate; class KCalendarSystemPrivate;
class KCalendarEra; class KCalendarEra;

4
kdecore/date/kcalendarsystemcoptic.cpp
View file

@ -24,8 +24,8 @@
#include "kdebug.h" #include "kdebug.h"
#include "klocale.h" #include "klocale.h"
#include <QtCore/QDate> #include <QtCore/qdatetime.h>
#include <QtCore/QCharRef> #include <QtCore/qstring.h>
// Shared d pointer implementations // Shared d pointer implementations

4
kdecore/date/kcalendarsystemethiopian.cpp
View file

@ -23,8 +23,8 @@
#include "kdebug.h" #include "kdebug.h"
#include "klocale.h" #include "klocale.h"
#include <QtCore/QDate> #include <QtCore/qdatetime.h>
#include <QtCore/QCharRef> #include <QtCore/qstring.h>
//Reuse the Coptic private implementation //Reuse the Coptic private implementation
class KCalendarSystemEthiopianPrivate : public KCalendarSystemCopticPrivate class KCalendarSystemEthiopianPrivate : public KCalendarSystemCopticPrivate

4
kdecore/date/kcalendarsystemgregorian.cpp
View file

@ -28,8 +28,8 @@
#include "kglobal.h" #include "kglobal.h"
#include "kconfiggroup.h" #include "kconfiggroup.h"
#include <QtCore/QDate> #include <QtCore/qdatetime.h>
#include <QtCore/QCharRef> #include <QtCore/qstring.h>
// Shared d pointer base class definitions // Shared d pointer base class definitions

4
kdecore/date/kcalendarsystemhebrew.cpp
View file

@ -28,8 +28,8 @@
#include "kdebug.h" #include "kdebug.h"
#include "klocale.h" #include "klocale.h"
#include <QtCore/QDate> #include <QtCore/qdatetime.h>
#include <QtCore/QCharRef> #include <QtCore/qstring.h>
static int hebrewDaysElapsed(int y); static int hebrewDaysElapsed(int y);

4
kdecore/date/kcalendarsystemindiannational.cpp
View file

@ -23,8 +23,8 @@
#include "kdebug.h" #include "kdebug.h"
#include "klocale.h" #include "klocale.h"
#include <QtCore/QDate> #include <QtCore/qdatetime.h>
#include <QtCore/QCharRef> #include <QtCore/qstring.h>
class KCalendarSystemIndianNationalPrivate : public KCalendarSystemPrivate class KCalendarSystemIndianNationalPrivate : public KCalendarSystemPrivate
{ {

2
kdecore/date/kcalendarsystemislamiccivil.cpp
View file

@ -22,7 +22,7 @@
#include "kcalendarsystemislamiccivil_p.h" #include "kcalendarsystemislamiccivil_p.h"
#include "kcalendarsystemprivate_p.h" #include "kcalendarsystemprivate_p.h"
#include <QtCore/QDate> #include <QtCore/qdatetime.h>
class KCalendarSystemIslamicCivilPrivate : public KCalendarSystemPrivate class KCalendarSystemIslamicCivilPrivate : public KCalendarSystemPrivate
{ {

2
kdecore/date/kcalendarsystemjalali.cpp
View file

@ -30,7 +30,7 @@
#include "kcalendarsystemjalali_p.h" #include "kcalendarsystemjalali_p.h"
#include "kcalendarsystemprivate_p.h" #include "kcalendarsystemprivate_p.h"
#include <QtCore/QDate> #include <QtCore/qdatetime.h>
class KCalendarSystemJalaliPrivate : public KCalendarSystemPrivate class KCalendarSystemJalaliPrivate : public KCalendarSystemPrivate
{ {

2
kdecore/date/kcalendarsystemjapanese.cpp
View file

@ -23,7 +23,7 @@
#include "kdebug.h" #include "kdebug.h"
#include "klocale.h" #include "klocale.h"
#include <QtCore/QDate> #include <QtCore/qdatetime.h>
//Reuse the Gregorian private implementation //Reuse the Gregorian private implementation
class KCalendarSystemJapanesePrivate : public KCalendarSystemGregorianPrivate class KCalendarSystemJapanesePrivate : public KCalendarSystemGregorianPrivate

4
kdecore/date/kcalendarsystemjulian.cpp
View file

@ -25,8 +25,8 @@
#include "kglobal.h" #include "kglobal.h"
#include "kconfiggroup.h" #include "kconfiggroup.h"
#include <QtCore/QDate> #include <QtCore/qdatetime.h>
#include <QtCore/QCharRef> #include <QtCore/qstring.h>
class KCalendarSystemJulianPrivate : public KCalendarSystemPrivate class KCalendarSystemJulianPrivate : public KCalendarSystemPrivate
{ {

2
kdecore/date/kcalendarsystemminguo.cpp
View file

@ -23,7 +23,7 @@
#include "kdebug.h" #include "kdebug.h"
#include "klocale.h" #include "klocale.h"
#include <QtCore/QDate> #include <QtCore/qdatetime.h>
//Reuse the Gregorian private implementation //Reuse the Gregorian private implementation
class KCalendarSystemMinguoPrivate : public KCalendarSystemGregorianPrivate class KCalendarSystemMinguoPrivate : public KCalendarSystemGregorianPrivate

4
kdecore/date/kcalendarsystemqdate.cpp
View file

@ -30,8 +30,8 @@
#include "kglobal.h" #include "kglobal.h"
#include "kconfiggroup.h" #include "kconfiggroup.h"
#include <QtCore/QDate> #include <QtCore/qdatetime.h>
#include <QtCore/QCharRef> #include <QtCore/qstring.h>
class KCalendarSystemQDatePrivate : public KCalendarSystemPrivate class KCalendarSystemQDatePrivate : public KCalendarSystemPrivate
{ {

2
kdecore/date/kcalendarsystemthai.cpp
View file

@ -23,7 +23,7 @@
#include "kdebug.h" #include "kdebug.h"
#include "klocale.h" #include "klocale.h"
#include <QtCore/QDate> #include <QtCore/qdatetime.h>
//Reuse the Gregorian private implementation //Reuse the Gregorian private implementation
class KCalendarSystemThaiPrivate : public KCalendarSystemGregorianPrivate class KCalendarSystemThaiPrivate : public KCalendarSystemGregorianPrivate

2
kdecore/date/kdatetime.h
View file

@ -30,7 +30,7 @@
#include <ktimezone.h> #include <ktimezone.h>
#include <QtCore/QMetaType> #include <QtCore/QMetaType>
#include <QtCore/QSharedDataPointer> #include <QtCore/qshareddata.h>
class QDataStream; class QDataStream;
class KDateTimePrivate; class KDateTimePrivate;

2
kdecore/date/kdatetimeformatter.cpp
View file

@ -20,7 +20,7 @@
#include "kdatetimeformatter_p.h" #include "kdatetimeformatter_p.h"
#include <QtCore/QDate> #include <QtCore/qdatetime.h>
#include <QtCore/QString> #include <QtCore/QString>
#include <QtCore/QStringList> #include <QtCore/QStringList>
#include <QtCore/QChar> #include <QtCore/QChar>

2
kdecore/date/kdayperiod.cpp
View file

@ -21,7 +21,7 @@
#include <QtCore/QSharedData> #include <QtCore/QSharedData>
#include <QtCore/QString> #include <QtCore/QString>
#include <QtCore/QTime> #include <QtCore/qdatetime.h>
class KDayPeriodPrivate : public QSharedData class KDayPeriodPrivate : public QSharedData
{ {

2
kdecore/date/kdayperiod_p.h
View file

@ -20,7 +20,7 @@
#ifndef KDAYPERIOD_H #ifndef KDAYPERIOD_H
#define KDAYPERIOD_H #define KDAYPERIOD_H
#include <QtCore/QSharedDataPointer> #include <QtCore/qshareddata.h>
#include "klocale.h" #include "klocale.h"
#include <kdecore_export.h> #include <kdecore_export.h>

2
kdecore/date/klocalizeddate.h
View file

@ -21,7 +21,7 @@
#define KLOCALIZEDDATE_H #define KLOCALIZEDDATE_H
#include <QtCore/QString> #include <QtCore/QString>
#include <QtCore/QDate> #include <QtCore/qdatetime.h>
#include <kdecore_export.h> #include <kdecore_export.h>
#include "kcalendarsystem.h" #include "kcalendarsystem.h"

2
kdecore/date/ktimezone.h
View file

@ -38,7 +38,7 @@
#include <QtCore/QList> #include <QtCore/QList>
#include <QtCore/QString> #include <QtCore/QString>
#include <QtCore/QByteArray> #include <QtCore/QByteArray>
#include <QtCore/QSharedDataPointer> #include <QtCore/qshareddata.h>
class KTimeZone; class KTimeZone;
class KTimeZoneBackend; class KTimeZoneBackend;

2
kdecore/io/karchive.h
View file

@ -24,7 +24,7 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
#include <QtCore/QDate> #include <QtCore/qdatetime.h>
#include <QtCore/QString> #include <QtCore/QString>
#include <QtCore/QStringList> #include <QtCore/QStringList>
#include <QtCore/QHash> #include <QtCore/QHash>

2
kdecore/io/kautosavefile.cpp
View file

@ -21,7 +21,7 @@
#include <stdio.h> // for FILENAME_MAX #include <stdio.h> // for FILENAME_MAX
#include <QtCore/QLatin1Char> #include <QtCore/qchar.h>
#include <QtCore/QCoreApplication> #include <QtCore/QCoreApplication>
#include "klockfile.h" #include "klockfile.h"
#include "krandom.h" #include "krandom.h"

2
kdecore/io/klockfile_unix.cpp
View file

@ -34,7 +34,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <QtCore/QDate> #include <QtCore/qdatetime.h>
#include <QtCore/QFile> #include <QtCore/QFile>
#include <QTextStream> #include <QTextStream>

2
kdecore/io/kmessage.cpp
View file

@ -20,7 +20,7 @@
#include <kglobal.h> #include <kglobal.h>
#include <QtCore/QLatin1String> #include <QtCore/qstring.h>
#include <iostream> #include <iostream>

2
kdecore/io/kurl.cpp
View file

@ -38,7 +38,7 @@
#include <unistd.h> #include <unistd.h>
#include <QtCore/QDir> #include <QtCore/QDir>
#include <QtCore/QMutableStringListIterator> #include <QtCore/qstringlist.h>
#include <QtCore/QRegExp> #include <QtCore/QRegExp>
#include <QtCore/QMimeData> #include <QtCore/QMimeData>
#include <QtCore/QTextCodec> #include <QtCore/QTextCodec>

2
kdecore/io/kzip.cpp
View file

@ -26,7 +26,7 @@
#include <QtCore/QByteArray> #include <QtCore/QByteArray>
#include <QtCore/QFile> #include <QtCore/QFile>
#include <QtCore/QDir> #include <QtCore/QDir>
#include <QtCore/QDate> #include <QtCore/qdatetime.h>
#include <QtCore/QList> #include <QtCore/QList>
#include <zlib.h> #include <zlib.h>

2
kdecore/kconfig_compiler/kconfig_compiler.cpp
View file

@ -32,7 +32,7 @@
#include <QtCore/QFileInfo> #include <QtCore/QFileInfo>
#include <QtCore/QSettings> #include <QtCore/QSettings>
#include <QtCore/QTextStream> #include <QtCore/QTextStream>
#include <QtXml/QDomAttr> #include <QtXml/qdom.h>
#include <QtCore/QRegExp> #include <QtCore/QRegExp>
#include <QtCore/QStringList> #include <QtCore/QStringList>

2
kdecore/kernel/kaboutdata.h
View file

@ -30,7 +30,7 @@
// Qt // Qt
#include <QtCore/QString> #include <QtCore/QString>
#include <QtCore/QSharedDataPointer> #include <QtCore/qshareddata.h>
template <class T> class QList; template <class T> class QList;
class QVariant; class QVariant;

4
kdecore/kernel/kauthorized.cpp
View file

@ -37,8 +37,8 @@
#include <kconfiggroup.h> #include <kconfiggroup.h>
#include <QMutex> #include <QMutex>
#include <QMutexLocker> #include <QtCore/qmutex.h>
#include <QtCore/QBool> #include <QtCore/qglobal.h>
extern bool kde_kiosk_exception; extern bool kde_kiosk_exception;

2
kdecore/kernel/kcmdlineargs.h
View file

@ -20,7 +20,7 @@
#define KCMDLINEARGS_H #define KCMDLINEARGS_H
#include <kdecore_export.h> #include <kdecore_export.h>
#include <QtCore/QBool> #include <QtCore/qglobal.h>
#include <klocale.h> #include <klocale.h>

2
kdecore/kernel/kcomponentdata.cpp
View file

@ -31,7 +31,7 @@
#include "klocale.h" #include "klocale.h"
#include "kconfiggroup.h" #include "kconfiggroup.h"
#include "kstandarddirs.h" #include "kstandarddirs.h"
#include <QtDebug> #include <QtCore/qdebug.h>
KComponentData::KComponentData() KComponentData::KComponentData()
: d(0) : d(0)

4
kdecore/kernel/kcomponentdata_p.h
View file

@ -21,8 +21,8 @@
#define KERNEL_KCOMPONENTDATA_P_H #define KERNEL_KCOMPONENTDATA_P_H
#include "kcomponentdata.h" #include "kcomponentdata.h"
#include <QAtomicInt> #include <QtCore/qatomic.h>
#include <QtDebug> #include <QtCore/qdebug.h>
#include <QString> #include <QString>
#include <kconfig.h> #include <kconfig.h>

2
kdecore/kernel/kglobal.cpp
View file

@ -27,7 +27,7 @@
#include "kglobal.h" #include "kglobal.h"
#include "kglobal_p.h" #include "kglobal_p.h"
#include <QThread> #include <QThread>
#include <QAtomicInt> #include <QtCore/qatomic.h>
#include <config.h> #include <config.h>

2
kdecore/kernel/kglobal.h
View file

@ -20,7 +20,7 @@
#define KGLOBAL_H #define KGLOBAL_H
#include <kdecore_export.h> #include <kdecore_export.h>
#include <QtCore/QAtomicPointer> #include <QtCore/qatomic.h>
#include <sys/types.h> #include <sys/types.h>
#include <QtCore/QObject> #include <QtCore/QObject>

2
kdecore/kernel/kglobal_p.h
View file

@ -21,7 +21,7 @@
#define KGLOBAL_P_H #define KGLOBAL_P_H
#include <kdecore_export.h> #include <kdecore_export.h>
#include <QtCore/QAtomicPointer> #include <QtCore/qatomic.h>
class KComponentData; class KComponentData;

3
kdecore/kernel/ktoolinvocation.cpp
View file

@ -31,9 +31,10 @@
#include <klocale.h> #include <klocale.h>
#include <QMutex> #include <QMutex>
#include <QMutexLocker> #include <QtCore/qmutex.h>
#include <QCoreApplication> #include <QCoreApplication>
#include <QThread> #include <QThread>
#include <QtCore/qprocess.h>
#include <errno.h> #include <errno.h>

2
kdecore/kernel/ktoolinvocation_x11.cpp
View file

@ -45,7 +45,7 @@
#include <QtCore/QProcess> #include <QtCore/QProcess>
#include <QtCore/QHash> #include <QtCore/QHash>
#include <QtCore/QDebug> #include <QtCore/QDebug>
#include <QtCore/QBool> #include <QtCore/qglobal.h>
#include <QtCore/QFile> #include <QtCore/QFile>
#include <QtDBus/QtDBus> #include <QtDBus/QtDBus>

2
kdecore/localization/kcatalog.cpp
View file

@ -23,7 +23,7 @@
#include <config.h> #include <config.h>
#include <QtCore/QFile> #include <QtCore/QFile>
#include <QMutexLocker> #include <QtCore/qmutex.h>
#include <kdebug.h> #include <kdebug.h>

4
kdecore/localization/kcharsets.cpp
View file

@ -30,8 +30,8 @@
#include <QtCore/QDir> #include <QtCore/QDir>
#include <QtCore/QRegExp> #include <QtCore/QRegExp>
#include <QtCore/QCharRef> #include <QtCore/qstring.h>
#include <QtCore/QMutableStringListIterator> #include <QtCore/qstringlist.h>
#include <QtCore/QTextCodec> #include <QtCore/QTextCodec>
#include <assert.h> #include <assert.h>

2
kdecore/localization/kcurrencycode.cpp
View file

@ -20,7 +20,7 @@
#include "kcurrencycode.h" #include "kcurrencycode.h"
#include <QtCore/QSharedData> #include <QtCore/QSharedData>
#include <QtCore/QDate> #include <QtCore/qdatetime.h>
#include <QtCore/QString> #include <QtCore/QString>
#include <QtCore/QStringList> #include <QtCore/QStringList>
#include <QtCore/QFileInfo> #include <QtCore/QFileInfo>

2
kdecore/localization/kcurrencycode.h
View file

@ -22,7 +22,7 @@
#include <kdecore_export.h> #include <kdecore_export.h>
#include <QtCore/QSharedDataPointer> #include <QtCore/qshareddata.h>
#include <QtCore/QString> #include <QtCore/QString>
class QDate; class QDate;

2
kdecore/localization/klocale_kde.cpp
View file

@ -46,7 +46,7 @@
#include <QtCore/QRegExp> #include <QtCore/QRegExp>
#include <QtCore/QLocale> #include <QtCore/QLocale>
#include <QtCore/QHash> #include <QtCore/QHash>
#include <QtCore/QMutexLocker> #include <QtCore/qmutex.h>
#include <QtCore/QStringList> #include <QtCore/QStringList>
#include "kcatalog_p.h" #include "kcatalog_p.h"

2
kdecore/localization/klocalizedstring.cpp
View file

@ -30,7 +30,7 @@
#include <kuitsemantics_p.h> #include <kuitsemantics_p.h>
#include "kcatalogname_p.h" #include "kcatalogname_p.h"
#include <QMutexLocker> #include <QtCore/qmutex.h>
#include <QStringList> #include <QStringList>
#include <QByteArray> #include <QByteArray>
#include <QChar> #include <QChar>

2
kdecore/localization/klocalizedstring.h
View file

@ -23,7 +23,7 @@
#include <QtCore/QChar> #include <QtCore/QChar>
#include <QtCore/QLatin1Char> #include <QtCore/qchar.h>
#include <QtCore/QStringList> #include <QtCore/QStringList>
class KLocale; class KLocale;

2
kdecore/localization/kuitsemantics.cpp
View file

@ -25,7 +25,7 @@
#include <QSet> #include <QSet>
#include <QRegExp> #include <QRegExp>
#include <QStack> #include <QStack>
#include <QXmlStreamReader> #include <QtCore/qxmlstream.h>
#include <QStringList> #include <QStringList>
#include <QPair> #include <QPair>
#include <QDir> #include <QDir>

2
kdecore/localization/probers/UnicodeGroupProber.cpp
View file

@ -27,7 +27,7 @@
#include "ctype_test_p.h" #include "ctype_test_p.h"
#include <QtAlgorithms> #include <QtCore/qalgorithms.h>
#include <math.h> #include <math.h>
namespace kencodingprober { namespace kencodingprober {

6
kdecore/network/ConfigureChecks.cmake
View file

@ -6,8 +6,13 @@ include(CheckSymbolExists)
include(CheckTypeSize) include(CheckTypeSize)
include(CheckStructMember) include(CheckStructMember)
# FIXME: the ssl check fails for some reason
if(KATIE_FOUND)
set(HAVE_QSSLSOCKET TRUE)
else()
macro_push_required_vars() macro_push_required_vars()
set(CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES};${QT_INCLUDE_DIR}") set(CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES};${QT_INCLUDE_DIR}")
message(STATUS ${QT_INCLUDE_DIR})
if (QT_USE_FRAMEWORKS) if (QT_USE_FRAMEWORKS)
set(CMAKE_REQUIRED_FLAGS "-F${QT_LIBRARY_DIR} ") set(CMAKE_REQUIRED_FLAGS "-F${QT_LIBRARY_DIR} ")
endif (QT_USE_FRAMEWORKS) endif (QT_USE_FRAMEWORKS)
@ -22,6 +27,7 @@ int main()
message(SEND_ERROR "KDE Requires Qt to be built with SSL support") message(SEND_ERROR "KDE Requires Qt to be built with SSL support")
endif (NOT HAVE_QSSLSOCKET) endif (NOT HAVE_QSSLSOCKET)
macro_pop_required_vars() macro_pop_required_vars()
endif(KATIE_FOUND)
check_include_files("sys/types.h;sys/socket.h;net/if.h" HAVE_NET_IF_H) check_include_files("sys/types.h;sys/socket.h;net/if.h" HAVE_NET_IF_H)
check_include_files("sys/filio.h" HAVE_SYS_FILIO_H) check_include_files("sys/filio.h" HAVE_SYS_FILIO_H)

2
kdecore/network/ksslcertificatemanager.cpp
View file

@ -32,6 +32,8 @@
#include <ktoolinvocation.h> #include <ktoolinvocation.h>
#include <QtDBus/QtDBus> #include <QtDBus/QtDBus>
#include <QtCore/qfile.h>
#include <QtCore/qdir.h>
#include "kssld/kssld_interface.h" #include "kssld/kssld_interface.h"

2
kdecore/network/ksslcertificatemanager.h
View file

@ -27,7 +27,7 @@
#include <QtNetwork/QSslError> #include <QtNetwork/QSslError>
#include <QtCore/QString> #include <QtCore/QString>
#include <QtCore/QStringList> #include <QtCore/QStringList>
#include <QtCore/QDate> #include <QtCore/qdatetime.h>
class QSslCertificate; class QSslCertificate;
class KSslCertificateRulePrivate; class KSslCertificateRulePrivate;

2
kdecore/network/kssld/kssld.cpp
View file

@ -31,7 +31,7 @@
#include <kglobal.h> #include <kglobal.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kdebug.h> #include <kdebug.h>
#include <QtCore/QDate> #include <QtCore/qdatetime.h>
#include <kpluginfactory.h> #include <kpluginfactory.h>
#include <kpluginloader.h> #include <kpluginloader.h>

2
kdecore/network/netsupp.cpp
View file

@ -28,7 +28,7 @@
#include <unistd.h> #include <unistd.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <QtCore/QBool> #include <QtCore/qglobal.h>
#include <kdebug.h> #include <kdebug.h>

2
kdecore/services/kmimetype.cpp
View file

@ -37,6 +37,8 @@
#include <QtDBus/QtDBus> #include <QtDBus/QtDBus>
#include <QtCore/QHash> #include <QtCore/QHash>
#include <QBuffer> #include <QBuffer>
#include <QtCore/qstack.h>
#include <QtCore/qxmlstream.h>
extern int servicesDebugArea(); extern int servicesDebugArea();

2
kdecore/services/kmimetyperepository.cpp
View file

@ -28,7 +28,7 @@
#include "kfoldermimetype.h" #include "kfoldermimetype.h"
#include <QFile> #include <QFile>
#include <QProcess> #include <QProcess>
#include <QtEndian> #include <QtCore/qendian.h>
extern int servicesDebugArea(); extern int servicesDebugArea();

2
kdecore/services/kplugininfo.h
View file

@ -20,7 +20,7 @@
#ifndef KDECORE_KPLUGININFO_H #ifndef KDECORE_KPLUGININFO_H
#define KDECORE_KPLUGININFO_H #define KDECORE_KPLUGININFO_H
#include <QtCore/QExplicitlySharedDataPointer> #include <QtCore/qsharedpointer.h>
#include <QtCore/QString> #include <QtCore/QString>
#include <QtCore/QMap> #include <QtCore/QMap>
#include <QtCore/QStringList> #include <QtCore/QStringList>

2
kdecore/services/kservice.cpp
View file

@ -29,7 +29,7 @@
#include <unistd.h> #include <unistd.h>
#include <stdlib.h> #include <stdlib.h>
#include <QtCore/QCharRef> #include <QtCore/qstring.h>
#include <QtCore/QFile> #include <QtCore/QFile>
#include <QtCore/QDir> #include <QtCore/QDir>
#include <QtCore/QMap> #include <QtCore/QMap>

2
kdecore/services/kserviceaction.h
View file

@ -21,7 +21,7 @@
#define KSERVICEACTION_H #define KSERVICEACTION_H
#include <kdecore_export.h> #include <kdecore_export.h>
#include <QtCore/QSharedDataPointer> #include <QtCore/qshareddata.h>
class QVariant; class QVariant;
class KServiceActionPrivate; class KServiceActionPrivate;

2
kdecore/services/kservicegroupfactory.cpp
View file

@ -22,7 +22,7 @@
#include "ksycocadict_p.h" #include "ksycocadict_p.h"
#include "kservice.h" #include "kservice.h"
#include <QtCore/QCharRef> #include <QtCore/qstring.h>
#include <klocale.h> #include <klocale.h>
#include <kdebug.h> #include <kdebug.h>

2
kdecore/services/kservicetypeprofile.cpp
View file

@ -31,7 +31,7 @@
#include <kconfiggroup.h> #include <kconfiggroup.h>
#include <QtCore/QHash> #include <QtCore/QHash>
#include <QtAlgorithms> #include <QtCore/qalgorithms.h>
// servicetype -> profile // servicetype -> profile
class KServiceTypeProfiles : public QHash<QString, KServiceTypeProfileEntry *> class KServiceTypeProfiles : public QHash<QString, KServiceTypeProfileEntry *>

2
kdecore/sonnet/settings.cpp
View file

@ -30,7 +30,7 @@
#include <klocale.h> #include <klocale.h>
#include <QtCore/QMap> #include <QtCore/QMap>
#include <QtCore/QMutableStringListIterator> #include <QtCore/qstringlist.h>
namespace Sonnet namespace Sonnet
{ {

2
kdecore/sonnet/tests/test.cpp
View file

@ -24,7 +24,7 @@
#include <QCoreApplication> #include <QCoreApplication>
#include <kdebug.h> #include <kdebug.h>
#include <kcmdlineargs.h> #include <kcmdlineargs.h>
#include <QtCore/QDate> #include <QtCore/qdatetime.h>
using namespace Sonnet; using namespace Sonnet;

1
kdecore/sycoca/ksycoca.cpp
View file

@ -38,6 +38,7 @@
#include <QtCore/QBuffer> #include <QtCore/QBuffer>
#include <QProcess> #include <QProcess>
#include <QtDBus/QtDBus> #include <QtDBus/QtDBus>
#include <QtCore/qthread.h>
#include <config.h> #include <config.h>

2
kdecore/tests/kdirwatchtest_gui.cpp
View file

@ -22,7 +22,7 @@
#include <kaboutdata.h> #include <kaboutdata.h>
#include <kcmdlineargs.h> #include <kcmdlineargs.h>
#include <kdirwatch.h> #include <kdirwatch.h>
#include <QtCore/QDate> #include <QtCore/qdatetime.h>
#include <QtGui/QDialog> #include <QtGui/QDialog>
#include <QtCore/QDir> #include <QtCore/QDir>
#include <QtGui/QApplication> #include <QtGui/QApplication>

3
kdecore/tests/kglobaltest.cpp
View file

@ -19,6 +19,9 @@
#include <kglobal.h> #include <kglobal.h>
#include <QtCore/QObject> #include <QtCore/QObject>
#include <QtCore/qthreadpool.h>
#include <QtCore/qfuture.h>
#include <QtCore/qtconcurrentrun.h>
#include <qtest_kde.h> #include <qtest_kde.h>

2
kdecore/tests/klocaletest.cpp
View file

@ -30,7 +30,7 @@
#include "kdatetime.h" #include "kdatetime.h"
#include "ksystemtimezone.h" #include "ksystemtimezone.h"
#include <QtCore/QString> #include <QtCore/QString>
#include <QtCore/QDate> #include <QtCore/qdatetime.h>
#include <QtDBus/QtDBus> #include <QtDBus/QtDBus>
#include "moc_klocaletest.cpp" #include "moc_klocaletest.cpp"

2
kdecore/tests/klocaletimeformattest.h
View file

@ -24,7 +24,7 @@
#include <QtCore/QObject> #include <QtCore/QObject>
#include <QtCore/QString> #include <QtCore/QString>
#include <QtCore/QTime> #include <QtCore/qdatetime.h>
#include <QtCore/QMap> #include <QtCore/QMap>
#include <klocale.h> #include <klocale.h>

2
kdecore/tests/klockfiletest.cpp
View file

@ -22,6 +22,8 @@
#include <kdebug.h> #include <kdebug.h>
#include <unistd.h> #include <unistd.h>
#include <QtCore/qprocess.h>
// TODO test locking from two different threads // TODO test locking from two different threads
//#include <qtconcurrentrun.h> //#include <qtconcurrentrun.h>

2
kdecore/tests/kmimeglobsfileparsertest.cpp
View file

@ -26,6 +26,8 @@
#include <ksycoca.h> #include <ksycoca.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <QtCore/qbuffer.h>
class KMimeFileParserTest : public QObject class KMimeFileParserTest : public QObject
{ {
Q_OBJECT Q_OBJECT

4
kdecore/tests/kmimetypetest.cpp
View file

@ -41,6 +41,10 @@
#include <ktemporaryfile.h> #include <ktemporaryfile.h>
#include <kdesktopfile.h> #include <kdesktopfile.h>
#include <QtCore/qbuffer.h>
#include <QtCore/qfuture.h>
#include <QtCore/qtconcurrentrun.h>
void KMimeTypeTest::initTestCase() void KMimeTypeTest::initTestCase()
{ {
// Clean up local xdg dir in case of leftover mimetype definitions // Clean up local xdg dir in case of leftover mimetype definitions

3
kdecore/tests/kservicetest.cpp
View file

@ -37,7 +37,8 @@
#include <kservicetype.h> #include <kservicetype.h>
#include <kservicetypeprofile.h> #include <kservicetypeprofile.h>
#include <QtCore/Q_PID> #include <QtCore/qprocess.h>
#include <QtCore/qthread.h>
QTEST_KDEMAIN_CORE( KServiceTest ) QTEST_KDEMAIN_CORE( KServiceTest )

2
kdecore/tests/kservicetest.h
View file

@ -18,7 +18,7 @@
#ifndef KSERVICETEST_H #ifndef KSERVICETEST_H
#define KSERVICETEST_H #define KSERVICETEST_H
#include <QAtomicInt> #include <QtCore/qatomic.h>
#include <QtCore/QObject> #include <QtCore/QObject>
class KServiceTest : public QObject class KServiceTest : public QObject

3
kdecore/tests/ksycocathreadtest.cpp
View file

@ -35,7 +35,8 @@
#include <kservicetype.h> #include <kservicetype.h>
#include <kservicetypeprofile.h> #include <kservicetypeprofile.h>
#include <QtCore/Q_PID> #include <QtCore/qprocess.h>
#include <QtCore/qthread.h>
// Helper method for all the trader tests // Helper method for all the trader tests
static bool offerListHasService( const KService::List& offers, static bool offerListHasService( const KService::List& offers,

3
kdecore/tests/ktcpsockettest.cpp
View file

@ -19,7 +19,8 @@
*/ */
#include "ktcpsockettest.h" #include "ktcpsockettest.h"
#include <QtCore/QDebug> #include <QtCore/qdebug.h>
#include <QtCore/qthread.h>
#include <QtNetwork/QTcpSocket> #include <QtNetwork/QTcpSocket>
#include <QtNetwork/QTcpServer> #include <QtNetwork/QTcpServer>
#include "ktcpsocket.h" #include "ktcpsocket.h"

2
kdecore/tests/ktimezonestest.cpp
View file

@ -22,7 +22,7 @@
#include <stdio.h> #include <stdio.h>
#include <qtest_kde.h> #include <qtest_kde.h>
#include <QtCore/QDir> #include <QtCore/QDir>
#include <QtCore/QDate> #include <QtCore/qdatetime.h>
#include <QtDBus/QtDBus> #include <QtDBus/QtDBus>
#include <config-date.h> // for HAVE_TM_GMTOFF #include <config-date.h> // for HAVE_TM_GMTOFF
#include "ksystemtimezone.h" #include "ksystemtimezone.h"

6
kdecore/tests/kurltest.cpp
View file

@ -34,12 +34,14 @@ QTEST_KDEMAIN_CORE( KUrlTest )
#include <kglobal.h> #include <kglobal.h>
#include <kcharsets.h> #include <kcharsets.h>
#include <kuser.h> #include <kuser.h>
#include <QtCore/QTextCodec> #include <QtCore/qtextcodec.h>
#include <QtCore/QDataStream> #include <QtCore/qdatastream.h>
#include <QtCore/qmimedata.h>
#include <QtCore/QMap> #include <QtCore/QMap>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> // gethostname #include <unistd.h> // gethostname
#include <ctype.h>
//QCOMPARE cannot be used to strictly check for empty or null QString as it treats QString("") == QString() //QCOMPARE cannot be used to strictly check for empty or null QString as it treats QString("") == QString()
#define QSTREMPTY(_str) QVERIFY(!_str.isNull() && _str.isEmpty()) #define QSTREMPTY(_str) QVERIFY(!_str.isNull() && _str.isEmpty())

4
kdecore/text/kstringhandler.cpp
View file

@ -26,8 +26,8 @@
#include <kglobal.h> #include <kglobal.h>
#include <QtCore/QRegExp> // for the word ranges #include <QtCore/QRegExp> // for the word ranges
#include <QtCore/QCharRef> #include <QtCore/qstring.h>
#include <QtCore/QMutableStringListIterator> #include <QtCore/qstringlist.h>

2
kdecore/util/kexportplugin.h
View file

@ -22,7 +22,7 @@
#include <kdeversion.h> #include <kdeversion.h>
#include <QtCore/QPluginLoader> #include <QtCore/QPluginLoader>
#include <QtCore/QtPlugin> #include <QtCore/qplugin.h>
/** /**
* \internal * \internal

Some files were not shown because too many files have changed in this diff Show more