diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2013-03-12 20:04:24 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-03-12 20:05:56 +0100 |
| commit | 6fbd87113576540ff42a03f4b08857bd066f9161 (patch) | |
| tree | 2c944c25e4ad6cf4717c35fcf3daca13da8a9f59 | |
| parent | ba3f6551ce47c690267485f3f6f2b6004aae435c (diff) | |
re-add support for KDE4 Qt+glib eventloop intergration
The necessary build stuff was apparently silently dropped during gbuild
conversion and never noticed.
Change-Id: Ib1f530b92618a9d4f11c54818e984f737abaa283
| -rw-r--r-- | config_host/config_kde4.h.in | 10 | ||||
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | vcl/Library_vclplug_kde4.mk | 11 | ||||
| -rw-r--r-- | vcl/unx/kde4/KDEXLib.cxx | 2 |
4 files changed, 30 insertions, 2 deletions
diff --git a/config_host/config_kde4.h.in b/config_host/config_kde4.h.in new file mode 100644 index 000000000000..6e5cddf5a5f4 --- /dev/null +++ b/config_host/config_kde4.h.in @@ -0,0 +1,10 @@ +/* +Settings for KDE4 integration. +*/ + +#ifndef CONFIG_KDE4_H +#define CONFIG_KDE4_H + +#undef KDE_HAVE_GLIB + +#endif diff --git a/configure.ac b/configure.ac index 89b55e055330..a017909c145c 100644 --- a/configure.ac +++ b/configure.ac @@ -10278,9 +10278,13 @@ int main(int argc, char **argv) { CXXFLAGS=$save_CXXFLAGS AC_LANG_POP([C++]) - # Glib is needed for properly handling Qt event loop with Qt's Glib integration enabled + # Glib is needed for properly handling Qt event loop with Qt's Glib integration enabled. + # Sets also KDE_GLIB_CFLAGS/KDE_GLIB_LIBS if successful. PKG_CHECK_MODULES(KDE_GLIB,[glib-2.0 >= 2.4], - [KDE_HAVE_GLIB=1], + [ + KDE_HAVE_GLIB=1 + AC_DEFINE(KDE_HAVE_GLIB,1) + ], AC_MSG_WARN([[No Glib found, KDE4 support will not integrate with Qt's Glib event loop support]])) fi AC_SUBST(KDE4_CFLAGS) @@ -11722,6 +11726,7 @@ AC_CONFIG_FILES([config_host.mk Makefile lo.xcent instsetoo_native/util/openoffi AC_CONFIG_HEADERS([config_host/config_clang.h]) AC_CONFIG_HEADERS([config_host/config_global.h]) AC_CONFIG_HEADERS([config_host/config_graphite.h]) +AC_CONFIG_HEADERS([config_host/config_kde4.h]) AC_CONFIG_HEADERS([config_host/config_mingw.h]) AC_CONFIG_HEADERS([config_host/config_telepathy.h]) AC_CONFIG_HEADERS([config_host/config_typesizes.h]) diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk index 1079d848d049..ff4b89c275fd 100644 --- a/vcl/Library_vclplug_kde4.mk +++ b/vcl/Library_vclplug_kde4.mk @@ -63,6 +63,17 @@ $(eval $(call gb_Library_add_libs,vclplug_kde4,\ -lICE \ )) +ifneq ($(KDE_HAVE_GLIB),) +$(eval $(call gb_Library_add_defs,vclplug_kde4,\ + $(KDE_GLIB_CFLAGS) \ +)) + +$(eval $(call gb_Library_add_libs,vclplug_kde4,\ + $(KDE_GLIB_LIBS) \ +)) +endif + + $(eval $(call gb_Library_add_exception_objects,vclplug_kde4,\ vcl/unx/kde4/KDEData \ vcl/unx/kde4/KDE4FilePicker \ diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx index dbd66648c56f..8bdad526ea22 100644 --- a/vcl/unx/kde4/KDEXLib.cxx +++ b/vcl/unx/kde4/KDEXLib.cxx @@ -44,6 +44,8 @@ #include <stdio.h> +#include <config_kde4.h> + #if QT_VERSION >= QT_VERSION_CHECK( 4, 9, 0 ) #define QT_UNIX_EVENT_LOOP_SUPPORT #ifdef KDE_HAVE_GLIB |