From 107dd1f98367d07df7cbe2042786511e44706d3a Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Wed, 26 Jan 2011 22:29:12 +0000
Subject: Fix recursive repaint Add Qt4 support to kwin

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1217377 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kwin/utils.cpp | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'kwin/utils.cpp')

diff --git a/kwin/utils.cpp b/kwin/utils.cpp
index 67c3aa1c9..5a8d5ad3c 100644
--- a/kwin/utils.cpp
+++ b/kwin/utils.cpp
@@ -32,6 +32,16 @@ License. See the file "COPYING" for the exact licensing terms.
 #include "atoms.h"
 #include "notifications.h"
 
+#ifdef USE_QT4
+#include <Qt/qx11info_x11.h>
+#endif // USE_QT4
+
+#ifdef USE_QT4
+#define SET_X_TIME(x) QX11Info::setAppTime(x)
+#else // USE_QT4
+#define SET_X_TIME(x) qt_x_time = x
+#endif // USE_QT4
+
 extern Time qt_x_time;
 
 #endif
@@ -271,7 +281,7 @@ void updateXTime()
         XCheckIfEvent( qt_xdisplay(), &dummy, update_x_time_predicate, NULL );
         }
     assert( next_x_time != CurrentTime );
-    qt_x_time = next_x_time;
+    SET_X_TIME(next_x_time);
     XEvent ev; // remove the PropertyNotify event from the events queue
     XWindowEvent( qt_xdisplay(), w->winId(), PropertyChangeMask, &ev );
     }
-- 
cgit v1.2.1