Commit b491565b authored by Jan Möbius's avatar Jan Möbius

Updated tested Qt version to 5.12.2

parent ae61b84c
Pipeline #9700 failed with stages
in 37 minutes and 28 seconds
...@@ -20,10 +20,10 @@ set( CMAKE_CXX_STANDARD_REQUIRED TRUE ) ...@@ -20,10 +20,10 @@ set( CMAKE_CXX_STANDARD_REQUIRED TRUE )
set( CMAKE_CXX_STANDARD 11 ) set( CMAKE_CXX_STANDARD 11 )
# ACG Environment default settings # ACG Environment default settings
# This is ugly but currently we need to work around the default installed 5.3 on debian # This is ugly but currently we need to work around the default installed on debian
if ( EXISTS /ACG/acgdev/gcc-x86_64/qt-5.11.2/5.11.2/gcc_64 ) if ( EXISTS /ACG/acgdev/gcc-x86_64/qt-5.12.2/5.12.2/gcc_64 )
# Default to this install path for QT%_INSTALL_DIR # Default to this install path for QT%_INSTALL_DIR
set (QT5_INSTALL_PATH /ACG/acgdev/gcc-x86_64/qt-5.11.2/5.11.2/gcc_64/ CACHE PATH "Qt5 install path set for ACG environment using QT 5.11.2" ) set (QT5_INSTALL_PATH /ACG/acgdev/gcc-x86_64/qt-5.12.2/5.12.2/gcc_64/ CACHE PATH "Qt5 install path set for ACG environment using QT 5.12.2" )
endif() endif()
if ( WIN32 ) if ( WIN32 )
...@@ -128,7 +128,7 @@ if ( WIN32 ) ...@@ -128,7 +128,7 @@ if ( WIN32 )
endif() endif()
endif() endif()
set (OF_MAX_QT_VERSION "5.9.0") set (OF_MAX_QT_VERSION "5.12.2")
if (${Qt5Core_VERSION_STRING} STRGREATER ${OF_MAX_QT_VERSION}) if (${Qt5Core_VERSION_STRING} STRGREATER ${OF_MAX_QT_VERSION})
message(WARNING "Detected QT Version higher than ${OF_MAX_QT_VERSION}!\n" "OpenFlipper has not been tested with this QT Version.") message(WARNING "Detected QT Version higher than ${OF_MAX_QT_VERSION}!\n" "OpenFlipper has not been tested with this QT Version.")
......
Subproject commit 69c91dbd860d169d5ebfc4735c0d2b536e611362 Subproject commit 2d469a90529603e674a47e143ebeeeb0d5c6c995
Subproject commit da219249323d950f138233754935518e55af3c32 Subproject commit 58cb63d0e6398b639ffe73c0cd16ed0c8bb88bc0
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