generic: make changes required for building against Katie

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/kvkbd/src/CMakeLists.txt b/kvkbd/src/CMakeLists.txt
index 62cfd70..a549e97 100644 (file)
--- a/kvkbd/src/CMakeLists.txt
+++ b/kvkbd/src/CMakeLists.txt
@@ -33,7 +33,7 @@ QT4_ADD_DBUS_ADAPTOR(kvkbd_SRCS org.kde.kvkbd.Dock.xml
 
 add_executable(kvkbd ${kvkbd_SRCS} ${kvkbd_RC_SRCS} ${kvkbd_RESOURCES_RCC})
 
-target_link_libraries(kvkbd ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_LIBRARIES} X11 Xtst)
+target_link_libraries(kvkbd ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_LIBRARIES} ${QT_QTXML_LIBRARY} X11 Xtst)
 
 
 install(TARGETS kvkbd ${INSTALL_TARGETS_DEFAULT_ARGS})

diff --git a/lokalize/src/common/termlabel.cpp b/lokalize/src/common/termlabel.cpp
index 605f028..88bf7ec 100644 (file)
--- a/lokalize/src/common/termlabel.cpp
+++ b/lokalize/src/common/termlabel.cpp
@@ -22,20 +22,21 @@
 **************************************************************************** */
 
 #include "termlabel.h"
-
 #include "glossarywindow.h"
 
+#include <QEvent>
+#ifndef QT_KATIE
+#include <QMouseEvent>
+#endif
+#include <QMenu>
+
 #include <klineedit.h>
 #include <kdialog.h>
-
 #include <kdebug.h>
 #include <klocale.h>
 #include <kaction.h>
-#include <QMenu>
-
 
 using namespace GlossaryNS;
-//#include <QtGui/qevent.h>
 
 
 // TermLabel::TermLabel(QAction* action/*const QString& shortcutQWidget* parent,Qt::Key key,const QString& termTransl*/)