# HG changeset patch
# User Alain Mazy <alain@mazy.be>
# Date 1588185696 -7200
# Node ID 1c2d065ba3722fc1bcf14ac7016a957e2526a342
# Parent  dd2b75ee644bde890ca56982b59d4a31138f69ef
cleanup

diff -r dd2b75ee644b -r 1c2d065ba372 Framework/OpenGL/OpenGLIncludes.h
--- a/Framework/OpenGL/OpenGLIncludes.h	Wed Apr 29 19:00:30 2020 +0200
+++ b/Framework/OpenGL/OpenGLIncludes.h	Wed Apr 29 20:41:36 2020 +0200
@@ -42,15 +42,6 @@
 #  include <GL/glext.h>
 #endif
 
-#if ORTHANC_ENABLE_QT == 1
-// TODO: currently there are no checks in QT
-
-#   define ORTHANC_OPENGL_CHECK(name)
-#   define ORTHANC_OPENGL_TRACE_CURRENT_CONTEXT(msg)
-#   define ORTHANC_CHECK_CURRENT_CONTEXT(context)
-
-#endif
-
 #if ORTHANC_ENABLE_SDL == 1
 # include <SDL_video.h>
 
diff -r dd2b75ee644b -r 1c2d065ba372 Framework/StoneInitialization.cpp
--- a/Framework/StoneInitialization.cpp	Wed Apr 29 19:00:30 2020 +0200
+++ b/Framework/StoneInitialization.cpp	Wed Apr 29 20:41:36 2020 +0200
@@ -25,10 +25,6 @@
 #  error Macro ORTHANC_ENABLE_SDL must be defined
 #endif
 
-#if !defined(ORTHANC_ENABLE_QT)
-#  error Macro ORTHANC_ENABLE_QT must be defined
-#endif
-
 #if !defined(ORTHANC_ENABLE_SSL)
 #  error Macro ORTHANC_ENABLE_SSL must be defined
 #endif
@@ -48,10 +44,6 @@
 #  include "Viewport/SdlWindow.h"
 #endif
 
-#if ORTHANC_ENABLE_QT == 1
-#  include <QCoreApplication>
-#endif
-
 #if ORTHANC_ENABLE_CURL == 1
 #  include <Core/HttpClient.h>
 #endif
@@ -122,14 +114,6 @@
       // Run-time checks of locale settings, to be run after Qt has
       // been initialized, as Qt changes locale settings
 
-#if ORTHANC_ENABLE_QT == 1
-      if (QCoreApplication::instance() == NULL)
-      {
-        throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls,
-                                        "Qt must be initialized before Stone");
-      }
-#endif
-      
       {
         OrthancStone::Vector v;
         if (!OrthancStone::LinearAlgebra::ParseVector(v, "1.3671875\\-1.3671875") ||
diff -r dd2b75ee644b -r 1c2d065ba372 Resources/CMake/OrthancStoneConfiguration.cmake
--- a/Resources/CMake/OrthancStoneConfiguration.cmake	Wed Apr 29 19:00:30 2020 +0200
+++ b/Resources/CMake/OrthancStoneConfiguration.cmake	Wed Apr 29 20:41:36 2020 +0200
@@ -47,18 +47,14 @@
     message(FATAL_ERROR "Cannot enable SDL in sandboxed environments")
   endif()
 
-  if (ENABLE_QT)
-    message(FATAL_ERROR "Cannot enable QT in sandboxed environments")
-  endif()
-
   if (ENABLE_SSL)
     message(FATAL_ERROR "Cannot enable SSL in sandboxed environments")
   endif()
 endif()
 
 if (ENABLE_OPENGL)
-  if (NOT ENABLE_QT AND NOT ENABLE_SDL AND NOT ENABLE_WASM)
-    message(FATAL_ERROR "Cannot enable OpenGL if WebAssembly, SDL and Qt are all disabled")
+  if (NOT ENABLE_SDL AND NOT ENABLE_WASM)
+    message(FATAL_ERROR "Cannot enable OpenGL if WebAssembly and SDL are both disabled")
   endif()
 endif()
 
@@ -111,32 +107,17 @@
 endif()
 
 
-if (ENABLE_SDL AND ENABLE_QT)
-  message("SDL and QT cannot not be enabled together")
-elseif(ENABLE_SDL)
+if(ENABLE_SDL)
   message("SDL is enabled")
   include(${CMAKE_CURRENT_LIST_DIR}/SdlConfiguration.cmake)
   add_definitions(
-    -DORTHANC_ENABLE_QT=0
     -DORTHANC_ENABLE_SDL=1
     )
-elseif(ENABLE_QT)
-  add_definitions(
-    -DORTHANC_ENABLE_QT=1
-    -DORTHANC_ENABLE_SDL=0
-    )
-  if(DISABLE_STONE_QT_CMAKE_FILE)
-    message("QT is enabled, but QtConfiguration.cmake will not be included")  
-  else()    
-    message("QT is enabled")  
-    include(${CMAKE_CURRENT_LIST_DIR}/QtConfiguration.cmake)
-  endif()
 else()
-  message("SDL and QT are both disabled")
+  message("SDL is disabled")
   unset(USE_SYSTEM_SDL CACHE)
   add_definitions(
     -DORTHANC_ENABLE_SDL=0
-    -DORTHANC_ENABLE_QT=0
     )
 endif()
 
@@ -267,7 +248,7 @@
       )
   endif()
 
-  if (ENABLE_SDL OR ENABLE_QT)
+  if (ENABLE_SDL)
     if (ENABLE_OPENGL)
       list(APPEND ORTHANC_STONE_SOURCES
         ${ORTHANC_STONE_ROOT}/Framework/OpenGL/SdlOpenGLContext.cpp
@@ -277,182 +258,6 @@
         )
     endif()
   endif()
-elseif (ENABLE_WASM)
-  set(STONE_WASM_SOURCES
-    ${ORTHANC_STONE_ROOT}/Platforms/Wasm/Defaults.cpp
-    ${ORTHANC_STONE_ROOT}/Platforms/Wasm/WasmDelayedCallExecutor.cpp
-    ${ORTHANC_STONE_ROOT}/Platforms/Wasm/WasmWebService.cpp
-    ${ORTHANC_STONE_ROOT}/Platforms/Wasm/WasmViewport.cpp
-    ${ORTHANC_STONE_ROOT}/Platforms/Wasm/WasmPlatformApplicationAdapter.cpp
-    ${AUTOGENERATED_DIR}/WasmWebService.c
-    ${AUTOGENERATED_DIR}/default-library.c
-  )
-
-  # Regenerate a dummy "WasmWebService.c" file each time the "WasmWebService.js" file
-  # is modified, so as to force a new execution of the linking
-  add_custom_command(
-    OUTPUT "${AUTOGENERATED_DIR}/WasmWebService.c"
-    COMMAND ${CMAKE_COMMAND} -E touch "${AUTOGENERATED_DIR}/WasmWebService.c" ""
-    DEPENDS "${ORTHANC_STONE_ROOT}/Platforms/Wasm/WasmWebService.js")
-  add_custom_command(
-    OUTPUT "${AUTOGENERATED_DIR}/WasmDelayedCallExecutor.c"
-    COMMAND ${CMAKE_COMMAND} -E touch "${AUTOGENERATED_DIR}/WasmDelayedCallExecutor.c" ""
-    DEPENDS "${ORTHANC_STONE_ROOT}/Platforms/Wasm/WasmDelayedCallExecutor.js")
-  add_custom_command(
-    OUTPUT "${AUTOGENERATED_DIR}/default-library.c"
-    COMMAND ${CMAKE_COMMAND} -E touch "${AUTOGENERATED_DIR}/default-library.c" ""
-    DEPENDS "${ORTHANC_STONE_ROOT}/Platforms/Wasm/default-library.js")
-endif()
-
-if (ENABLE_STONE_DEPRECATED)
-  if (NOT ORTHANC_SANDBOXED)
-    list(APPEND PLATFORM_SOURCES
-      ${ORTHANC_STONE_ROOT}/Platforms/Generic/OracleWebService.cpp
-      ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Viewport/CairoFont.cpp
-      ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Viewport/CairoFont.h
-      )
-  endif()
-
-  if (ENABLE_SDL OR ENABLE_QT)
-    list(APPEND APPLICATIONS_SOURCES
-      ${ORTHANC_STONE_ROOT}/Applications/Generic/NativeStoneApplicationRunner.cpp
-      ${ORTHANC_STONE_ROOT}/Applications/Generic/NativeStoneApplicationContext.cpp
-      )
-  endif()
-
-  if (ENABLE_SDL)
-    list(APPEND APPLICATIONS_SOURCES
-      ${ORTHANC_STONE_ROOT}/Applications/Sdl/SdlCairoSurface.cpp
-      ${ORTHANC_STONE_ROOT}/Applications/Sdl/SdlEngine.cpp
-      ${ORTHANC_STONE_ROOT}/Applications/Sdl/SdlOrthancSurface.cpp
-      ${ORTHANC_STONE_ROOT}/Applications/Sdl/SdlStoneApplicationRunner.cpp
-      )
-  endif()
-
-  if (ENABLE_WASM)
-    list(APPEND APPLICATIONS_SOURCES
-      ${ORTHANC_STONE_ROOT}/Applications/Wasm/StartupParametersBuilder.cpp
-      )
-  endif()
-
-  if (ENABLE_THREADS)
-    list(APPEND ORTHANC_STONE_SOURCES
-      ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Messages/LockingEmitter.cpp
-      ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Messages/LockingEmitter.h
-      )
-  endif()
-
-  list(APPEND ORTHANC_STONE_SOURCES
-    ${ORTHANC_STONE_ROOT}/Applications/IStoneApplication.h
-    ${ORTHANC_STONE_ROOT}/Applications/StoneApplicationContext.cpp
-
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/dev.h
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/SmartLoader.cpp
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/SmartLoader.h
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Layers/CircleMeasureTracker.cpp
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Layers/CircleMeasureTracker.h
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Layers/ColorFrameRenderer.cpp
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Layers/ColorFrameRenderer.h
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Layers/DicomSeriesVolumeSlicer.cpp
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Layers/DicomSeriesVolumeSlicer.h
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Layers/DicomStructureSetSlicer.cpp
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Layers/DicomStructureSetSlicer.h
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Layers/FrameRenderer.cpp
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Layers/FrameRenderer.h
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Layers/GrayscaleFrameRenderer.cpp
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Layers/GrayscaleFrameRenderer.h
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Layers/ILayerRenderer.h
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Layers/IVolumeSlicer.h
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Layers/LineLayerRenderer.cpp
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Layers/LineLayerRenderer.h
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Layers/LineMeasureTracker.cpp
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Layers/LineMeasureTracker.h
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Layers/RenderStyle.cpp
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Layers/RenderStyle.h
-    # ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Layers/SeriesFrameRendererFactory.cpp
-    # ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Layers/SeriesFrameRendererFactory.h
-    # ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Layers/SingleFrameRendererFactory.cpp
-    # ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Layers/SingleFrameRendererFactory.h
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Layers/SliceOutlineRenderer.cpp
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Layers/SliceOutlineRenderer.h
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Loaders/DicomStructureSetLoader2.cpp
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Loaders/DicomStructureSetLoader2.h
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Toolbox/BaseWebService.cpp
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Toolbox/BaseWebService.h
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Toolbox/DicomFrameConverter.cpp
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Toolbox/DicomFrameConverter.h
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Toolbox/DownloadStack.cpp
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Toolbox/DownloadStack.h
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Toolbox/IDelayedCallExecutor.h
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Toolbox/ISeriesLoader.h
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Toolbox/IWebService.cpp
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Toolbox/IWebService.h
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Toolbox/MessagingToolbox.cpp
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Toolbox/MessagingToolbox.h
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Toolbox/OrthancApiClient.cpp
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Toolbox/OrthancApiClient.h
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Toolbox/OrthancSlicesLoader.cpp
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Toolbox/OrthancSlicesLoader.h
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Toolbox/ParallelSlices.cpp
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Toolbox/ParallelSlices.h
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Toolbox/ParallelSlicesCursor.cpp
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Toolbox/ParallelSlicesCursor.h
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Toolbox/Slice.cpp
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Toolbox/Slice.h
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Toolbox/ViewportGeometry.cpp
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Toolbox/ViewportGeometry.h
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Viewport/IMouseTracker.h
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Viewport/IStatusBar.h
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Viewport/IViewport.h
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Viewport/WidgetViewport.cpp
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Viewport/WidgetViewport.h
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Volumes/ISlicedVolume.h
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Volumes/IVolumeLoader.h
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Volumes/StructureSetLoader.cpp
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Volumes/StructureSetLoader.h
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Widgets/CairoWidget.cpp
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Widgets/CairoWidget.h
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Widgets/EmptyWidget.cpp
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Widgets/EmptyWidget.h
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Widgets/IWidget.h
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Widgets/IWorldSceneInteractor.h
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Widgets/IWorldSceneMouseTracker.h
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Widgets/LayoutWidget.cpp
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Widgets/LayoutWidget.h
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Widgets/PanMouseTracker.cpp
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Widgets/PanMouseTracker.h
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Widgets/PanZoomMouseTracker.cpp
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Widgets/PanZoomMouseTracker.h
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Widgets/SliceViewerWidget.cpp
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Widgets/SliceViewerWidget.h
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Widgets/TestCairoWidget.cpp
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Widgets/TestCairoWidget.h
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Widgets/TestWorldSceneWidget.cpp
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Widgets/TestWorldSceneWidget.h
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Widgets/WidgetBase.cpp
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Widgets/WidgetBase.h
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Widgets/WorldSceneWidget.cpp
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Widgets/WorldSceneWidget.h
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Widgets/ZoomMouseTracker.cpp
-    ${ORTHANC_STONE_ROOT}/Framework/Deprecated/Widgets/ZoomMouseTracker.h
-
-    ${ORTHANC_STONE_ROOT}/Framework/Radiography/RadiographyAlphaLayer.cpp
-    ${ORTHANC_STONE_ROOT}/Framework/Radiography/RadiographyDicomLayer.cpp
-    ${ORTHANC_STONE_ROOT}/Framework/Radiography/RadiographyLayer.cpp
-    ${ORTHANC_STONE_ROOT}/Framework/Radiography/RadiographyLayerCropTracker.cpp
-    ${ORTHANC_STONE_ROOT}/Framework/Radiography/RadiographyLayerMaskTracker.cpp
-    ${ORTHANC_STONE_ROOT}/Framework/Radiography/RadiographyLayerMoveTracker.cpp
-    ${ORTHANC_STONE_ROOT}/Framework/Radiography/RadiographyLayerResizeTracker.cpp
-    ${ORTHANC_STONE_ROOT}/Framework/Radiography/RadiographyLayerRotateTracker.cpp
-    ${ORTHANC_STONE_ROOT}/Framework/Radiography/RadiographyMaskLayer.cpp
-    ${ORTHANC_STONE_ROOT}/Framework/Radiography/RadiographyScene.cpp
-    ${ORTHANC_STONE_ROOT}/Framework/Radiography/RadiographySceneCommand.cpp
-    ${ORTHANC_STONE_ROOT}/Framework/Radiography/RadiographySceneReader.cpp
-    ${ORTHANC_STONE_ROOT}/Framework/Radiography/RadiographySceneWriter.cpp
-    ${ORTHANC_STONE_ROOT}/Framework/Radiography/RadiographyTextLayer.cpp
-    ${ORTHANC_STONE_ROOT}/Framework/Radiography/RadiographyWidget.cpp
-    ${ORTHANC_STONE_ROOT}/Framework/Radiography/RadiographyWindowingTracker.cpp
-    )
 endif()
 
 
diff -r dd2b75ee644b -r 1c2d065ba372 Resources/CMake/ProtobufCodeGeneration.cmake
--- a/Resources/CMake/ProtobufCodeGeneration.cmake	Wed Apr 29 19:00:30 2020 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +0,0 @@
-# HOW TO USE:
-# the GenerateCodeFromProtobufSchema will generate files in ${CMAKE_BINARY_DIR} and will
-# populate PROTOBUF_AUTOGENERATED_SOURCES with the list of generated files
-# AS OF 2019-01-30, it requires protoc (version 3.6.1.x) to be available in the path
-set(PROTOBUF_AUTOGENERATED_SOURCES)
-
-# TODO: use find_program (<VAR> name1 [path1 path2 ...]) to located the protobuf compiler
-# TODO: automated the TS plugin installation
-
-macro(GenerateCodeFromProtobufSchema schemaFilePath outputBaseDirectory)
-  # extract file name
-  GetFilePathWithoutLastExtension(schemaFilePathWithoutExt ${schemaFilePath})
-  
-  # remove extension
-  GetFilenameFromPath(schemaFileNameWithoutExt ${schemaFilePathWithoutExt})
-  
-  set(generatedFilePathWithoutExtension "${CMAKE_BINARY_DIR}/AUTOGENERATED/${schemaFileNameWithoutExt}")
-  set(generatedCppSourceFilePath "${generatedFilePathWithoutExtension}.pb.cc")
-  set(generatedCppHeaderFilePath "${generatedFilePathWithoutExtension}.pb.h")
-  set(generatedJsFilePath "${generatedFilePathWithoutExtension}_pb.js")
-  set(generatedTsFilePath "${generatedFilePathWithoutExtension}_pb.d.ts")
-  # set(generatedJsFileName "${generatedFilePathWithoutExtension}.js")
-
-  # set(AUTOGENERATED_DIR "${CMAKE_CURRENT_BINARY_DIR}/AUTOGENERATED")
-  # set(AUTOGENERATED_SOURCES)
-  
-  set(PROTOC_EXECUTABLE "PROTOC")
-  find_program(PROTOC_EXECUTABLE_SEARCH ${FLATC_EXECUTABLE})
-  if(NOT PROTOC_EXECUTABLE_SEARCH)
-    message(FATAL_ERROR "The Protocol Buffers compiler (protoc[.exe]) cannot be found!")
-  endif()
-
-  # TODO CUSTOMIZE FOR TYPESCRIPT
-  set(SCRIPT_CPP_OPTIONS)
-  list(APPEND SCRIPT_CPP_OPTIONS "----cpp_out=${CMAKE_BINARY_DIR}/AUTOGENERATED")
-  # list(APPEND SCRIPT_CPP_OPTIONS "gnagna")
-  
-  set(SCRIPT_TS_OPTIONS)
-
-  list(APPEND SCRIPT_TS_OPTIONS "--ts")
-  list(APPEND SCRIPT_TS_OPTIONS "gnagna")
-
-  add_custom_command(
-    OUTPUT
-    ${generatedCppSourceFilePath}
-    ${generatedCppHeaderFilePath}
-    COMMAND 
-    ${PROTOC_EXECUTABLE} ${SCRIPT_CPP_OPTIONS} ${schemaFilePath}
-    DEPENDS
-    ${schemaFilePath}
-    )
-  
-  add_custom_command(
-    OUTPUT
-    ${generatedTsFileName}
-    ${generatedJsFilePath}
-    COMMAND 
-    ${PROTOC_EXECUTABLE} ${SCRIPT_TS_OPTIONS} ${schemaFilePath}
-    DEPENDS
-    ${schemaFilePath}
-    )
-  
-  # add_custom_command(
-  #   OUTPUT
-  #   ${generatedJsFileName}
-  #   COMMAND 
-  #   ${FLATC_EXECUTABLE} ${SCRIPT_JS_OPTIONS} ${schemaFilePath}
-  #   DEPENDS
-  #   ${schemaFilePath}
-  #   )
-
-    list(APPEND FLATC_AUTOGENERATED_SOURCES "${generatedCppFileName}") 
-    # list(APPEND FLATC_AUTOGENERATED_SOURCES "${generatedJsFileName}") 
-    list(APPEND FLATC_AUTOGENERATED_SOURCES "${generatedTsFileName}") 
-
-endmacro()
-
diff -r dd2b75ee644b -r 1c2d065ba372 Resources/CMake/QtConfiguration.cmake
--- a/Resources/CMake/QtConfiguration.cmake	Wed Apr 29 19:00:30 2020 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,236 +0,0 @@
-# Stone of Orthanc
-# Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
-# Department, University Hospital of Liege, Belgium
-# Copyright (C) 2017-2020 Osimis S.A., Belgium
-#
-# This program is free software: you can redistribute it and/or
-# modify it under the terms of the GNU Affero General Public License
-# as published by the Free Software Foundation, either version 3 of
-# the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Affero General Public License for more details.
-# 
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-
-set(CMAKE_AUTOMOC OFF)
-set(CMAKE_AUTOUIC OFF)
-
-
-## Note that these set of macros MUST be defined as a "function()",
-## otherwise it fails
-function(DEFINE_QT_MACROS)
-  include(Qt4Macros)
-
-  ##
-  ## This part is adapted from file "Qt4Macros.cmake" shipped with
-  ## CMake 3.5.1, released under the following license:
-  ##
-  ##=============================================================================
-  ## Copyright 2005-2009 Kitware, Inc.
-  ##
-  ## Distributed under the OSI-approved BSD License (the "License");
-  ## see accompanying file Copyright.txt for details.
-  ##
-  ## This software is distributed WITHOUT ANY WARRANTY; without even the
-  ## implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  ## See the License for more information.
-  ##=============================================================================
-  ## 
-  macro (ORTHANC_QT_WRAP_UI outfiles)
-    QT4_EXTRACT_OPTIONS(ui_files ui_options ui_target ${ARGN})
-    foreach (it ${ui_files})
-      get_filename_component(outfile ${it} NAME_WE)
-      get_filename_component(infile ${it} ABSOLUTE)
-      set(outfile ${CMAKE_CURRENT_BINARY_DIR}/ui_${outfile}.h)
-      add_custom_command(OUTPUT ${outfile}
-        COMMAND ${QT_UIC_EXECUTABLE}
-        ARGS ${ui_options} -o ${outfile} ${infile}
-        MAIN_DEPENDENCY ${infile} VERBATIM)
-      set(${outfiles} ${${outfiles}} ${outfile})
-    endforeach ()
-  endmacro ()
-  
-  macro (ORTHANC_QT_WRAP_CPP outfiles )
-    QT4_GET_MOC_FLAGS(moc_flags)
-    QT4_EXTRACT_OPTIONS(moc_files moc_options moc_target ${ARGN})
-    foreach (it ${moc_files})
-      get_filename_component(outfile ${it} NAME_WE)
-      get_filename_component(infile ${it} ABSOLUTE)
-      set(outfile ${CMAKE_CURRENT_BINARY_DIR}/moc_${outfile}.cxx)
-      add_custom_command(OUTPUT ${outfile}
-        COMMAND ${QT_MOC_EXECUTABLE}
-        ARGS ${infile} "${moc_flags}" -o ${outfile}
-        MAIN_DEPENDENCY ${infile} VERBATIM)
-      set(${outfiles} ${${outfiles}} ${outfile})
-    endforeach ()
-  endmacro ()
-  ##
-  ## End of "Qt4Macros.cmake" adaptation.
-  ##
-endfunction()
-
-
-if ("${CMAKE_SYSTEM_VERSION}" STREQUAL "LinuxStandardBase")
-  # Linux Standard Base version 5 ships Qt 4.2.3
-  DEFINE_QT_MACROS()
- 
-  # The script "LinuxStandardBaseUic.py" is just a wrapper around the
-  # "uic" compiler from LSB that does not support the "<?xml ...?>"
-  # header that is automatically added by Qt Creator
-  set(QT_UIC_EXECUTABLE ${CMAKE_CURRENT_LIST_DIR}/LinuxStandardBaseUic.py)
-
-  set(QT_MOC_EXECUTABLE ${LSB_PATH}/bin/moc)
-
-  include_directories(
-    ${LSB_PATH}/include/QtCore
-    ${LSB_PATH}/include/QtGui
-    ${LSB_PATH}/include/QtOpenGL
-    )
-
-  link_libraries(QtCore QtGui QtOpenGL)
-
-elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
-  DEFINE_QT_MACROS()
-  
-  include_directories(${QT5_INSTALL_ROOT}/include)
-  link_directories(${QT5_INSTALL_ROOT}/lib)
-
-  if (OFF) #CMAKE_CROSSCOMPILING)
-    set(QT_UIC_EXECUTABLE wine ${QT5_INSTALL_ROOT}/bin/uic.exe)
-    set(QT_MOC_EXECUTABLE wine ${QT5_INSTALL_ROOT}/bin/moc.exe)
-  else()
-    set(QT_UIC_EXECUTABLE ${QT5_INSTALL_ROOT}/bin/uic)
-    set(QT_MOC_EXECUTABLE ${QT5_INSTALL_ROOT}/bin/moc)
-  endif()
-
-  include_directories(
-    ${QT5_INSTALL_ROOT}/include/QtCore
-    ${QT5_INSTALL_ROOT}/include/QtGui
-    ${QT5_INSTALL_ROOT}/include/QtOpenGL
-    ${QT5_INSTALL_ROOT}/include/QtWidgets
-    )
-
-  if (OFF)
-    # Dynamic Qt
-    link_libraries(Qt5Core Qt5Gui Qt5OpenGL Qt5Widgets)
-
-    file(COPY
-      ${QT5_INSTALL_ROOT}/bin/Qt5Core.dll
-      ${QT5_INSTALL_ROOT}/bin/Qt5Gui.dll
-      ${QT5_INSTALL_ROOT}/bin/Qt5OpenGL.dll
-      ${QT5_INSTALL_ROOT}/bin/Qt5Widgets.dll
-      ${QT5_INSTALL_ROOT}/bin/libstdc++-6.dll
-      ${QT5_INSTALL_ROOT}/bin/libgcc_s_dw2-1.dll
-      ${QT5_INSTALL_ROOT}/bin/libwinpthread-1.dll
-      DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-
-    file(COPY
-      ${QT5_INSTALL_ROOT}/plugins/platforms/qwindows.dll
-      DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/platforms)
-
-  else()
-    # Static Qt
-    link_libraries(
-      ${QT5_INSTALL_ROOT}/lib/libQt5Widgets.a
-      ${QT5_INSTALL_ROOT}/lib/libQt5Gui.a
-      ${QT5_INSTALL_ROOT}/lib/libQt5OpenGL.a
-      ${QT5_INSTALL_ROOT}/lib/libQt5Core.a
-      ${QT5_INSTALL_ROOT}/lib/libqtharfbuzz.a
-      ${QT5_INSTALL_ROOT}/lib/libqtpcre2.a
-      ${QT5_INSTALL_ROOT}/lib/libQt5FontDatabaseSupport.a
-      ${QT5_INSTALL_ROOT}/lib/libQt5EventDispatcherSupport.a
-      ${QT5_INSTALL_ROOT}/lib/libQt5ThemeSupport.a
-      ${QT5_INSTALL_ROOT}/plugins/platforms/libqwindows.a
-      winmm
-      version
-      ws2_32
-      uxtheme
-      imm32
-      dwmapi
-      )
-  endif()
-  
-else()
-  # Not using Windows, not using Linux Standard Base, 
-  # Find the QtWidgets library
-  find_package(Qt5Widgets QUIET)
-
-  if (Qt5Widgets_FOUND)
-    message("Qt5 has been detected")
-    find_package(Qt5Core REQUIRED)
-    link_libraries(
-      Qt5::Widgets
-      Qt5::Core
-      )
-
-    if (ENABLE_OPENGL)
-      find_package(Qt5OpenGL REQUIRED)
-      link_libraries(
-        Qt5::OpenGL
-        )
-    endif()
-    
-    # Create aliases for the CMake commands
-    macro(ORTHANC_QT_WRAP_UI)
-      QT5_WRAP_UI(${ARGN})
-    endmacro()
-    
-    macro(ORTHANC_QT_WRAP_CPP)
-      QT5_WRAP_CPP(${ARGN})
-    endmacro()
-
-  else()
-    message("Qt5 has not been found, trying with Qt4")
-    find_package(Qt4 REQUIRED QtGui)
-    link_libraries(
-      Qt4::QtGui
-      )
-
-    if (ENABLE_OPENGL)
-      find_package(Qt4 REQUIRED QtOpenGL)
-      link_libraries(
-        Qt4::QtOpenGL
-        )
-    endif()
-    
-    # Create aliases for the CMake commands
-    macro(ORTHANC_QT_WRAP_UI)
-      QT4_WRAP_UI(${ARGN})
-    endmacro()
-    
-    macro(ORTHANC_QT_WRAP_CPP)
-      QT4_WRAP_CPP(${ARGN})
-    endmacro()  
-  endif()
-endif()
-
-
-if (ENABLE_STONE_DEPRECATED)
-  list(APPEND QT_SOURCES
-    ${ORTHANC_STONE_ROOT}/Applications/Qt/QCairoWidget.cpp
-    ${ORTHANC_STONE_ROOT}/Applications/Qt/QStoneMainWindow.cpp
-    ${ORTHANC_STONE_ROOT}/Applications/Qt/QtStoneApplicationRunner.cpp
-    )
-
-  ORTHANC_QT_WRAP_CPP(QT_SOURCES
-    ${ORTHANC_STONE_ROOT}/Applications/Qt/QCairoWidget.h
-    ${ORTHANC_STONE_ROOT}/Applications/Qt/QStoneMainWindow.h
-    )
-endif()
-  
-
-# NB: Including CMAKE_CURRENT_BINARY_DIR is mandatory, as the CMake
-# macros for Qt will put their result in that directory, which cannot
-# be changed.
-# https://stackoverflow.com/a/4016784/881731
-
-include_directories(
-  ${ORTHANC_STONE_ROOT}/Applications/Qt/
-  ${CMAKE_CURRENT_BINARY_DIR}
-  )
-
diff -r dd2b75ee644b -r 1c2d065ba372 Samples/Sdl/RtViewer/CMakeLists.txt
--- a/Samples/Sdl/RtViewer/CMakeLists.txt	Wed Apr 29 19:00:30 2020 +0200
+++ b/Samples/Sdl/RtViewer/CMakeLists.txt	Wed Apr 29 20:41:36 2020 +0200
@@ -11,7 +11,6 @@
 
 SET(ENABLE_GOOGLE_TEST OFF)
 SET(ENABLE_LOCALE ON)  # Necessary for text rendering
-SET(ENABLE_QT OFF)
 SET(ENABLE_SDL ON)
 SET(ENABLE_DCMTK ON)  # <==
 SET(ENABLE_OPENGL ON)  #  <==
diff -r dd2b75ee644b -r 1c2d065ba372 Samples/Sdl/SingleFrameViewer/CMakeLists.txt
--- a/Samples/Sdl/SingleFrameViewer/CMakeLists.txt	Wed Apr 29 19:00:30 2020 +0200
+++ b/Samples/Sdl/SingleFrameViewer/CMakeLists.txt	Wed Apr 29 20:41:36 2020 +0200
@@ -10,7 +10,6 @@
 
 SET(ENABLE_GOOGLE_TEST OFF)
 SET(ENABLE_LOCALE ON)  # Necessary for text rendering
-SET(ENABLE_QT OFF)
 SET(ENABLE_SDL ON)
 SET(ENABLE_DCMTK ON)  # <==
 SET(ENABLE_OPENGL ON)  #  <==
diff -r dd2b75ee644b -r 1c2d065ba372 UnitTestsSources/CMakeLists.txt
--- a/UnitTestsSources/CMakeLists.txt	Wed Apr 29 19:00:30 2020 +0200
+++ b/UnitTestsSources/CMakeLists.txt	Wed Apr 29 20:41:36 2020 +0200
@@ -10,7 +10,6 @@
 endif()
 
 set(ENABLE_SDL OFF CACHE BOOL "Target SDL Native application")
-set(ENABLE_QT OFF CACHE BOOL "Target Qt Native application")
 set(ENABLE_WASM OFF CACHE BOOL "Target WASM application")
 set(ENABLE_UNITTESTS ON 
 
@@ -20,15 +19,12 @@
   if (ENABLE_SDL)
     message("ENABLE_SDL is only supported in native (incompatible with ENABLE_WASM)")
   endif()
-  if (ENABLE_QT)
-    message("ENABLE_QT is only supported in native (incompatible with ENABLE_WASM)")
-  endif()
   set(ENABLE_NATIVE OFF)
   set(ORTHANC_SANDBOXED OFF)
   set(ENABLE_CRYPTO_OPTIONS ON)
   set(ENABLE_GOOGLE_TEST ON)
   set(ENABLE_WEB_CLIENT ON)
-elseif (ENABLE_QT OR ENABLE_SDL)
+elseif (ENABLE_SDL)
   set(ENABLE_NATIVE ON)
   set(ORTHANC_SANDBOXED OFF)
   set(ENABLE_CRYPTO_OPTIONS ON)