Merge branch 'bug_monteverdi_OpenGL' into 'release-6.6'

OpenGL problem in monteverdi

See merge request orfeotoolbox/otb!80

Packaging/prepare_file_list.cmake

@@ -107,7 +107,6 @@ function(prepare_file_list file_list_result)
   if(MSVC)
     list(APPEND file_list "ucrtbase.dll")
     list(APPEND file_list "proj.dll")
-    list(APPEND file_list "libEGL.dll")
   endif()
 
   # Qt plugins

SuperBuild/CMake/External_qt5.cmake

@@ -49,6 +49,12 @@ endif()
 
 file(TO_NATIVE_PATH ${QT5_SB_SRC} QT5_SB_SRC_NATIVE)
 
+if(WIN32)
+  set(QT5_SB_OPENGL_CONFIG "-opengl desktop")
+else()
+  set(QT5_SB_OPENGL_CONFIG "")
+endif()
+
 #Common options for all cases
 # -skip qtbase
 # -skip qttools  (need linguist)
@@ -58,6 +64,7 @@ set(QT5_SB_CONFIG
   -I ${QT5_INCLUDE_PREFIX_NATIVE} -I ${QT5_INCLUDE_FREETYPE_NATIVE} \
   -opensource -confirm-license -release -shared \
   -nomake examples -make tools -no-openssl \
+  ${QT5_SB_OPENGL_CONFIG} \
   -skip qtgamepad  \
   -skip qt3d  \
   -skip qtactiveqt  \

SuperBuild/patches/QT5/configure_qt5.bat.in

@@ -2,7 +2,7 @@ setlocal
 
 set INCLUDE=%INCLUDE%;@QT5_INCLUDE_PREFIX_NATIVE@;@QT5_INCLUDE_PREFIX_NATIVE@\freetype2
 set LIB=%LIB%;@QT5_LIB_PREFIX_NATIVE@
-set PATH=@QT5_SB_SRC_NATIVE@\qtbase\bin;@QT5_SB_SRC_NATIVE@\gnuwin32;%PATH%
+set PATH=@QT5_SB_SRC_NATIVE@\qtbase\bin;@QT5_SB_SRC_NATIVE@\gnuwin32\bin;%PATH%
 
 @QT5_CONFIGURE_SCRIPT@ @QT5_SB_CONFIG@