summaryrefslogtreecommitdiff
path: root/kdecore
diff options
context:
space:
mode:
authorChristian Mollekopf <mollekopf@kolabsys.com>2012-08-01 18:43:00 (GMT)
committerChristian Mollekopf <mollekopf@kolabsys.com>2012-08-01 18:43:00 (GMT)
commit9801ff66262387672112214de75d53e0871a7720 (patch)
tree58a14276e715ccc7737c690068b62f706a365449 /kdecore
parent54f68ec7841179659ae311a680063c0e986d8f57 (diff)
downloadlibcalendaring-9801ff66262387672112214de75d53e0871a7720.tar.gz
removed another bunch of dbus dependencies and compile with --no-undefined to find missing symbols before trying to link something against the installed library.libcalendaring-4.9.0
Diffstat (limited to 'kdecore')
-rw-r--r--kdecore/config/kconfig.cpp4
-rw-r--r--kdecore/date/ksystemtimezone.cpp2
-rw-r--r--kdecore/sycoca/ksycoca.cpp4
3 files changed, 10 insertions, 0 deletions
diff --git a/kdecore/config/kconfig.cpp b/kdecore/config/kconfig.cpp
index fcf0ce9..5d7990a 100644
--- a/kdecore/config/kconfig.cpp
+++ b/kdecore/config/kconfig.cpp
@@ -35,7 +35,9 @@
#include <kstandarddirs.h>
#include <kurl.h>
#include <kcomponentdata.h>
+#ifndef KDE_NO_DBUS
#include <ktoolinvocation.h>
+#endif
#include <kaboutdata.h>
#include <kdebug.h>
@@ -497,7 +499,9 @@ void KConfig::checkUpdate(const QString &id, const QString &updateFile)
const QString cfg_id = updateFile+QLatin1Char(':')+id;
const QStringList ids = cg.readEntry("update_info", QStringList());
if (!ids.contains(cfg_id)) {
+#ifndef KDE_NO_DBUS
KToolInvocation::kdeinitExecWait(QString::fromLatin1("kconf_update"), QStringList() << QString::fromLatin1("--check") << updateFile);
+#endif
reparseConfiguration();
}
}
diff --git a/kdecore/date/ksystemtimezone.cpp b/kdecore/date/ksystemtimezone.cpp
index ff66297..ed2983c 100644
--- a/kdecore/date/ksystemtimezone.cpp
+++ b/kdecore/date/ksystemtimezone.cpp
@@ -56,7 +56,9 @@
#include <kcodecs.h>
#include <kstringhandler.h>
#include <ktemporaryfile.h>
+#ifndef KDE_NO_DBUS
#include <ktoolinvocation.h>
+#endif
#include <kdebug.h>
#include <kconfiggroup.h>
#include "ktzfiletimezone.h"
diff --git a/kdecore/sycoca/ksycoca.cpp b/kdecore/sycoca/ksycoca.cpp
index dfbcbb6..5c1d6a5 100644
--- a/kdecore/sycoca/ksycoca.cpp
+++ b/kdecore/sycoca/ksycoca.cpp
@@ -22,7 +22,9 @@
#include "ksycoca_p.h"
#include "ksycocatype.h"
#include "ksycocafactory.h"
+#ifndef KDE_NO_DBUS
#include "ktoolinvocation.h"
+#endif
#include "kglobal.h"
#include "kmemfile.h"
#include "kde_file.h"
@@ -437,7 +439,9 @@ bool KSycocaPrivate::checkDatabase(BehaviorsIfNotFound ifNotFound)
// but otherwise we simply need to run kbuildsycoca to recreate the sycoca file.
if (!kdeinitRunning) {
kDebug(7011) << "We have no database.... launching kdeinit";
+#ifndef KDE_NO_DBUS
KToolInvocation::klauncher(); // this calls startKdeinit, and blocks until it returns
+#endif
// and since kdeinit4 only returns after kbuildsycoca4 is done, we can proceed.
} else {
//kDebug(7011) << QThread::currentThread() << "We have no database.... launching" << KBUILDSYCOCA_EXENAME;