summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2010-11-01 16:09:03 +0100
committerJan Holesovsky <kendy@suse.cz>2010-11-01 16:09:03 +0100
commit748df2ab7b9643df12bb656e01e4109b4dab6e14 (patch)
tree2c7a357e9c350bcbc2ecaac67c608ea448f047e4
parentbb7dd559d58281f40166d11112b2242838356e2a (diff)
parent834f3f8068aa48ae1d1ba66213242b3aef7e60db (diff)
Merge branch 'master' of ssh://git.freedesktop.org/git/libreoffice/libs-gui
Notes
split repo tag: libs-gui_LIBREOFFICE_3_3_FREEZE
-rw-r--r--vcl/unx/kde4/KDEXLib.cxx2
1 files changed, 0 insertions, 2 deletions
diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx
index a7ac4547ef67..94fe2378c887 100644
--- a/vcl/unx/kde4/KDEXLib.cxx
+++ b/vcl/unx/kde4/KDEXLib.cxx
@@ -59,11 +59,9 @@
#ifdef KDE_HAVE_GLIB
#if QT_VERSION >= QT_VERSION_CHECK( 4, 8, 0 )
-#if 0 // wait until fixed in Qt
#define GLIB_EVENT_LOOP_SUPPORT
#endif
#endif
-#endif
#ifdef GLIB_EVENT_LOOP_SUPPORT
#include <glib-2.0/glib.h>