[kdebase/kwin] avoid a conflict between Qt and X11

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1214094 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
samelian 14 years ago
parent fd3a982e26
commit 364641b8e0

@ -16,16 +16,16 @@ License. See the file "COPYING" for the exact licensing terms.
*/ */
#include "client.h"
#include "workspace.h"
#include <fixx11h.h>
#include <tqpopupmenu.h> #include <tqpopupmenu.h>
#include <kxerrorhandler.h> #include <kxerrorhandler.h>
#include <kstartupinfo.h> #include <kstartupinfo.h>
#include <kstringhandler.h> #include <kstringhandler.h>
#include <klocale.h> #include <klocale.h>
#include "client.h"
#include "workspace.h"
#include <fixx11h.h>
#include "notifications.h" #include "notifications.h"
#include "atoms.h" #include "atoms.h"
#include "group.h" #include "group.h"

@ -17,10 +17,6 @@ License. See the file "COPYING" for the exact licensing terms.
*/ */
#include "client.h"
#include "workspace.h"
#include <fixx11h.h>
#include <tqhbox.h> #include <tqhbox.h>
#include <tqpushbutton.h> #include <tqpushbutton.h>
#include <tqslider.h> #include <tqslider.h>
@ -34,6 +30,10 @@ License. See the file "COPYING" for the exact licensing terms.
#include <kapplication.h> #include <kapplication.h>
#include <tqregexp.h> #include <tqregexp.h>
#include "client.h"
#include "workspace.h"
#include <fixx11h.h>
#include "killwindow.h" #include "killwindow.h"
#include "tabbox.h" #include "tabbox.h"

Loading…
Cancel
Save