diff --git a/Modules/ThirdParty/Qt/CMakeLists.txt b/Modules/ThirdParty/Qt/CMakeLists.txt
index d45a3d67d375801dac0dfce6ef5b08c72c2b6816..65cadfc4e6d37f9a095779f09da7dc9788839584 100644
--- a/Modules/ThirdParty/Qt/CMakeLists.txt
+++ b/Modules/ThirdParty/Qt/CMakeLists.txt
@@ -21,7 +21,11 @@
 project( OTBQt )
 
 set( OTBQt_LIBRARIES ${Qt5Widgets_LIBRARIES} ${Qt5Core_LIBRARIES} ${Qt5Gui_LIBRARIES} ${Qt5OpenGL_LIBRARIES})
+set( OTBQt_SYSTEM_INCLUDE_DIRS ${Qt5Widgets_INCLUDE_DIRS} ${Qt5Core_INCLUDE_DIRS} ${Qt5Gui_INCLUDE_DIRS} ${Qt5OpenGL_INCLUDE_DIRS} )
 
-set( QT_VERSION "${QTVERSION}" CACHE INTERNAL "" FORCE )
+set( Qt5Widgets_LIBRARIES "${Qt5Widgets_VERSION}" CACHE INTERNAL "" FORCE )
+set( Qt5Core_LIBRARIES "${Qt5Core_VERSION}" CACHE INTERNAL "" FORCE )
+set( Qt5Gui_LIBRARIES "${Qt5Gui_VERSION}" CACHE INTERNAL "" FORCE )
+set( Qt5OpenGL_LIBRARIES "${Qt5OpenGL_VERSION}" CACHE INTERNAL "" FORCE )
 
 otb_module_impl()
diff --git a/Modules/ThirdParty/Qt/otb-module-init.cmake b/Modules/ThirdParty/Qt/otb-module-init.cmake
index 1fb14a7e9a5bf7b2ec03da1406c055b32c2594cb..ff664a0a2f5874b1a2ed3ea4399c70204dd74029 100644
--- a/Modules/ThirdParty/Qt/otb-module-init.cmake
+++ b/Modules/ThirdParty/Qt/otb-module-init.cmake
@@ -24,3 +24,5 @@ find_package(Qt5Widgets)
 find_package(Qt5OpenGL)
 find_package(Qt5LinguistTools)
 mark_as_advanced( QT_QMAKE_EXECUTABLE )
+
+#include( ${QT_USE_FILE} )
diff --git a/Modules/ThirdParty/Qt4/CMakeLists.txt b/Modules/ThirdParty/Qt4/CMakeLists.txt
deleted file mode 100644
index 808c53c5b2c2e80abc9d90950134948e50267b08..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/Qt4/CMakeLists.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
-#
-# This file is part of Orfeo Toolbox
-#
-#     https://www.orfeo-toolbox.org/
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-project( OTBQt4 )
-
-set( OTBQt4_SYSTEM_INCLUDE_DIRS ${QT_INCLUDE_DIRS} )
-set( OTBQt4_LIBRARIES "${QT_LIBRARIES}" )
-set( QT_VERSION "${QTVERSION}" CACHE INTERNAL "" FORCE )
-
-otb_module_impl()
diff --git a/Modules/ThirdParty/Qt4/otb-module-init.cmake b/Modules/ThirdParty/Qt4/otb-module-init.cmake
deleted file mode 100644
index 951a96171c3e9701d6556c8ddfe8b013248960a5..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/Qt4/otb-module-init.cmake
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
-#
-# This file is part of Orfeo Toolbox
-#
-#     https://www.orfeo-toolbox.org/
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-find_package( Qt4 REQUIRED QtCore QtGui QtOpenGL) # QtXml )
-mark_as_advanced( QT_QMAKE_EXECUTABLE )
-#set( QT_USE_QTXML 1 )
-include( ${QT_USE_FILE} )
diff --git a/Modules/ThirdParty/Qt4/otb-module.cmake b/Modules/ThirdParty/Qt4/otb-module.cmake
deleted file mode 100644
index 95dac5772da439e4716f13b5b68b5cfa8cf6fadb..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/Qt4/otb-module.cmake
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
-#
-# This file is part of Orfeo Toolbox
-#
-#     https://www.orfeo-toolbox.org/
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-set(DOCUMENTATION "This module imports Qt4 to the build system")
-
-otb_module(OTBQt4
-  DEPENDS
-    
-  TEST_DEPENDS
-    
-  DESCRIPTION
-    "${DOCUMENTATION}"
-  )
-
-otb_module_activation_option("Enable Qt4 dependent modules" OFF)
diff --git a/Packaging/Files/qt.conf b/Packaging/Files/qt.conf
deleted file mode 100644
index 43c4c4fd878c5fb1ad834dcd48bc6461dfb6b0f0..0000000000000000000000000000000000000000
--- a/Packaging/Files/qt.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[Paths]
-Translations=../lib/qt4/translations
-Plugins=../lib/qt4/plugins
diff --git a/SuperBuild/CMake/External_otb.cmake b/SuperBuild/CMake/External_otb.cmake
index bbc0ad6350aa8f8a6200a7a4c0572c9fece94d21..1f4acfe91db9f86e191a3a3a870772b00b07aed5 100644
--- a/SuperBuild/CMake/External_otb.cmake
+++ b/SuperBuild/CMake/External_otb.cmake
@@ -93,6 +93,7 @@ endif()
 
 if(OTB_USE_QT)
   ADDTO_DEPENDENCIES_IF_NOT_SYSTEM(OTB QT5)
+  ADD_SUPERBUILD_CMAKE_VAR(OTB QT_QMAKE_EXECUTABLE)
 endif()
 
 if(OTB_USE_GLEW)
diff --git a/SuperBuild/CMake/External_qt4.cmake b/SuperBuild/CMake/External_qt4.cmake
deleted file mode 100644
index a0b4eeeae66f759b4ba2e796a500da1472c530bb..0000000000000000000000000000000000000000
--- a/SuperBuild/CMake/External_qt4.cmake
+++ /dev/null
@@ -1,149 +0,0 @@
-#
-# Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
-#
-# This file is part of Orfeo Toolbox
-#
-#     https://www.orfeo-toolbox.org/
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-INCLUDE_ONCE_MACRO(QT4)
-
-SETUP_SUPERBUILD(QT4)
-
-#RK: are we ready for QT4 build on linux?.
-#This comment here scares me away.
-#Installing QT4 from packages also need sqlite otherwise there is issue
-
-# if(UNIX AND NOT APPLE)
-#   message(STATUS "  SuperBuild may fail to compile Qt4. If so, you should install it via package manager.")
-# endif()
-
-
-set(QT4_SB_ENABLE_GTK OFF CACHE INTERNAL "Enable GTK+ style with qt using -gtkstlye. Default is OFF")
-
-#NOTE: make sure your superbuild install directory does not contain any
-#Qt files from previous install of superbuild QT.
-# declare dependencies
-ADDTO_DEPENDENCIES_IF_NOT_SYSTEM(QT4 ZLIB PNG JPEG FREETYPE)
-
-#use system libs always for Qt4 as we build them from source or have already in system
-
-if(SB_INSTALL_PREFIX)
-  file(TO_NATIVE_PATH ${SB_INSTALL_PREFIX} QT4_INSTALL_PREFIX_NATIVE)
-  file(TO_NATIVE_PATH ${SB_INSTALL_PREFIX}/include QT4_INCLUDE_PREFIX_NATIVE)
-  file(TO_NATIVE_PATH ${SB_INSTALL_PREFIX}/lib QT4_LIB_PREFIX_NATIVE)
-  file(TO_NATIVE_PATH ${SB_INSTALL_PREFIX}/include/freetype2 QT4_INCLUDE_FREETYPE_NATIVE)
-endif()
-
-#Common options for all cases
-set(QT4_SB_CONFIG
-"-prefix ${QT4_INSTALL_PREFIX_NATIVE} -L ${QT4_LIB_PREFIX_NATIVE} \
--I ${QT4_INCLUDE_PREFIX_NATIVE} -I ${QT4_INCLUDE_FREETYPE_NATIVE} \
--opensource -confirm-license -release -shared -nomake demos \
--nomake examples -nomake tools -no-phonon-backend -no-phonon -no-script \
--no-scripttools -no-multimedia -no-audio-backend -no-webkit -no-declarative \
--no-accessibility -no-qt3support -no-xmlpatterns -no-sql-sqlite -no-openssl \
--no-libtiff -no-libmng -system-libpng -system-libjpeg -system-zlib")
-
-#RK: building faling on mac. png include is in a macframework
-if(USE_SYSTEM_PNG)
-  set(QT4_SB_CONFIG "${QT4_SB_CONFIG} -I ${PNG_PNG_INCLUDE_DIR}")
-endif()
-
-if(UNIX)
-  if(APPLE)
-    set(QT4_SB_CONFIG "${QT4_SB_CONFIG} -no-framework")
-  else() #Linux
-    if(QT4_SB_ENABLE_GTK)
-      message(WARNING "QT4_SB_ENABLE_GTK support is experimental")
-      set(QT4_SB_CONFIG "${QT4_SB_CONFIG} -sm -xrender -xrandr -gtkstyle")
-    else()
-      set(QT4_SB_CONFIG "${QT4_SB_CONFIG} -no-gtkstyle -no-glib -no-fontconfig")
-    endif()
-  endif()
-  #common for all unix
-  set(QT4_SB_CONFIG "${QT4_SB_CONFIG} -no-dbus -no-nis -no-javascript-jit -no-icu -v")
-elseif(MSVC)
-  set(QT4_SB_CONFIG "${QT4_SB_CONFIG} -mp")
-endif()
-
-if(WIN32)
-  set(QT4_BIN_EXT ".exe")
-  file(TO_NATIVE_PATH ${QT4_SB_SRC}/configure.exe QT4_CONFIGURE_SCRIPT)
-  set(QT4_CONFIGURE_COMMAND ${CMAKE_BINARY_DIR}/configure_qt4.bat)
-  set(QT4_CONFIGURE_COMMAND_IN ${CMAKE_SOURCE_DIR}/patches/QT4/configure_qt4.bat.in)
-else()
-  set(QT4_BIN_EXT "")
-  file(TO_NATIVE_PATH ${QT4_SB_SRC}/configure QT4_CONFIGURE_SCRIPT)
-  set(QT4_CONFIGURE_COMMAND ${CMAKE_BINARY_DIR}/configure_qt4.sh)
-  set(QT4_CONFIGURE_COMMAND_IN ${CMAKE_SOURCE_DIR}/patches/QT4/configure_qt4.sh.in)
-endif()
-
-if(EXISTS "${QT4_CONFIGURE_COMMAND}")
-  execute_process(COMMAND ${CMAKE_COMMAND} -E remove -f "${QT4_CONFIGURE_COMMAND}")
-endif()
-
-configure_file(${QT4_CONFIGURE_COMMAND_IN} ${QT4_CONFIGURE_COMMAND} @ONLY )
-
-#Remove left over or previous installation from install prefix.
-#Existing files in install prefix was disturbing a second installation.
-#even after the QT4 directory is removed from build
-
-add_custom_target(QT4-uninstall
-  COMMAND ${CMAKE_COMMAND} -E remove_directory "${SB_INSTALL_PREFIX}/include/QtCore"
-  COMMAND ${CMAKE_COMMAND} -E remove_directory "${SB_INSTALL_PREFIX}/include/QtDBus"
-  COMMAND ${CMAKE_COMMAND} -E remove_directory "${SB_INSTALL_PREFIX}/include/QtGui"
-  COMMAND ${CMAKE_COMMAND} -E remove_directory "${SB_INSTALL_PREFIX}/include/QtNetwork"
-  COMMAND ${CMAKE_COMMAND} -E remove_directory "${SB_INSTALL_PREFIX}/include/QtOpenGL"
-  COMMAND ${CMAKE_COMMAND} -E remove_directory "${SB_INSTALL_PREFIX}/include/QtSql"
-  COMMAND ${CMAKE_COMMAND} -E remove_directory "${SB_INSTALL_PREFIX}/include/QtSvg"
-  COMMAND ${CMAKE_COMMAND} -E remove_directory "${SB_INSTALL_PREFIX}/include/QtTest"
-  COMMAND ${CMAKE_COMMAND} -E remove_directory "${SB_INSTALL_PREFIX}/include/QtXml"
-  COMMAND ${CMAKE_COMMAND} -E remove_directory "${SB_INSTALL_PREFIX}/include/Qt"
-  COMMAND ${CMAKE_COMMAND} -E remove_directory "${SB_INSTALL_PREFIX}/mkspecs"
-  COMMAND ${CMAKE_COMMAND} -E remove_directory "${SB_INSTALL_PREFIX}/plugins"
-  COMMAND ${CMAKE_COMMAND} -E remove_directory "${SB_INSTALL_PREFIX}/translations"
-  COMMAND ${CMAKE_COMMAND} -E remove -f "${SB_INSTALL_PREFIX}/lib/libQt*"
-  COMMAND ${CMAKE_COMMAND} -E remove -f "${SB_INSTALL_PREFIX}/lib/pkgconfig/Qt*"
-  COMMAND ${CMAKE_COMMAND} -E remove -f "${SB_INSTALL_PREFIX}/bin/qmake${QT4_BIN_EXT}"
-  COMMAND ${CMAKE_COMMAND} -E remove -f "${SB_INSTALL_PREFIX}/bin/lrelease${QT4_BIN_EXT}"
-  COMMAND ${CMAKE_COMMAND} -E remove -f "${SB_INSTALL_PREFIX}/bin/moc${QT4_BIN_EXT}"
-  COMMAND ${CMAKE_COMMAND} -E remove -f "${SB_INSTALL_PREFIX}/bin/rcc${QT4_BIN_EXT}"
-  COMMAND ${CMAKE_COMMAND} -E remove -f "${SB_INSTALL_PREFIX}/bin/uic${QT4_BIN_EXT}"
-  COMMAND ${CMAKE_COMMAND} -E remove -f "${SB_INSTALL_PREFIX}/bin/libQt*"
-  WORKING_DIRECTORY "${SB_INSTALL_PREFIX}"
-  )
-
-#adding it to dependencies will remove the files when configure QWT
-#list(APPEND QT4_DEPENDENCIES QT4-uninstall)
-
-  ExternalProject_Add(QT4
-    PREFIX QT4
-    URL "http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz"
-    URL_MD5 d990ee66bf7ab0c785589776f35ba6ad
-    BINARY_DIR ${QT4_SB_SRC}
-    INSTALL_DIR ${SB_INSTALL_PREFIX}
-    DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
-    CONFIGURE_COMMAND ${QT4_CONFIGURE_COMMAND}
-    DEPENDS ${QT4_DEPENDENCIES}
-    LOG_DOWNLOAD 1
-    LOG_CONFIGURE 1    
-    LOG_BUILD 1
-    LOG_INSTALL 1    
-    )
-
-SUPERBUILD_PATCH_SOURCE(QT4)
-
-set(_SB_QT_QMAKE_EXECUTABLE ${SB_INSTALL_PREFIX}/bin/qmake)