summaryrefslogtreecommitdiffstats
path: root/konsole
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-21 19:40:47 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-21 19:40:47 +0000
commit0406f543f8c9f30455199e0f3956da41f126b2fb (patch)
tree8e485703cc71d5d3ababeac16dcbeb72641be400 /konsole
parent8155225c9be993acc0512956416d195edfef4eb9 (diff)
downloadtdebase-0406f543f8c9f30455199e0f3956da41f126b2fb.tar.gz
tdebase-0406f543f8c9f30455199e0f3956da41f126b2fb.zip
Signal/slot repairs
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1216185 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'konsole')
-rw-r--r--konsole/konsole/TEWidget.h1
-rw-r--r--konsole/konsole/kwrited.cpp1
2 files changed, 2 insertions, 0 deletions
diff --git a/konsole/konsole/TEWidget.h b/konsole/konsole/TEWidget.h
index af0bef9c1..514db41d5 100644
--- a/konsole/konsole/TEWidget.h
+++ b/konsole/konsole/TEWidget.h
@@ -27,6 +27,7 @@
#include <tqkeycode.h>
#include <tqtimer.h>
#include <tqscrollbar.h>
+#include <tqdragobject.h>
#include <kpopupmenu.h>
diff --git a/konsole/konsole/kwrited.cpp b/konsole/konsole/kwrited.cpp
index 9a89c6cb7..c1bc0a06c 100644
--- a/konsole/konsole/kwrited.cpp
+++ b/konsole/konsole/kwrited.cpp
@@ -30,6 +30,7 @@
#include <fixx11h.h>
// Qt
+#undef FontChange // Qt4
#include <dcopclient.h>
#include <tqsocketnotifier.h>