diff --git a/CMakeExternals/QxtCMakeLists.txt b/CMakeExternals/QxtCMakeLists.txt
index c6d8c33ff9..cfc018037b 100644
--- a/CMakeExternals/QxtCMakeLists.txt
+++ b/CMakeExternals/QxtCMakeLists.txt
@@ -1,551 +1,559 @@
 if(DESIRED_QT_VERSION MATCHES 5)
   cmake_minimum_required(VERSION 2.8.12)
 else()
   cmake_minimum_required(VERSION 2.8.4)
 endif()
 
 project(Qxt)
 
 set(${PROJECT_NAME}_MAJOR_VERSION 0)
 set(${PROJECT_NAME}_MINOR_VERSION 6)
 set(${PROJECT_NAME}_PATCH_VERSION 99)
 set(${PROJECT_NAME}_VERSION ${${PROJECT_NAME}_MAJOR_VERSION}.${${PROJECT_NAME}_MINOR_VERSION}.${${PROJECT_NAME}_PATCH_VERSION})
 
 macro(_qt_generate_mocs)
   foreach(file ${ARGN})
     get_filename_component(source_path ${file} PATH)
     get_filename_component(source_name ${file} NAME_WE)
     get_filename_component(source_ext ${file} EXT)
 
     set(moc_file ${CMAKE_CURRENT_BINARY_DIR}/${source_path}/moc_${source_name}.cpp)
     if(DESIRED_QT_VERSION MATCHES "4")
       QT4_GENERATE_MOC(${file} ${moc_file})
     else()
       qt5_generate_moc(${file} ${moc_file})
     endif()
     set_property(SOURCE ${source_path}/${source_name}.cpp APPEND PROPERTY
                  OBJECT_DEPENDS ${moc_file})
   endforeach()
 endmacro()
 
 macro(_qt_wrap_cpp)
   if(DESIRED_QT_VERSION MATCHES "4")
     qt4_wrap_cpp(${ARGN})
   else()
     qt5_wrap_cpp(${ARGN})
   endif()
 endmacro()
 
 macro(_qt_add_resources)
   if(DESIRED_QT_VERSION MATCHES "4")
     qt4_add_resources(${ARGN})
   else()
     qt5_add_resources(${ARGN})
   endif()
 endmacro()
 
 set(${PROJECT_NAME}_LIBRARIES
   QxtCore
   QxtWidgets
   QxtNetwork
   QxtWeb
 )
 
 set(QXT_CORE_MOC_HEADERS
   qxtabstractconnectionmanager.h
   qxtboundfunction.h
   qxtcsvmodel.h
   qxtdaemon.h
   qxtdeplex.h
   qxtdeplex_p.h
   qxtfifo.h
   qxtfilelock.h
   qxtjob.h
   qxtjob_p.h
   qxtlinesocket.h
   qxtlinesocket_p.h
   qxtlocale.h
   qxtlogger.h
   qxtlogger_p.h
   qxtmultisignalwaiter.h
   qxtnamespace.h
   qxtpipe.h
   qxtpipe_p.h
   qxtpointerlist.h
   qxtsignalgroup.h
   qxtsignalwaiter.h
   qxtslotjob.h
   qxtslotjob_p.h
   qxtstdio.h
   qxtstdio_p.h
   qxtstdstreambufdevice.h
   qxtrpcservice.h
   qxtrpcservice_p.h
 )
 
 set(QXT_GUI_MOC_HEADERS
   qxtbasespinbox.h
   qxtcheckcombobox.h
   qxtcheckcombobox_p.h
   qxtconfigdialog.h
   qxtconfigdialog_p.h
   qxtconfigwidget.h
   qxtconfigwidget_p.h
   qxtconfirmationmessage.h
   qxtcountrycombobox.h
   qxtcountrycombobox_p.h
   qxtcountrymodel.h
   qxtcountrymodel_p.h
   qxtcrumbview.h
   qxtcrumbview_p.h
   qxtflowview.h
   qxtflowview_p.h
   qxtgroupbox.h
   qxtheaderview.h
   qxtitemdelegate.h
   qxtitemdelegate_p.h
   qxtlabel.h
   qxtletterboxwidget.h
   qxtletterboxwidget_p.h
   qxtlineedit.h
   qxtlistwidget.h
   qxtlistwidget_p.h
   qxtlanguagecombobox.h
   qxtlanguagecombobox_p.h
   qxtprogresslabel.h
   qxtproxystyle.h
   qxtpushbutton.h
   qxtspanslider.h
   qxtspanslider_p.h
   qxtstars.h
   qxtstringspinbox.h
   qxtstringvalidator.h
   qxttablewidget.h
   qxttablewidget_p.h
   qxttabwidget.h
   qxttabwidget_p.h
   qxttooltip_p.h
   qxttreewidget.h
   qxttreewidget_p.h
 
   qxtscheduleheaderwidget.h
   qxtscheduleitemdelegate.h
   qxtscheduleview.h
   qxtscheduleviewheadermodel_p.h
   qxtscheduleview_p.h
 
   qxtsortfilterproxymodel.h
   qxtfilterdialog.h
   qxtfilterdialog_p.h
   qxtlookuplineedit.h
 
   # !qws:!symbian
   #qxtapplication.h
   #qxtglobalshortcut.h
 )
 
 set(QXT_NETWORK_MOC_HEADERS
   qxtjsonrpcclient.h
   qxtsmtp.h
   qxtrpcpeer.h
   qxtsmtp_p.h
   qxtsslserver.h
   qxtsslconnectionmanager.h
   qxttcpconnectionmanager.h
   qxttcpconnectionmanager_p.h
   qxtxmlrpcclient.h
 )
 
 set(QXT_WEB_MOC_HEADERS
   qxtabstracthttpconnector.h
   qxtabstractwebservice.h
   qxtabstractwebsessionmanager.h
   qxtabstractwebsessionmanager_p.h
   qxthttpsessionmanager.h
   qxtwebcontent.h
   qxtwebservicedirectory.h
   qxtwebservicedirectory_p.h
   qxtwebslotservice.h
   qxtwebcgiservice.h
   qxtwebcgiservice_p.h
 )
 
 set(QXT_NETWORK_MANUAL_MOC_HEADERS
   qxtjsonrpccall.h
   qxtxmlrpccall.h
 )
 
 set(QXT_CORE_SOURCES
   qxtabstractconnectionmanager.cpp
   qxtabstractfileloggerengine.cpp
   qxtabstractiologgerengine.cpp
   qxtbasicfileloggerengine.cpp
   qxtbasicstdloggerengine.cpp
   qxtcommandoptions.cpp
   qxtcsvmodel.cpp
   qxtdaemon.cpp
   qxtdatastreamsignalserializer.cpp
   qxtdeplex.cpp
   qxterror.cpp
   qxtfifo.cpp
   qxtfilelock.cpp
   qxtglobal.cpp
   qxthmac.cpp
   qxtlocale.cpp
   qxtjson.cpp
   qxtjob.cpp
   qxtlinesocket.cpp
   qxtlinkedtree.cpp
   qxtlogger.cpp
   qxtloggerengine.cpp
   qxtlogstream.cpp
   qxtmetaobject.cpp
   qxtmodelserializer.cpp
   qxtmultisignalwaiter.cpp
   qxtnull.cpp
   qxtpipe.cpp
   qxtpointerlist.cpp
   qxtsignalgroup.cpp
   qxtsignalwaiter.cpp
   qxtslotjob.cpp
   qxtslotmapper.cpp
   qxtstdio.cpp
   qxtstdstreambufdevice.cpp
   qxttimer.cpp
   qxtrpcservice.cpp
   qxtxmlfileloggerengine.cpp
 )
 
 set(QXT_GUI_SOURCES
   qxtbasespinbox.cpp
   qxtcheckcombobox.cpp
   qxtconfigdialog.cpp
   qxtconfigwidget.cpp
   qxtconfirmationmessage.cpp
   qxtcountrymodel.cpp
   qxtcountrycombobox.cpp
   qxtcrumbview.cpp
   qxtflowview.cpp
   qxtflowview_p.cpp
   qxtgroupbox.cpp
   qxtheaderview.cpp
   qxtitemdelegate.cpp
   qxtlabel.cpp
   qxtletterboxwidget.cpp
   qxtlineedit.cpp
   qxtlistwidget.cpp
   qxtlistwidgetitem.cpp
   qxtlanguagecombobox.cpp
   qxtprogresslabel.cpp
   qxtproxystyle.cpp
   qxtpushbutton.cpp
   qxtspanslider.cpp
   qxtstars.cpp
   qxtstringspinbox.cpp
   qxtstringvalidator.cpp
   qxttablewidget.cpp
   qxttablewidgetitem.cpp
   qxttabwidget.cpp
   qxttooltip.cpp
   qxttreewidget.cpp
   qxttreewidgetitem.cpp
 
   qxtscheduleitemdelegate.cpp
   qxtscheduleview.cpp
   qxtscheduleview_p.cpp
   qxtscheduleviewheadermodel_p.cpp
   qxtstyleoptionscheduleviewitem.cpp
   qxtscheduleheaderwidget.cpp
 
   qxtsortfilterproxymodel.cpp
   qxtfilterdialog.cpp
   qxtlookuplineedit.cpp
 
   # !qws:!symbian
   #qxtapplication.cpp
   #qxtglobalshortcut.cpp
 )
 
 set(QXT_NETWORK_SOURCES
   qxtjsonrpccall.cpp
   qxtjsonrpcclient.cpp
   qxtmailattachment.cpp
   qxtmailmessage.cpp
   qxtrpcpeer.cpp
   qxtsmtp.cpp
   qxtsslserver.cpp
   qxtsslconnectionmanager.cpp
   qxttcpconnectionmanager.cpp
   qxtxmlrpccall.cpp
   qxtxmlrpcclient.cpp
   qxtxmlrpc_p.cpp
 )
 
 set(QXT_WEB_SOURCES
   qxtabstracthttpconnector.cpp
   qxtabstractwebservice.cpp
   qxtabstractwebsessionmanager.cpp
   qxthtmltemplate.cpp
   qxthttpserverconnector.cpp
   qxthttpsessionmanager.cpp
   qxtscgiserverconnector.cpp
   qxtwebcontent.cpp
   qxtwebevent.cpp
   qxtwebservicedirectory.cpp
   qxtwebslotservice.cpp
   qxtwebcgiservice.cpp
 )
 
 if(UNIX)
   list(APPEND QXT_CORE_MOC_HEADERS unix/qxtserialdevice.h unix/qxtserialdevice_p.h)
   list(APPEND QXT_CORE_SOURCES
        unix/qxtfilelock_unix.cpp unix/qxtserialdevice.cpp unix/qxtserialdevice_unix.cpp)
   if(APPLE)
     list(APPEND QXT_GUI_SOURCES
          #mac/qxtapplication_mac.cpp
          #mac/qxtglobalshortcut_mac.cpp
         )
   else()
     if(DESIRED_QT_VERSION MATCHES "5")
       find_package(Qt5X11Extras REQUIRED)
     endif()
     list(APPEND QXT_GUI_SOURCES
          #x11/qxtapplication_x11.cpp
          #x11/qxtglobalshortcut_x11.cpp
          x11/qxtscreen_x11.cpp
          #x11/qxtwindowsystem_x11.cpp
         )
   endif()
 endif()
 
 if(NOT APPLE)
   list(APPEND QXT_GUI_SOURCES
        qxtscreen.cpp
        #qxtwindowsystem.cpp
       )
 endif()
 
 if(WIN32)
   list(APPEND QXT_CORE_SOURCES win/qxtfilelock_win.cpp)
   list(APPEND QXT_GUI_SOURCES
        #win/qxtapplication_win.cpp
        #win/qxtglobalshortcut_win.cpp
        win/qxtscreen_win.cpp
        #win/qxtwindowsystem_win.cpp
       )
 endif()
 
 set(_qxt_core_moc_headers )
 foreach(_header ${QXT_CORE_MOC_HEADERS})
   list(APPEND _qxt_core_moc_headers src/core/${_header})
 endforeach()
 
 set(_qxt_gui_moc_headers )
 foreach(_header ${QXT_GUI_MOC_HEADERS})
   list(APPEND _qxt_gui_moc_headers src/widgets/${_header})
 endforeach()
 
 set(_qxt_network_moc_headers )
 foreach(_header ${QXT_NETWORK_MOC_HEADERS})
   list(APPEND _qxt_network_moc_headers src/network/${_header})
 endforeach()
 
 set(_qxt_network_manual_moc_headers )
 foreach(_header ${QXT_NETWORK_MANUAL_MOC_HEADERS})
   list(APPEND _qxt_network_manual_moc_headers src/network/${_header})
 endforeach()
 
 set(_qxt_web_moc_headers )
 foreach(_header ${QXT_WEB_MOC_HEADERS})
   list(APPEND _qxt_web_moc_headers src/web/${_header})
 endforeach()
 
 set(_qxt_core_sources )
 foreach(_source ${QXT_CORE_SOURCES})
   list(APPEND _qxt_core_sources src/core/${_source})
 endforeach()
 
 set(_qxt_gui_sources )
 foreach(_source ${QXT_GUI_SOURCES})
   list(APPEND _qxt_gui_sources src/widgets/${_source})
 endforeach()
 
 set(_qxt_network_sources )
 foreach(_source ${QXT_NETWORK_SOURCES})
   list(APPEND _qxt_network_sources src/network/${_source})
 endforeach()
 
 set(_qxt_web_sources )
 foreach(_source ${QXT_WEB_SOURCES})
   list(APPEND _qxt_web_sources src/web/${_source})
 endforeach()
 
 set(_qxt_gui_resources src/widgets/resources.qrc)
 
 set(${PROJECT_NAME}_INCLUDE_DIRS
   ${CMAKE_CURRENT_SOURCE_DIR}/src/core
   ${CMAKE_CURRENT_SOURCE_DIR}/include/QxtCore
   ${CMAKE_CURRENT_SOURCE_DIR}/src/widgets
   ${CMAKE_CURRENT_SOURCE_DIR}/include/QxtWidgets
   ${CMAKE_CURRENT_SOURCE_DIR}/src/network
   ${CMAKE_CURRENT_SOURCE_DIR}/include/QxtNetwork
   ${CMAKE_CURRENT_SOURCE_DIR}/src/web
   ${CMAKE_CURRENT_SOURCE_DIR}/include/QxtWeb
   )
 
 include_directories(${${PROJECT_NAME}_INCLUDE_DIRS})
 
 if(DESIRED_QT_VERSION MATCHES "4")
   find_package(Qt4 REQUIRED)
   set(QT_USE_QTNETWORK 1)
   set(QT_USE_QTDESIGNER 1)
   include(${QT_USE_FILE})
+  if("${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}" VERSION_LESS "4.8")
+    # We add the QT_NO_OPENSSL definition in case of Qt < 4.8 because
+    # the Qxt SSL code uses QSsl::TlsV1SslV3 which added in Qt 4.8.
+    # So even if Qt 4.7 was compiled with OpenSSL support, we manually
+    # disable it in Qxt to simplify the build system stuff and to avoid
+    # bumping the minimum required Qt version for MITK
+    add_definitions(-DQT_NO_OPENSSL)
+  endif()
 else()
   if (WIN32)
     cmake_policy(SET CMP0020 NEW) # Automatically link Qt executables to qtmain target on Windows
   endif()
   find_package(Qt5 COMPONENTS Network Designer Widgets REQUIRED)
 endif()
 
 # Build the QxtCore library
 _qt_wrap_cpp(_qxt_core_sources ${_qxt_core_moc_headers})
 
 add_library(QxtCore SHARED ${_qxt_core_sources})
 if(DESIRED_QT_VERSION MATCHES "4")
   target_link_libraries(QxtCore ${QT_LIBRARIES})
 else()
   target_link_libraries(QxtCore Qt5::Core)
 endif()
 
 set_target_properties(QxtCore PROPERTIES
                       SOVERSION ${${PROJECT_NAME}_VERSION}
                       COMPILE_DEFINITIONS "BUILD_QXT_CORE")
 
 # Build the QxtWidgets (formerly QxtGui) library
 _qt_wrap_cpp(_qxt_gui_sources ${_qxt_gui_moc_headers})
 _qt_add_resources(_qxt_gui_sources ${_qxt_gui_resources})
 
 if(DESIRED_QT_VERSION MATCHES "4")
   set(QxtGui_link_libraries ${QT_LIBRARIES})
 else()
   set(QxtGui_link_libraries Qt5::Widgets)
   if(UNIX AND NOT APPLE)
     list(APPEND QxtGui_link_libraries Qt5::X11Extras)
   endif()
 endif()
 if(APPLE)
   find_library(CARBON_FW NAMES Carbon)
   list(APPEND QxtGui_link_libraries ${CARBON_FW})
 endif()
 add_library(QxtWidgets SHARED ${_qxt_gui_sources})
 target_link_libraries(QxtWidgets QxtCore ${QxtGui_link_libraries})
 
 set_target_properties(QxtWidgets PROPERTIES
                       SOVERSION ${${PROJECT_NAME}_VERSION}
                       COMPILE_DEFINITIONS "BUILD_QXT_GUI")
 
 # Build the QxtNetwork library
 _qt_wrap_cpp(_qxt_network_sources ${_qxt_network_moc_headers})
 _qt_add_resources(_qxt_network_sources ${_qxt_network_resources})
 
 # The generate moc_* sources are included directly in .cpp files
 _qt_generate_mocs(${_qxt_network_manual_moc_headers})
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/src/network)
 
 add_library(QxtNetwork SHARED ${_qxt_network_sources})
 if(DESIRED_QT_VERSION MATCHES "4")
   target_link_libraries(QxtNetwork QxtCore ${QT_LIBRARIES})
 else()
   target_link_libraries(QxtNetwork Qt5::Network)
 endif()
 
 set_target_properties(QxtNetwork PROPERTIES
                       SOVERSION ${${PROJECT_NAME}_VERSION}
                       COMPILE_DEFINITIONS "BUILD_QXT_NETWORK")
 
 # Build the QxtWeb library
 _qt_wrap_cpp(_qxt_web_sources ${_qxt_web_moc_headers})
 
 add_library(QxtWeb SHARED ${_qxt_web_sources})
 target_link_libraries(QxtWeb QxtCore QxtNetwork ${QT_LIBRARIES})
 
 set_target_properties(QxtWeb PROPERTIES
                       SOVERSION ${${PROJECT_NAME}_VERSION}
                       COMPILE_DEFINITIONS "BUILD_QXT_WEB")
 
 
 # Build the designer plug-in
 
 set(_qxt_designer_sources
   src/designer/qxtbasespinboxplugin.cpp
   src/designer/qxtcheckcomboboxplugin.cpp
   src/designer/qxtcountrycomboboxplugin.cpp
   src/designer/qxtdesignerplugin.cpp
   src/designer/qxtdesignerplugins.cpp
   src/designer/qxtflowviewplugin.cpp
   src/designer/qxtgroupboxplugin.cpp
   src/designer/qxtlabelplugin.cpp
   src/designer/qxtlanguagecomboboxplugin.cpp
   src/designer/qxtletterboxwidgetplugin.cpp
   src/designer/qxtlineeditplugin.cpp
   src/designer/qxtlistwidgetplugin.cpp
   src/designer/qxtprogresslabelplugin.cpp
   src/designer/qxtpushbuttonplugin.cpp
   src/designer/qxtspansliderplugin.cpp
   src/designer/qxtstarsplugin.cpp
   src/designer/qxtstringspinboxplugin.cpp
   src/designer/qxttablewidgetplugin.cpp
   src/designer/qxttreewidgetplugin.cpp
 )
 
 set(wrap_cpp_options )
 if(DESIRED_QT_VERSION MATCHES "5")
   list(APPEND wrap_cpp_options TARGET QxtDesignerPlugins)
 endif()
 
 _qt_wrap_cpp(_qxt_designer_sources
   src/designer/qxtbasespinboxplugin.h
   src/designer/qxtcheckcomboboxplugin.h
   src/designer/qxtcountrycomboboxplugin.h
   src/designer/qxtdesignerplugins.h
   src/designer/qxtflowviewplugin.h
   src/designer/qxtgroupboxplugin.h
   src/designer/qxtlabelplugin.h
   src/designer/qxtlanguagecomboboxplugin.h
   src/designer/qxtletterboxwidgetplugin.h
   src/designer/qxtlineeditplugin.h
   src/designer/qxtlistwidgetplugin.h
   src/designer/qxtprogresslabelplugin.h
   src/designer/qxtpushbuttonplugin.h
   src/designer/qxtspansliderplugin.h
   src/designer/qxtstarsplugin.h
   src/designer/qxtstringspinboxplugin.h
   src/designer/qxttablewidgetplugin.h
   src/designer/qxttreewidgetplugin.h
   ${wrap_cpp_options}
 )
 
 _qt_add_resources(_qxt_designer_sources src/designer/resources.qrc)
 add_library(QxtDesignerPlugins SHARED ${_qxt_designer_sources})
 if(DESIRED_QT_VERSION MATCHES "4")
   target_link_libraries(QxtDesignerPlugins QxtWidgets QxtCore ${QT_LIBRARIES})
 else()
   target_link_libraries(QxtDesignerPlugins QxtWidgets QxtCore Qt5::Designer)
 endif()
 
 set_target_properties(QxtDesignerPlugins PROPERTIES
                       SOVERSION ${${PROJECT_NAME}_VERSION}
                       COMPILE_DEFINITIONS BUILD_QXT_DESIGNER)
 
 
 # Config files
 configure_file(${PROJECT_NAME}Config.cmake.in
                ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake @ONLY)
 export(TARGETS ${Qxt_LIBRARIES} FILE ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Exports.cmake)
 
 # Version information
 configure_file(
   ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}ConfigVersion.cmake.in
   ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
   @ONLY
   )