X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2FCMakeLists.txt;h=d2b3852dd3d3013f762f8b28bcd8b4fd85b79752;hp=801d8ee37349be6c446252352b307e81d3b2733b;hb=bf0ef15dad76019d684293380065186341bcdc85;hpb=7156691fecfbc44a67d0ec6055d2e892a7eb42de

diff --git a/src/qtui/CMakeLists.txt b/src/qtui/CMakeLists.txt
index 801d8ee3..d2b3852d 100644
--- a/src/qtui/CMakeLists.txt
+++ b/src/qtui/CMakeLists.txt
@@ -2,12 +2,17 @@
 
 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(INDICATEQT_FOUND)
   include_directories(${INDICATEQT_INCLUDE_DIRS})
-  link_directories(${INDICATEQT_LIBRARY_DIRS})
 endif(INDICATEQT_FOUND)
 
 set(SOURCES
@@ -30,6 +35,7 @@ set(SOURCES
     columnhandleitem.cpp
     coreconfigwizard.cpp
     coreconnectdlg.cpp
+    coreconnectionstatuswidget.cpp
     coreinfodlg.cpp
     debugbufferviewoverlay.cpp
     debugconsole.cpp
@@ -37,9 +43,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
@@ -75,6 +82,7 @@ set(MOC_HDRS
     columnhandleitem.h
     coreconfigwizard.h
     coreconnectdlg.h
+    coreconnectionstatuswidget.h
     coreinfodlg.h
     debugbufferviewoverlay.h
     debugconsole.h
@@ -82,9 +90,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
@@ -114,12 +123,12 @@ set(FORMS
     bufferwidget.ui
     channellistdlg.ui
     chatviewsearchbar.ui
-    coreaccounteditdlg.ui
     coreconfigwizardintropage.ui
     coreconfigwizardadminuserpage.ui
     coreconfigwizardstorageselectionpage.ui
     coreconfigwizardsyncpage.ui
-    coreconnectdlg.ui
+    coreconnectauthdlg.ui
+    coreconnectionstatuswidget.ui
     coreinfodlg.ui
     debugbufferviewoverlay.ui
     debugconsole.ui
@@ -136,13 +145,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)
@@ -151,6 +153,21 @@ 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)
+  set(FORMS ${FORMS} sslinfodlg.ui)
+endif(HAVE_SSL)
+
 if(INDICATEQT_FOUND)
   set(SOURCES ${SOURCES} indicatornotificationbackend.cpp)
   set(MOC_HDRS ${MOC_HDRS} indicatornotificationbackend.h)