X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=CMakeLists.txt;h=69424f633d504544ab73cfa728cbdceecab6f8d3;hp=e2d5f48be061c957a9603c02b01dc7d937d5c4d0;hb=08a36367b1f541736cede098e26eefca838b526a;hpb=d68e9d67200abc51123b357bcdbbc816d4a70791

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e2d5f48b..69424f63 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -139,11 +139,7 @@ if (USE_QT5)
     add_definitions(-DHAVE_QT5)
 else()
     message(STATUS "Building for Qt4...")
-    if (BUILD_GUI)
-        set(QT_MIN_VERSION "4.6.0")
-    else()
-        set(QT_MIN_VERSION "4.4.0")
-    endif()
+    set(QT_MIN_VERSION "4.8.0")
 
     # Select a Qt installation here, if you don't want to use system Qt
     if(QT_PATH)
@@ -256,6 +252,12 @@ if (USE_QT5)
         endif()
 
         if (WITH_KDE)
+            find_package(KF5TextWidgets QUIET)
+            set_package_properties(KF5TextWidgets PROPERTIES TYPE REQUIRED
+                URL "http://inqlude.org/libraries/ktextwidgets.html"
+                DESCRIPTION "framework providing an assortment of widgets for displaying and editing text"
+                PURPOSE     "Allows to use extra features provided by KDE Frameworks in input widgets"
+            )
 
         endif()
 
@@ -430,8 +432,8 @@ if (KDE4_FOUND)
     set(EMBED_DATA OFF)
 
     # Better have the compile flags global, even for the core, to avoid problems with linking the mono client
-    add_definitions(-DHAVE_KDE ${KDE4_DEFINITIONS})
-    set(HAVE_KDE4 TRUE)
+    add_definitions(-DHAVE_KDE -DHAVE_KDE4 ${KDE4_DEFINITIONS})
+    set(WITH_KDE4 TRUE)
 endif()
 
 if (USE_QT5 AND WITH_KDE)
@@ -442,8 +444,8 @@ if (USE_QT5 AND WITH_KDE)
     include(KDECompilerSettings)
     include(KDECMakeSettings)
 
-    add_definitions(-DHAVE_KF5)
-    set(HAVE_KF5 TRUE)
+    add_definitions(-DHAVE_KDE -DHAVE_KF5)
+    set(WITH_KF5 TRUE)
 endif()
 
 # This needs to come after setting up KDE integration, so we can use KDE-specific paths