diff options
| -rw-r--r-- | config_host.mk.in | 10 | ||||
| -rw-r--r-- | config_host/config_kde4.h.in | 2 | ||||
| -rw-r--r-- | configure.ac | 140 | ||||
| -rw-r--r-- | vcl/CustomTarget_tde_moc.mk | 2 | ||||
| -rw-r--r-- | vcl/Library_vclplug_kde4.mk | 6 | ||||
| -rw-r--r-- | vcl/unx/kde4/KDEXLib.cxx | 10 |
6 files changed, 85 insertions, 85 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index 25b960978ec4..2e6d00764461 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -170,7 +170,6 @@ export ENABLE_SCRIPTING_BEANSHELL=@ENABLE_SCRIPTING_BEANSHELL@ export ENABLE_SCRIPTING_JAVASCRIPT=@ENABLE_SCRIPTING_JAVASCRIPT@ export ENABLE_SDREMOTE=@ENABLE_SDREMOTE@ export ENABLE_SDREMOTE_BLUETOOTH=@ENABLE_SDREMOTE_BLUETOOTH@ -export SYSTEM_BLUEZ=@SYSTEM_BLUEZ@ export ENABLE_SILENT_MSI=@ENABLE_SILENT_MSI@ export ENABLE_SYMBOLS=@ENABLE_SYMBOLS@ export ENABLE_SYSTRAY_GTK=@ENABLE_SYSTRAY_GTK@ @@ -300,9 +299,9 @@ export JITC_PROCESSOR_TYPE=@JITC_PROCESSOR_TYPE@ export JVM_ONE_PATH_CHECK=@JVM_ONE_PATH_CHECK@ export KDE4_CFLAGS=$(gb_SPACE)@KDE4_CFLAGS@ export KDE4_LIBS=$(gb_SPACE)@KDE4_LIBS@ -export KDE_GLIB_CFLAGS=$(gb_SPACE)@KDE_GLIB_CFLAGS@ -export KDE_GLIB_LIBS=$(gb_SPACE)@KDE_GLIB_LIBS@ -export KDE_HAVE_GLIB=@KDE_HAVE_GLIB@ +export KDE4_GLIB_CFLAGS=$(gb_SPACE)@KDE4_GLIB_CFLAGS@ +export KDE4_GLIB_LIBS=$(gb_SPACE)@KDE4_GLIB_LIBS@ +export KDE4_HAVE_GLIB=@KDE4_HAVE_GLIB@ export KRB5_LIBS=@KRB5_LIBS@ export LCMS2_CFLAGS=$(gb_SPACE)@LCMS2_CFLAGS@ export LCMS2_LIBS=$(gb_SPACE)@LCMS2_LIBS@ @@ -395,7 +394,6 @@ export MINGW_SHARED_LIBSTDCPP=@MINGW_SHARED_LIBSTDCPP@ export MINGW_SYSROOT=@MINGW_SYSROOT@ export ML_EXE=@ML_EXE@ export MOC4=@MOC4@ -export MOC=@MOC@ export MPL_SUBSET=@MPL_SUBSET@ export MSM_PATH=@MSM_PATH@ export MSPUB_CFLAGS=$(gb_SPACE)@MSPUB_CFLAGS@ @@ -499,6 +497,7 @@ export SYSBASE=@SYSBASE@ export SYSTEM_ABW=@SYSTEM_ABW@ export SYSTEM_APACHE_COMMONS=@SYSTEM_APACHE_COMMONS@ export SYSTEM_APR=@SYSTEM_APR@ +export SYSTEM_BLUEZ=@SYSTEM_BLUEZ@ export SYSTEM_BOOST=@SYSTEM_BOOST@ export SYSTEM_BSH=@SYSTEM_BSH@ export SYSTEM_BZIP2=@SYSTEM_BZIP2@ @@ -576,6 +575,7 @@ export SYSTEM_ZMF=@SYSTEM_ZMF@ export TARFILE_LOCATION=@TARFILE_LOCATION@ export TDE_CFLAGS=$(gb_SPACE)@TDE_CFLAGS@ export TDE_LIBS=$(gb_SPACE)@TDE_LIBS@ +export TDE_MOC=$(gb_SPACE)@TDE_MOC@ export TELEPATHY_CFLAGS=$(gb_SPACE)@TELEPATHY_CFLAGS@ export TELEPATHY_LIBS=$(gb_SPACE)@TELEPATHY_LIBS@ export TESTINSTALLDIR=@TESTINSTALLDIR@ diff --git a/config_host/config_kde4.h.in b/config_host/config_kde4.h.in index 6e91b3854dd1..50e85530be26 100644 --- a/config_host/config_kde4.h.in +++ b/config_host/config_kde4.h.in @@ -5,6 +5,6 @@ Settings for KDE4 integration. #ifndef CONFIG_KDE4_H #define CONFIG_KDE4_H -#define KDE_HAVE_GLIB 0 +#define KDE4_HAVE_GLIB 0 #endif diff --git a/configure.ac b/configure.ac index df3e976b5669..38b9b464da22 100644 --- a/configure.ac +++ b/configure.ac @@ -10991,7 +10991,7 @@ dnl =================================================================== TDE_CFLAGS="" TDE_LIBS="" if test "$_os" != "OpenBSD"; then - MOC="moc" + TDE_MOC="moc" fi if test "$test_tde" = "yes" -a "$ENABLE_TDE" = "TRUE"; then dnl Search paths for TQt and TDE @@ -11111,7 +11111,7 @@ your TDE installation by exporting TDEDIR before running "configure".]) fi AC_SUBST(TDE_CFLAGS) AC_SUBST(TDE_LIBS) -AC_SUBST(MOC) +AC_SUBST(TDE_MOC) dnl =================================================================== dnl KDE4 Integration @@ -11121,108 +11121,108 @@ KDE4_CFLAGS="" KDE4_LIBS="" QMAKE4="qmake" MOC4="moc" -KDE_GLIB_CFLAGS="" -KDE_GLIB_LIBS="" -KDE_HAVE_GLIB="" +KDE4_GLIB_CFLAGS="" +KDE4_GLIB_LIBS="" +KDE4_HAVE_GLIB="" if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE"; then - qt_incdirs="$QT4INC /usr/include/qt4 /usr/include $x_includes" - qt_libdirs="$QT4LIB /usr/lib/qt4 /usr/lib $x_libraries" + qt4_incdirs="$QT4INC /usr/include/qt4 /usr/include $x_includes" + qt4_libdirs="$QT4LIB /usr/lib/qt4 /usr/lib $x_libraries" - kde_incdirs="/usr/include /usr/include/kde4 $x_includes" - kde_libdirs="/usr/lib /usr/lib/kde4 /usr/lib/kde4/devel $x_libraries" + kde4_incdirs="/usr/include /usr/include/kde4 $x_includes" + kde4_libdirs="/usr/lib /usr/lib/kde4 /usr/lib/kde4/devel $x_libraries" if test -n "$supports_multilib"; then - qt_libdirs="$qt_libdirs /usr/lib64/qt4 /usr/lib64/qt /usr/lib64" - kde_libdirs="$kde_libdirs /usr/lib64 /usr/lib64/kde4 /usr/lib64/kde4/devel" + qt4_libdirs="$qt4_libdirs /usr/lib64/qt4 /usr/lib64/qt /usr/lib64" + kde4_libdirs="$kde4_libdirs /usr/lib64 /usr/lib64/kde4 /usr/lib64/kde4/devel" fi if test -n "$QTDIR"; then - qt_incdirs="$QTDIR/include $qt_incdirs" + qt4_incdirs="$QTDIR/include $qt4_incdirs" if test -z "$supports_multilib"; then - qt_libdirs="$QTDIR/lib $qt_libdirs" + qt4_libdirs="$QTDIR/lib $qt4_libdirs" else - qt_libdirs="$QTDIR/lib64 $QTDIR/lib $qt_libdirs" + qt4_libdirs="$QTDIR/lib64 $QTDIR/lib $qt4_libdirs" fi fi if test -n "$QT4DIR"; then - qt_incdirs="$QT4DIR/include $qt_incdirs" + qt4_incdirs="$QT4DIR/include $qt4_incdirs" if test -z "$supports_multilib"; then - qt_libdirs="$QT4DIR/lib $qt_libdirs" + qt4_libdirs="$QT4DIR/lib $qt4_libdirs" else - qt_libdirs="$QT4DIR/lib64 $QT4DIR/lib $qt_libdirs" + qt4_libdirs="$QT4DIR/lib64 $QT4DIR/lib $qt4_libdirs" fi fi if test -n "$KDEDIR"; then - kde_incdirs="$KDEDIR/include $kde_incdirs" + kde4_incdirs="$KDEDIR/include $kde4_incdirs" if test -z "$supports_multilib"; then - kde_libdirs="$KDEDIR/lib $kde_libdirs" + kde4_libdirs="$KDEDIR/lib $kde4_libdirs" else - kde_libdirs="$KDEDIR/lib64 $KDEDIR/lib $kde_libdirs" + kde4_libdirs="$KDEDIR/lib64 $KDEDIR/lib $kde4_libdirs" fi fi if test -n "$KDE4DIR"; then - kde_incdirs="$KDE4DIR/include $KDE4DIR/include/kde4 $kde_incdirs" + kde4_incdirs="$KDE4DIR/include $KDE4DIR/include/kde4 $kde4_incdirs" if test -z "$supports_multilib"; then - kde_libdirs="$KDE4DIR/lib $kde_libdirs" + kde4_libdirs="$KDE4DIR/lib $kde4_libdirs" else - kde_libdirs="$KDE4DIR/lib64 $KDE4DIR/lib $kde_libdirs" + kde4_libdirs="$KDE4DIR/lib64 $KDE4DIR/lib $kde4_libdirs" fi fi - qt_test_include="Qt/qobject.h" - qt_test_library="libQtNetwork.so" - kde_test_include="kwindowsystem.h" - kde_test_library="libsolid.so" + qt4_test_include="Qt/qobject.h" + qt4_test_library="libQtNetwork.so" + kde4_test_include="kwindowsystem.h" + kde4_test_library="libsolid.so" AC_MSG_CHECKING([for Qt4 headers]) - qt_header_dir="no" - for inc_dir in $qt_incdirs; do - if test -r "$inc_dir/$qt_test_include"; then - qt_header_dir="$inc_dir" + qt4_header_dir="no" + for inc_dir in $qt4_incdirs; do + if test -r "$inc_dir/$qt4_test_include"; then + qt4_header_dir="$inc_dir" break fi done - AC_MSG_RESULT([$qt_header_dir]) - if test "x$qt_header_dir" = "xno"; then + AC_MSG_RESULT([$qt4_header_dir]) + if test "x$qt4_header_dir" = "xno"; then AC_MSG_ERROR([Qt4 headers not found. Please specify the root of your Qt4 installation by exporting QT4DIR before running "configure".]) fi dnl Check for qmake - AC_PATH_PROG( QMAKEQT4, qmake-qt4, no, [`dirname $qt_header_dir`/bin:$QT4DIR/bin:$PATH] ) + AC_PATH_PROG( QMAKEQT4, qmake-qt4, no, [`dirname $qt4_header_dir`/bin:$QT4DIR/bin:$PATH] ) QMAKE4="$QMAKEQT4" if test "$QMAKE4" = "no"; then - AC_PATH_PROG( QMAKE4, qmake, no, [`dirname $qt_header_dir`/bin:$QT4DIR/bin:$PATH] ) + AC_PATH_PROG( QMAKE4, qmake, no, [`dirname $qt4_header_dir`/bin:$QT4DIR/bin:$PATH] ) if test "$QMAKE4" = "no"; then AC_MSG_ERROR([Qmake not found. Please specify the root of your Qt installation by exporting QT4DIR before running "configure".]) fi fi - qt_libdirs="`$QMAKE4 -query QT_INSTALL_LIBS` $qt_libdirs" + qt4_libdirs="`$QMAKE4 -query QT_INSTALL_LIBS` $qt4_libdirs" AC_MSG_CHECKING([for Qt4 libraries]) - qt_lib_dir="no" - for lib_dir in $qt_libdirs; do - if test -r "$lib_dir/$qt_test_library"; then - qt_lib_dir="$lib_dir" - PKG_CONFIG_PATH="$qt_lib_dir"/pkgconfig:$PKG_CONFIG_PATH + qt4_lib_dir="no" + for lib_dir in $qt4_libdirs; do + if test -r "$lib_dir/$qt4_test_library"; then + qt4_lib_dir="$lib_dir" + PKG_CONFIG_PATH="$qt4_lib_dir"/pkgconfig:$PKG_CONFIG_PATH break fi done - AC_MSG_RESULT([$qt_lib_dir]) + AC_MSG_RESULT([$qt4_lib_dir]) - if test "x$qt_lib_dir" = "xno"; then + if test "x$qt4_lib_dir" = "xno"; then AC_MSG_ERROR([Qt4 libraries not found. Please specify the root of your Qt4 installation by exporting QT4DIR before running "configure".]) fi dnl Check for Meta Object Compiler - AC_PATH_PROG( MOCQT4, moc-qt4, no, [`dirname $qt_lib_dir`/bin:$QT4DIR/bin:$PATH] ) + AC_PATH_PROG( MOCQT4, moc-qt4, no, [`dirname $qt4_lib_dir`/bin:$QT4DIR/bin:$PATH] ) MOC4="$MOCQT4" if test "$MOC4" = "no"; then - AC_PATH_PROG( MOC4, moc, no, [`dirname $qt_lib_dir`/bin:$QT4DIR/bin:$PATH] ) + AC_PATH_PROG( MOC4, moc, no, [`dirname $qt4_lib_dir`/bin:$QT4DIR/bin:$PATH] ) if test "$MOC4" = "no"; then AC_MSG_ERROR([Qt Meta Object Compiler not found. Please specify the root of your Qt installation by exporting QT4DIR before running "configure".]) @@ -11231,42 +11231,42 @@ the root of your Qt installation by exporting QT4DIR before running "configure". dnl Check for KDE4 headers AC_MSG_CHECKING([for KDE4 headers]) - kde_incdir="no" - for kde_check in $kde_incdirs; do - if test -r "$kde_check/$kde_test_include"; then - kde_incdir="$kde_check" + kde4_incdir="no" + for kde4_check in $kde4_incdirs; do + if test -r "$kde4_check/$kde4_test_include"; then + kde4_incdir="$kde4_check" break fi done - AC_MSG_RESULT([$kde_incdir]) - if test "x$kde_incdir" = "xno"; then + AC_MSG_RESULT([$kde4_incdir]) + if test "x$kde4_incdir" = "xno"; then AC_MSG_ERROR([KDE4 headers not found. Please specify the root of your KDE4 installation by exporting KDE4DIR before running "configure".]) fi if test "$kde_incdir" = "/usr/include"; then kde_incdir=; fi dnl Check for KDE4 libraries AC_MSG_CHECKING([for KDE4 libraries]) - kde_libdir="no" - for kde_check in $kde_libdirs; do - if test -r "$kde_check/$kde_test_library"; then - kde_libdir="$kde_check" + kde4_libdir="no" + for kde4_check in $kde4_libdirs; do + if test -r "$kde4_check/$kde4_test_library"; then + kde4_libdir="$kde4_check" break fi done - AC_MSG_RESULT([$kde_libdir]) - if test "x$kde_libdir" = "xno"; then + AC_MSG_RESULT([$kde4_libdir]) + if test "x$kde4_libdir" = "xno"; then AC_MSG_ERROR([KDE4 libraries not found. Please specify the root of your KDE4 installation by exporting KDE4DIR before running "configure".]) fi PKG_CHECK_MODULES([QT4],[QtNetwork QtGui]) - if ! test -z "$kde_incdir"; then - KDE4_CFLAGS="-I$kde_incdir $QT4_CFLAGS -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT" + if ! test -z "$kde4_incdir"; then + KDE4_CFLAGS="-I$kde4_incdir $QT4_CFLAGS -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT" else KDE4_CFLAGS="$QT4_CFLAGS -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT" fi - KDE4_LIBS="-L$kde_libdir -lkio -lkfile -lkdeui -lkdecore -L$qt_lib_dir $QT4_LIBS" + KDE4_LIBS="-L$kde4_libdir -lkio -lkfile -lkdeui -lkdecore -L$qt4_lib_dir $QT4_LIBS" KDE4_CFLAGS=$(printf '%s' "$KDE4_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") FilterLibs "$KDE4_LIBS" KDE4_LIBS="$filteredlibs" @@ -11287,14 +11287,14 @@ int main(int argc, char **argv) { AC_LANG_POP([C++]) # 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], + # Sets also KDE4_GLIB_CFLAGS/KDE4_GLIB_LIBS if successful. + PKG_CHECK_MODULES(KDE4_GLIB,[glib-2.0 >= 2.4], [ - KDE_HAVE_GLIB=1 - AC_DEFINE(KDE_HAVE_GLIB,1) - KDE_GLIB_CFLAGS=$(printf '%s' "$KDE_GLIB_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") - FilterLibs "${KDE_GLIB_LIBS}" - KDE_GLIB_LIBS="${filteredlibs}" + KDE4_HAVE_GLIB=1 + AC_DEFINE(KDE4_HAVE_GLIB,1) + KDE4_GLIB_CFLAGS=$(printf '%s' "$KDE4_GLIB_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") + FilterLibs "${KDE4_GLIB_LIBS}" + KDE4_GLIB_LIBS="${filteredlibs}" qt4_fix_warning= @@ -11391,9 +11391,9 @@ fi AC_SUBST(KDE4_CFLAGS) AC_SUBST(KDE4_LIBS) AC_SUBST(MOC4) -AC_SUBST(KDE_GLIB_CFLAGS) -AC_SUBST(KDE_GLIB_LIBS) -AC_SUBST(KDE_HAVE_GLIB) +AC_SUBST(KDE4_GLIB_CFLAGS) +AC_SUBST(KDE4_GLIB_LIBS) +AC_SUBST(KDE4_HAVE_GLIB) dnl =================================================================== dnl Test whether to include Evolution 2 support diff --git a/vcl/CustomTarget_tde_moc.mk b/vcl/CustomTarget_tde_moc.mk index c6a44edefebc..72c8699f741d 100644 --- a/vcl/CustomTarget_tde_moc.mk +++ b/vcl/CustomTarget_tde_moc.mk @@ -16,6 +16,6 @@ $(call gb_CustomTarget_get_workdir,vcl/unx/kde/fpicker)/kdefilepicker.moc.cxx :\ $(SRCDIR)/vcl/unx/kde/fpicker/kdefilepicker.hxx \ | $(call gb_CustomTarget_get_workdir,vcl/unx/kde/fpicker)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MOC,1) - cat $< | grep -v 'FILTER_OUT_KDE' | $(MOC) -o $@ -f$< + cat $< | grep -v 'FILTER_OUT_KDE' | $(TDE_MOC) -o $@ -f$< # vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk index 645d6c9aac33..30c406961427 100644 --- a/vcl/Library_vclplug_kde4.mk +++ b/vcl/Library_vclplug_kde4.mk @@ -64,13 +64,13 @@ $(eval $(call gb_Library_add_libs,vclplug_kde4,\ -lICE \ )) -ifneq ($(KDE_HAVE_GLIB),) +ifneq ($(KDE4_HAVE_GLIB),) $(eval $(call gb_Library_add_defs,vclplug_kde4,\ - $(KDE_GLIB_CFLAGS) \ + $(KDE4_GLIB_CFLAGS) \ )) $(eval $(call gb_Library_add_libs,vclplug_kde4,\ - $(KDE_GLIB_LIBS) \ + $(KDE4_GLIB_LIBS) \ )) endif diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx index 1d8f64a5030e..38f515097827 100644 --- a/vcl/unx/kde4/KDEXLib.cxx +++ b/vcl/unx/kde4/KDEXLib.cxx @@ -41,7 +41,7 @@ #include "KDESalDisplay.hxx" -#if KDE_HAVE_GLIB +#if KDE4_HAVE_GLIB #include "KDE4FilePicker.hxx" #include "tst_exclude_socket_notifiers.moc" #include "tst_exclude_posted_events.moc" @@ -181,7 +181,7 @@ void KDEXLib::Init() KApplication::setQuitOnLastWindowClosed(false); -#if KDE_HAVE_GLIB +#if KDE4_HAVE_GLIB m_isGlibEventLoopType = QAbstractEventDispatcher::instance()->inherits( "QEventDispatcherGlib" ); // Using KDE dialogs (and their nested event loops) works only with a proper event loop integration // that will release SolarMutex when waiting for more events. @@ -209,7 +209,7 @@ void KDEXLib::Init() // needs to be unlocked shortly before entering the main sleep (e.g. select()) and locked // immediately after. So we need to know which event loop implementation is used and // hook accordingly. -#if KDE_HAVE_GLIB +#if KDE4_HAVE_GLIB #include <glib.h> static GPollFunc old_gpoll = nullptr; @@ -234,7 +234,7 @@ static bool qt_event_filter( void* m ) void KDEXLib::setupEventLoop() { old_qt_event_filter = QAbstractEventDispatcher::instance()->setEventFilter( qt_event_filter ); -#if KDE_HAVE_GLIB +#if KDE4_HAVE_GLIB if( m_isGlibEventLoopType ) { old_gpoll = g_main_context_get_poll_func( nullptr ); @@ -416,7 +416,7 @@ using namespace com::sun::star; uno::Reference< ui::dialogs::XFilePicker2 > KDEXLib::createFilePicker( const uno::Reference< uno::XComponentContext >& xMSF ) { -#if KDE_HAVE_GLIB +#if KDE4_HAVE_GLIB if( qApp->thread() != QThread::currentThread()) { SalYieldMutexReleaser aReleaser; return Q_EMIT createFilePickerSignal( xMSF ); |