Kaydet (Commit) 6fbd8711 authored tarafından Luboš Luňák's avatar Luboš Luňák

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
üst ba3f6551
/*
Settings for KDE4 integration.
*/
#ifndef CONFIG_KDE4_H
#define CONFIG_KDE4_H
#undef KDE_HAVE_GLIB
#endif
......@@ -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])
......
......@@ -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 \
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment