summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Mollekopf <mollekopf@kolabsys.com>2012-06-27 17:07:28 (GMT)
committerChristian Mollekopf <mollekopf@kolabsys.com>2012-06-27 17:07:28 (GMT)
commitd6d7d4602741ea27823552a19741b23fbc79660d (patch)
treead045802ab4833a51d609ea72e50f99e3692fdda
parent676c030bc92a403608f2f7a683ce0eb0cef90096 (diff)
downloadlibcalendaring-d6d7d4602741ea27823552a19741b23fbc79660d.tar.gz
come more compilation fixes for el6
-rw-r--r--kcalcore/CMakeLists.txt2
-rw-r--r--kcalcore/calformat.cpp2
-rw-r--r--kdecore/CMakeLists.txt4
-rw-r--r--kdecore/io/kdebug.cpp8
-rw-r--r--kdecore/io/kdebug.h4
-rw-r--r--kimap/CMakeLists.txt4
-rw-r--r--kmime/CMakeLists.txt2
-rw-r--r--kpimutils/email.h2
8 files changed, 14 insertions, 14 deletions
diff --git a/kcalcore/CMakeLists.txt b/kcalcore/CMakeLists.txt
index 62bcded..f127f93 100644
--- a/kcalcore/CMakeLists.txt
+++ b/kcalcore/CMakeLists.txt
@@ -21,7 +21,7 @@ find_package(Qt4 4.6.0 REQUIRED)
include_directories(${QT_INCLUDES})
-# include(GenerateExportHeader)
+#include(GenerateExportHeader)
############### Build Options ###############
diff --git a/kcalcore/calformat.cpp b/kcalcore/calformat.cpp
index ad9ae83..c9d2015 100644
--- a/kcalcore/calformat.cpp
+++ b/kcalcore/calformat.cpp
@@ -36,7 +36,7 @@
#if defined(HAVE_UUID_UUID_H)
#include <uuid/uuid.h>
#else
-#include <KRandom>
+#include <krandom.h>
#include <QtCore/QDateTime>
#endif
diff --git a/kdecore/CMakeLists.txt b/kdecore/CMakeLists.txt
index af6b408..b75fe3f 100644
--- a/kdecore/CMakeLists.txt
+++ b/kdecore/CMakeLists.txt
@@ -408,7 +408,7 @@ set(kdecore_LIB_SRCS ${kdecore_LIB_SRCS}
# util/kpluginfactory.cpp
# util/kpluginloader.cpp
# util/kshell.cpp
-# util/krandom.cpp
+ util/krandom.cpp
# util/krandomsequence.cpp
# util/qtest_kde.cpp
${kdecore_OPTIONAL_SRCS}
@@ -689,7 +689,7 @@ install(FILES
# util/kpluginfactory.h
# util/kpluginloader.h
# util/kshell.h
-# util/krandom.h
+ util/krandom.h
# util/krandomsequence.h
# util/kshareddatacache.h
# util/ksharedptr.h
diff --git a/kdecore/io/kdebug.cpp b/kdecore/io/kdebug.cpp
index d72da01..7526904 100644
--- a/kdecore/io/kdebug.cpp
+++ b/kdecore/io/kdebug.cpp
@@ -886,7 +886,7 @@ KDebug::Block::Block(const char* label, int area)
} else {
d = new Private;
d->m_label = label;
- m_startTime.start();
+ //m_startTime.start();
kDebug(area) << "BEGIN:" << label;
// The indent string is per thread
@@ -901,12 +901,12 @@ KDebug::Block::Block(const char* label, int area)
KDebug::Block::~Block()
{
if (d) {
- const double duration = m_startTime.elapsed() / 1000.0;
+ //const double duration = m_startTime.elapsed() / 1000.0;
QThreadStorage<QString*> & indentString = kDebug_data->m_indentString;
indentString.localData()->chop(2);
// Print timing information, and a special message (DELAY) if the method took longer than 5s
- if (duration < 5.0) {
+ /*if (duration < 5.0) {
kDebug(m_area)
<< "END__:"
<< d->m_label.constData()
@@ -916,7 +916,7 @@ KDebug::Block::~Block()
<< "END__:"
<< d->m_label.constData()
<< qPrintable(QString::fromLatin1("[DELAY Took (quite long) %3s]").arg(QString::number(duration, 'g', 2)));
- }
+ }*/
delete d;
}
}
diff --git a/kdecore/io/kdebug.h b/kdecore/io/kdebug.h
index ccb3a2a..02d5d03 100644
--- a/kdecore/io/kdebug.h
+++ b/kdecore/io/kdebug.h
@@ -25,7 +25,7 @@
#include <kdecore_export.h>
#include <QtCore/QDebug>
-#include <QtCore/QElapsedTimer>
+//#include <QtCore/QElapsedTimer>
/**
* \addtogroup kdebug Debug message generators
@@ -358,7 +358,7 @@ public:
~Block();
private:
- QElapsedTimer m_startTime;
+ //QElapsedTimer m_startTime;
const char *m_label; // KDE5 TODO: REMOVE
int m_area;
int m_color;
diff --git a/kimap/CMakeLists.txt b/kimap/CMakeLists.txt
index f94baa3..e8a7b79 100644
--- a/kimap/CMakeLists.txt
+++ b/kimap/CMakeLists.txt
@@ -38,7 +38,7 @@ find_package(Qt4 4.6.0 REQUIRED)
include_directories(${QT_INCLUDES})
-# include(GenerateExportHeader)
+#include(GenerateExportHeader)
include_directories( ../kdecore ../ ${CMAKE_CURRENT_BINARY_DIR})
@@ -149,7 +149,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
add_library(calendaring-kimap ${LIBRARY_TYPE} ${kimap_LIB_SRCS} )
-target_link_libraries(calendaring-kimap kdecore ${QT_QTNETWORK_LIBRARY} ${QT_QTCORE_LIBRARY} calendaring-kmime ${SASL2_LIBRARIES})
+target_link_libraries(calendaring-kimap calendaring-kdecore ${QT_QTNETWORK_LIBRARY} ${QT_QTCORE_LIBRARY} calendaring-kmime ${SASL2_LIBRARIES})
include_directories( ${SASL2_INCLUDE_DIR} ${Boost_INCLUDE_DIR} )
diff --git a/kmime/CMakeLists.txt b/kmime/CMakeLists.txt
index 299c593..e2ac24e 100644
--- a/kmime/CMakeLists.txt
+++ b/kmime/CMakeLists.txt
@@ -18,7 +18,7 @@ find_package(Qt4 4.6.0 REQUIRED)
include_directories(${QT_INCLUDES})
-# include(GenerateExportHeader)
+#include(GenerateExportHeader)
include_directories( ../kdecore )
diff --git a/kpimutils/email.h b/kpimutils/email.h
index e492c55..742e8c1 100644
--- a/kpimutils/email.h
+++ b/kpimutils/email.h
@@ -32,7 +32,7 @@
#ifndef KPIMUTILS_EMAIL_H
#define KPIMUTILS_EMAIL_H
-#include <KDE/KUrl>
+#include <kurl.h>
#include <QtCore/QStringList>
#include <QtCore/QByteArray>