Kaydet (Commit) 88945965 authored tarafından Jan-Marek Glogowski's avatar Jan-Marek Glogowski Kaydeden (comit) Thorsten Behrens

KF5 seperate Qt5 detection from KF5

Splits the configure checks into a Qt5 and KF5 specific part.

Change-Id: I0a616ba031e1f7fd0385219ac48179adb4bdaf14
üst 7cf778c4
......@@ -153,6 +153,7 @@ export ENABLE_OPTIMIZED=@ENABLE_OPTIMIZED@
export ENABLE_PCH=@ENABLE_PCH@
export ENABLE_PDFIMPORT=@ENABLE_PDFIMPORT@
export ENABLE_PDFIUM=@ENABLE_PDFIUM@
export ENABLE_QT5=@ENABLE_QT5@
export ENABLE_RANDR=@ENABLE_RANDR@
export ENABLE_RELEASE_BUILD=@ENABLE_RELEASE_BUILD@
export ENABLE_REPORTBUILDER=@ENABLE_REPORTBUILDER@
......@@ -293,9 +294,6 @@ 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 KF5_CFLAGS=$(gb_SPACE)@KF5_CFLAGS@
export KF5_GLIB_CFLAGS=$(gb_SPACE)@KF5_GLIB_CFLAGS@
export KF5_GLIB_LIBS=$(gb_SPACE)@KF5_GLIB_LIBS@
export KF5_HAVE_GLIB=@KF5_HAVE_GLIB@
export KF5_LIBS=$(gb_SPACE)@KF5_LIBS@
export KRB5_LIBS=@KRB5_LIBS@
export LCMS2_CFLAGS=$(gb_SPACE)@LCMS2_CFLAGS@
......@@ -456,6 +454,11 @@ export PYTHON_LIBS=$(gb_SPACE)@PYTHON_LIBS@
export PYTHON_VERSION=@PYTHON_VERSION@
export PYTHON_VERSION_MAJOR=@PYTHON_VERSION_MAJOR@
export PYTHON_VERSION_MINOR=@PYTHON_VERSION_MINOR@
export QT5_CFLAGS=$(gb_SPACE)@QT5_CFLAGS@
export QT5_LIBS=$(gb_SPACE)@QT5_LIBS@
export QT5_GLIB_CFLAGS=$(gb_SPACE)@QT5_GLIB_CFLAGS@
export QT5_GLIB_LIBS=$(gb_SPACE)@QT5_GLIB_LIBS@
export QT5_HAVE_GLIB=@QT5_HAVE_GLIB@
export QXP_CFLAGS=$(gb_SPACE)@QXP_CFLAGS@
export QXP_LIBS=$(gb_SPACE)@QXP_LIBS@
export RANLIB=@RANLIB@
......
/*
Settings for QT5 integration.
*/
#ifndef CONFIG_QT5_H
#define CONFIG_QT5_H
#define QT5_HAVE_GLIB 0
#endif
This diff is collapsed.
......@@ -35,7 +35,7 @@ $(eval $(call gb_InstallScript_use_modules,setup_osl,\
$(if $(filter TRUE,$(ENABLE_EVOAB2) $(ENABLE_GIO) $(ENABLE_GTK) $(ENABLE_GTK3)),\
scp2/gnome \
) \
$(if $(filter TRUE,$(ENABLE_KDE4)),\
$(if $(filter TRUE,$(ENABLE_KDE4) $(ENABLE_KF5)),\
scp2/kde \
) \
$(if $(filter TRUE,$(ENABLE_ONLINE_UPDATE)),\
......
......@@ -39,7 +39,7 @@ $(eval $(call gb_Module_add_targets,scp2,\
$(if $(filter TRUE,$(ENABLE_EVOAB2) $(ENABLE_GIO) $(ENABLE_GTK) $(ENABLE_GTK3)),\
InstallModule_gnome \
) \
$(if $(filter TRUE,$(ENABLE_KDE4)),\
$(if $(filter TRUE,$(ENABLE_KDE4) $(ENABLE_KF5)),\
InstallModule_kde \
) \
))
......
......@@ -227,6 +227,7 @@ $(call gb_CppunitTest_get_target,$(1)) : $(if $(filter $(2),$(true)),, \
$(if $(ENABLE_GTK),$(call gb_Library_get_target,vclplug_gtk)) \
$(if $(ENABLE_GTK3),$(call gb_Library_get_target,vclplug_gtk3)) \
$(if $(ENABLE_KDE4),$(call gb_Library_get_target,vclplug_kde4)) \
$(if $(ENABLE_KF5),$(call gb_Library_get_target,vclplug_kf5)) \
)
endif
......
......@@ -14,6 +14,8 @@ ifeq ($(ENABLE_GIO),TRUE)
brand_URIPARAM := --urls
else ifeq ($(ENABLE_KDE4),TRUE)
brand_URIPARAM := --urls
else ifeq ($(ENABLE_KF5),TRUE)
brand_URIPARAM := --urls
else
brand_URIPARAM :=
endif
......
......@@ -65,16 +65,22 @@ $(eval $(call gb_Library_add_libs,vclplug_kde5,\
-lICE \
))
ifneq ($(KF5_HAVE_GLIB),)
ifneq ($(QT5_HAVE_GLIB),)
$(eval $(call gb_Library_add_defs,vclplug_kde5,\
$(KF5_GLIB_CFLAGS) \
$(QT5_GLIB_CFLAGS) \
))
$(eval $(call gb_Library_add_libs,vclplug_kde5,\
$(KF5_GLIB_LIBS) \
$(QT5_GLIB_LIBS) \
))
endif
$(eval $(call gb_Library_add_defs,vclplug_kde5,\
$(KF5_CFLAGS) \
))
$(eval $(call gb_Library_add_libs,vclplug_kde5,\
$(KF5_LIBS) \
))
$(eval $(call gb_Library_add_exception_objects,vclplug_kde5,\
vcl/unx/kde5/KDE5Data \
......
......@@ -59,16 +59,22 @@ $(eval $(call gb_Library_use_externals,vclplug_kf5,\
epoxy \
))
ifneq ($(KF5_HAVE_GLIB),)
ifneq ($(QT5_HAVE_GLIB),)
$(eval $(call gb_Library_add_defs,vclplug_kf5,\
$(KF5_GLIB_CFLAGS) \
$(QT5_GLIB_CFLAGS) \
))
$(eval $(call gb_Library_add_libs,vclplug_kf5,\
$(KF5_GLIB_LIBS) \
$(QT5_GLIB_LIBS) \
))
endif
$(eval $(call gb_Library_add_defs,vclplug_kf5,\
$(KF5_CFLAGS) \
))
$(eval $(call gb_Library_add_libs,vclplug_kf5,\
$(KF5_LIBS) \
))
$(eval $(call gb_Library_add_exception_objects,vclplug_kf5,\
vcl/unx/kf5/Kf5Data \
vcl/unx/kf5/Kf5Frame \
......
......@@ -26,7 +26,7 @@
#include <QtX11Extras/QX11Info>
#include "config_kde5.h"
#include "config_qt5.h"
#include "KDE5XLib.hxx"
#include "VCLKDE5Application.hxx"
......@@ -45,7 +45,7 @@
#undef Bool
#if KF5_HAVE_GLIB
#if QT5_HAVE_GLIB
//#include "KDE4FilePicker.hxx"
#include "tst_exclude_socket_notifiers.moc"
#include "tst_exclude_posted_events.moc"
......@@ -177,7 +177,7 @@ void KDE5XLib::Init()
//KApplication::setQuitOnLastWindowClosed(false);
#if KF5_HAVE_GLIB
#if QT5_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.
......@@ -201,7 +201,7 @@ void KDE5XLib::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 KF5_HAVE_GLIB
#if QT5_HAVE_GLIB
#include <glib.h>
static GPollFunc old_gpoll = nullptr;
......@@ -238,7 +238,7 @@ void KDE5XLib::setupEventLoop()
QAbstractEventDispatcher *qDispatcher = QAbstractEventDispatcher::instance();
//qDispatcher->installNativeEventFilter( this );
#if KF5_HAVE_GLIB
#if QT5_HAVE_GLIB
if( m_isGlibEventLoopType )
{
old_gpoll = g_main_context_get_poll_func( nullptr );
......@@ -392,7 +392,7 @@ using namespace com::sun::star;
uno::Reference< ui::dialogs::XFilePicker2 > KDE5XLib::createFilePicker(
const uno::Reference< uno::XComponentContext >& xMSF )
{
#if KF5_HAVE_GLIB
#if QT5_HAVE_GLIB
if( qApp->thread() != QThread::currentThread()) {
SalYieldMutexReleaser aReleaser;
return Q_EMIT createFilePickerSignal( xMSF );
......
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