From 6e81fa9ce19536f7b5c7de37f710a416bb31eaf3 Mon Sep 17 00:00:00 2001 From: Alexander Golubev Date: Wed, 25 Sep 2013 16:14:08 +0200 Subject: Add new build option WITH_XCOMPOSITE Fix build without xcomposite This resolves Bug 1289 --- tdecore/tdeapplication.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'tdecore/tdeapplication.cpp') diff --git a/tdecore/tdeapplication.cpp b/tdecore/tdeapplication.cpp index 26138f86b..450e522c1 100644 --- a/tdecore/tdeapplication.cpp +++ b/tdecore/tdeapplication.cpp @@ -201,7 +201,7 @@ static Atom atom_NetSupported; static Atom kde_xdnd_drop; #endif -#ifdef Q_WS_X11 +#if defined(Q_WS_X11) && defined(COMPOSITE) static int composite_event, composite_error, composite_opcode; static bool x11_composite_error_generated; static int x11_error(Display *dpy, XErrorEvent *ev) { @@ -2114,7 +2114,7 @@ bool TDEApplication::isCompositionManagerAvailable() { return false; } -bool TDEApplication::detectCompositionManagerAvailable(bool force_available) { +bool TDEApplication::detectCompositionManagerAvailable(bool force_available, bool available) { const char *home; struct passwd *p; p = getpwuid(getuid()); @@ -2156,21 +2156,17 @@ Display* TDEApplication::openX11RGBADisplay() { return 0; } -Qt::HANDLE TDEApplication::getX11RGBAVisual(char *display) { +Qt::HANDLE TDEApplication::getX11RGBAVisual(Display *dpy) { return 0; } -Qt::HANDLE TDEApplication::getX11RGBAColormap(char *display) { +Qt::HANDLE TDEApplication::getX11RGBAColormap(Display *dpy) { return 0; } bool TDEApplication::isX11CompositionAvailable() { return false; } - -TDEApplication TDEApplication::KARGBApplication( bool allowStyles ) { - return TDEApplication::TDEApplication(allowStyles, true); -} #endif static bool kapp_block_user_input = false; -- cgit v1.2.1