X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2FCMakeLists.txt;h=9a0b1209ef955cd52e04e93b5b1d54b83fd46578;hp=920fe2c2cc5d3871b5f17fcb21b5e1cd9b284698;hb=d8d9cc49774faf66170790ea687c37584e5e7a51;hpb=e7d1bc1fa02e1233f140e4b04d99ab8f4685bce5

diff --git a/src/qtui/CMakeLists.txt b/src/qtui/CMakeLists.txt
index 920fe2c2..9a0b1209 100644
--- a/src/qtui/CMakeLists.txt
+++ b/src/qtui/CMakeLists.txt
@@ -2,9 +2,19 @@
 
 set(QT_DONT_USE_QTGUI 0)
 set(QT_USE_QTNETWORK 1)
-set(QT_USE_QTDBUS 1)
+if(HAVE_DBUS)
+  set(QT_USE_QTDBUS 1)
+endif(HAVE_DBUS)
+if(HAVE_WEBKIT)
+  set(QT_USE_QTWEBKIT 1)
+  set(QT_USE_XMLPATTERNS 1)
+endif(HAVE_WEBKIT)
 include(${QT_USE_FILE})
 
+if (QCA2_FOUND)
+  include_directories(${QCA2_INCLUDE_DIR})
+endif (QCA2_FOUND)
+
 if(INDICATEQT_FOUND)
   include_directories(${INDICATEQT_INCLUDE_DIRS})
 endif(INDICATEQT_FOUND)
@@ -37,10 +47,10 @@ set(SOURCES
     debugmessagemodelfilter.cpp
     inputwidget.cpp
     ircconnectionwizard.cpp
-    jumpkeyhandler.cpp
     legacysystemtray.cpp
     mainpage.cpp
     mainwin.cpp
+    markerlineitem.cpp
     msgprocessorstatuswidget.cpp
     nicklistwidget.cpp
     qtui.cpp
@@ -84,10 +94,10 @@ set(MOC_HDRS
     debugmessagemodelfilter.h
     inputwidget.h
     ircconnectionwizard.h
-    jumpkeyhandler.h
     legacysystemtray.h
     mainpage.h
     mainwin.h
+    markerlineitem.h
     msgprocessorstatuswidget.h
     nicklistwidget.h
     qtui.h
@@ -139,13 +149,6 @@ if(HAVE_KDE)
   set(SOURCES ${SOURCES} knotificationbackend.cpp)
   set(MOC_HDRS ${MOC_HDRS} knotificationbackend.h)
 else(HAVE_KDE)
-  if(HAVE_DBUS)
-    set(SOURCES ${SOURCES} desktopnotificationbackend.cpp)
-    set(MOC_HDRS ${MOC_HDRS} desktopnotificationbackend.h)
-    set(FORMS ${FORMS} desktopnotificationconfigwidget.ui)
-    qt4_add_dbus_interface(DBUS ../../interfaces/org.freedesktop.Notifications.xml desktopnotificationinterface)
-  endif(HAVE_DBUS)
-
   if(HAVE_PHONON)
     set(SOURCES ${SOURCES} phononnotificationbackend.cpp)
     set(MOC_HDRS ${MOC_HDRS} phononnotificationbackend.h)
@@ -154,6 +157,15 @@ else(HAVE_KDE)
   endif(HAVE_PHONON)
 endif(HAVE_KDE)
 
+if(HAVE_DBUS)
+  set(SOURCES ${SOURCES} statusnotifieritem.cpp statusnotifieritemdbus.cpp)
+  set(MOC_HDRS ${MOC_HDRS} statusnotifieritem.h statusnotifieritemdbus.h)
+  set(FORMS ${FORMS})
+  qt4_add_dbus_interface(DBUS ../../interfaces/org.kde.StatusNotifierWatcher.xml statusnotifierwatcher)
+  qt4_add_dbus_interface(DBUS ../../interfaces/org.freedesktop.Notifications.xml notificationsclient)
+  qt4_add_dbus_adaptor(DBUS ../../interfaces/org.kde.StatusNotifierItem.xml statusnotifieritemdbus.h StatusNotifierItemDBus)  
+endif(HAVE_DBUS)
+
 if(HAVE_SSL)
   set(SOURCES ${SOURCES} sslinfodlg.cpp)
   set(MOC_HDRS ${MOC_HDRS} sslinfodlg.h)