Skip to content

GitLab

otb
otb
Commit c554d92e authored by Manuel Grizonnet's avatar Manuel Grizonnet
Browse files
Options

ENH: revert patch to only add -qt-harfbuzz option and use qt 5.10.1

parent c621e0e6
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
SuperBuild/CMake/External_qt5.cmake
View file @ c554d92e
...@@ -91,7 +91,7 @@ set(QT5_SB_CONFIG ...@@ -91,7 +91,7 @@ set(QT5_SB_CONFIG
-skip qtwinextras \ -skip qtwinextras \
-skip qtx11extras \ -skip qtx11extras \
-skip qtxmlpatterns \ -skip qtxmlpatterns \
-system-libpng -system-libjpeg -system-zlib -system-freetype -qt-harfbuzz -optimize-size -silent") -system-libpng -system-libjpeg -system-zlib -system-freetype -qt-harfbuzz")
if(UNIX) if(UNIX)
if(APPLE) if(APPLE)
...@@ -126,8 +126,8 @@ configure_file( ${QT5_CONFIGURE_COMMAND_IN} ${QT5_CONFIGURE_COMMAND} @ONLY ) ...@@ -126,8 +126,8 @@ configure_file( ${QT5_CONFIGURE_COMMAND_IN} ${QT5_CONFIGURE_COMMAND} @ONLY )
ExternalProject_Add(QT5 ExternalProject_Add(QT5
PREFIX QT5 PREFIX QT5
URL "http://download.qt.io/official_releases/qt/5.11/5.11.1/single/qt-everywhere-src-5.11.1.tar.xz" URL "http://download.qt.io/official_releases/qt/5.10/5.10.1/single/qt-everywhere-src-5.10.1.tar.xz"
URL_MD5 c6f0854d7de7bde80cfd8cc85bb7152b URL_MD5 7e167b9617e7bd64012daaacb85477af
BINARY_DIR ${QT5_SB_BUILD_DIR} BINARY_DIR ${QT5_SB_BUILD_DIR}
INSTALL_DIR ${SB_INSTALL_PREFIX} INSTALL_DIR ${SB_INSTALL_PREFIX}
DOWNLOAD_DIR ${DOWNLOAD_LOCATION} DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment