[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/kded
From:       Kevin Ottens <ervin () kde ! org>
Date:       2010-10-13 11:42:51
Message-ID: 20101013114251.A3BC2AC895 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1185433 by ervin:

kbuildsycoca doesn't depend on KCrash in the mobile profile.


 M  +14 -1     CMakeLists.txt  
 A             config-kded.h.cmake  
 M  +5 -0      kbuildsycoca.cpp  


--- trunk/KDE/kdelibs/kded/CMakeLists.txt #1185432:1185433
@@ -4,6 +4,13 @@
 
 include_directories( ${KDE4_KIO_INCLUDES} )
 
+if(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION)
+    set(KBUILDSYCOCA_NO_KCRASH TRUE)
+endif(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION)
+
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-kded.h.cmake \
${CMAKE_CURRENT_BINARY_DIR}/config-kded.h) +
+
 ########### next target ###############
 
 set(kded_KDEINIT_SRCS kded.cpp kdedadaptor.cpp
@@ -46,11 +53,17 @@
    vfolder_menu.cpp
    )
 
+if(KBUILDSYCOCA_NO_KCRASH)
+    set(KBUILDSYCOCA_MAIN_LIBS ${KDE4_KDECORE_LIBS})
+else(KBUILDSYCOCA_NO_KCRASH)
+    set(KBUILDSYCOCA_MAIN_LIBS ${KDE4_KDEUI_LIBS})
+endif(KBUILDSYCOCA_NO_KCRASH)
 
+
 # We need to add a '4' so that kde3 apps running kbuildsycoca don't run the kde4 \
one.  kde4_add_kdeinit_executable( kbuildsycoca4 NOGUI ${kbuildsycoca_KDEINIT_SRCS})
 
-target_link_libraries(kdeinit_kbuildsycoca4 ${KDE4_KDEUI_LIBS} ${QT_QTXML_LIBRARY})
+target_link_libraries(kdeinit_kbuildsycoca4 ${KBUILDSYCOCA_MAIN_LIBS} \
${QT_QTXML_LIBRARY})  
 install(TARGETS kdeinit_kbuildsycoca4 ${INSTALL_TARGETS_DEFAULT_ARGS})
 
--- trunk/KDE/kdelibs/kded/kbuildsycoca.cpp #1185432:1185433
@@ -24,6 +24,7 @@
 #include "vfolder_menu.h"
 
 #include <config.h>
+#include <config-kded.h>
 
 #include <kservice.h>
 #include <kmimetype.h>
@@ -52,7 +53,9 @@
 #include <klocale.h>
 #include <kaboutdata.h>
 #include <kcmdlineargs.h>
+#ifndef KBUILDSYCOCA_NO_KCRASH
 #include <kcrash.h>
+#endif
 #include <kmemfile.h>
 
 #include <stdlib.h>
@@ -644,9 +647,11 @@
    QCoreApplication k(argc, argv);
    KComponentData mainComponent(d);
 
+#ifndef KBUILDSYCOCA_NO_KCRASH
    KCrash::setCrashHandler(KCrash::defaultCrashHandler);
    KCrash::setEmergencySaveFunction(crashHandler);
    KCrash::setApplicationName(QString(appName));
+#endif
 
    // force generating of KLocale object. if not, the database will get
    // be translated


[prev in list] [next in list] [prev in thread] [next in thread]