SVN commit 1099498 by reed: merge 1099497 from 4.4: initialize dbus if necessary in klauncher on OSX M +8 -0 klauncher_main.cpp --- trunk/KDE/kdelibs/kinit/klauncher_main.cpp #1099497:1099498 @@ -48,6 +48,10 @@ } #endif +#if defined(Q_OS_DARWIN) || defined (Q_OS_MAC) +#include +#endif + extern "C" KDE_EXPORT int kdemain( int argc, char**argv ) { #ifndef Q_WS_WIN @@ -61,6 +65,10 @@ } #endif +#if defined(Q_OS_DARWIN) || defined (Q_OS_MAC) + mac_initialize_dbus(); +#endif + KComponentData componentData("klauncher", "kdelibs4"); KGlobal::locale();