Merge remote-tracking branch 'origin/depclean' into 2.1

Conflicts:
	cmake/modules/QtVersionAbstraction.cmake

cmake/modules/QtVersionAbstraction.cmake

@@ -21,10 +21,6 @@ if( Qt5Core_FOUND )
     if(NOT TOKEN_AUTH_ONLY)
         find_package(Qt5WebKitWidgets REQUIRED)
         find_package(Qt5WebKit REQUIRED)
-        find_package(Qt5PrintSupport REQUIRED)
-        if(NOT APPLE)
-            find_package(Qt5Quick REQUIRED) # only needed on Windows because of OBS dependencies(?)
-        endif()
         find_package(Qt5Widgets REQUIRED)
         if(APPLE)
            find_package(Qt5MacExtras REQUIRED)
@@ -76,11 +72,16 @@ endif()
     endmacro()
 
 if(NOT TOKEN_AUTH_ONLY)
-    find_package(Qt5LinguistTools REQUIRED)
-    macro(qt_add_translation)
-	qt5_add_translation(${ARGN})
-    endmacro()
-	else()
+    find_package(Qt5LinguistTools)
+    if(Qt5LinguistTools_FOUND) 
+        macro(qt_add_translation)
+	    qt5_add_translation(${ARGN})
+        endmacro()
+    else()
+         macro(qt_add_translation)
+         endmacro()
+    endif()
+else()
     macro(qt_add_translation)
     endmacro()
 endif()