--- a/src/gui/kernel/qt_x11_p.h	Mon Jun 21 22:38:13 2010 +0100
+++ b/src/gui/kernel/qt_x11_p.h	Thu Jul 22 16:41:55 2010 +0100
@@ -331,7 +331,7 @@
 class QMimeData;
 
 struct QX11Data;
-extern QX11Data *qt_x11Data;
+extern Q_GUI_EXPORT QX11Data *qt_x11Data;
 
 enum DesktopEnvironment {
     DE_UNKNOWN,
@@ -439,6 +439,12 @@
     int xinput_eventbase;
     int xinput_errorbase;
 
+    // for XKEYBOARD support
+    bool use_xkb;
+    int xkb_major;
+    int xkb_eventbase;
+    int xkb_errorbase;
+
     QList<QWidget *> deferred_map;
     struct ScrollInProgress {
         long id;
@@ -564,11 +570,8 @@
         _MOTIF_WM_HINTS,
 
         DTWM_IS_RUNNING,
-        KDE_FULL_SESSION,
-        KWIN_RUNNING,
-        KWM_RUNNING,
-        GNOME_BACKGROUND_PROPERTIES,
         ENLIGHTENMENT_DESKTOP,
+        _DT_SAVE_MODE,
         _SGI_DESKS_MANAGER,
 
         // EWMH (aka NETWM)
@@ -629,6 +632,8 @@
 
         _NET_SYSTEM_TRAY_VISUAL,
 
+        _NET_ACTIVE_WINDOW,
+
         // Property formats
         COMPOUND_TEXT,
         TEXT,