X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=CMakeLists.txt;h=5a241dd01ad2a3dfdf074e5e6f559cd41c9ba68b;hb=f8bffa2ad5675acec237dd845d00e086e4f4d888;hp=61428e2ba65d0113bb8f1b4c1195f853838f43f6;hpb=df38a9238d603ec8d2040619befa50980d994916;p=quassel.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 61428e2b..5a241dd0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -108,11 +108,6 @@ endif()
 
 # The following options are not for end-user consumption, so don't list them in the feature summary
 option(FATAL_WARNINGS "Make compile warnings fatal (most useful for CI builds)" OFF)
-option(WARN_QT_DEPRECATION "Warn about deprecated Qt functionality" OFF)
-if (WARN_QT_DEPRECATION)
-    # Enable Qt deprecation warnings for Qt < 5.13 (on by default in newer versions)
-    add_definitions("-DQT_DEPRECATED_WARNINGS")
-endif()
 cmake_dependent_option(DEPLOY "Add required libs to bundle resources and create a dmg" OFF "APPLE" OFF)
 
 # List of authenticators and the cmake flags to build them
@@ -155,14 +150,20 @@ endif()
 # Set up Qt
 #####################################################################
 
+set(QT_MIN_VERSION "5.5.0")
+
+# Enable Qt deprecation warnings for Qt < 5.13 (on by default in newer versions)
+add_definitions(-DQT_DEPRECATED_WARNINGS)
+
+# Disable all Qt APIs that were deprecated in 5.5 and before
+add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050500)
+
 # Find package dependencies
 #
 # Note that you can forcefully disable optional packages
 # using -DCMAKE_DISABLE_FIND_PACKAGE_<PkgName>=TRUE
 #####################################################################
 
-set(QT_MIN_VERSION "5.5.0")
-
 # Required Qt components
 set(qt_components Core Network)
 if (BUILD_GUI)
@@ -195,9 +196,6 @@ if (NOT HAVE_SSL)
     message(FATAL_ERROR "Quassel requires SSL support, but Qt is built with QT_NO_SSL")
 endif()
 
-# Compat until fallback code paths have been disabled
-add_definitions(-DHAVE_SSL)
-
 # Optional Qt components
 
 find_package(Qt5LinguistTools QUIET)