From ef7c7ca43be00771e52c95ef9ac93974bc2f1c41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Wed, 16 May 2018 07:38:20 +0200 Subject: [PATCH] Switched to Qt 5.10.1 as department default --- CMakeLists.txt | 4 ++-- OpenFlipper | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2e56a0731..cf13dbc6e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,9 +20,9 @@ set( CMAKE_CXX_STANDARD 11 ) # ACG Environment default settings # This is ugly but currently we need to work around the default installed 5.3 on debian -if ( EXISTS /ACG/acgdev/gcc-x86_64/qt-5.9.0/5.9/gcc_64/ ) +if ( EXISTS /ACG/acgdev/gcc-x86_64/qt-5.10.1/5.10.1/gcc_64/ ) # Default to this install path for QT%_INSTALL_DIR - set (QT5_INSTALL_PATH /ACG/acgdev/gcc-x86_64/qt-5.9.0/5.9/gcc_64/ CACHE PATH "Qt5 install path set for ACG environment" ) + set (QT5_INSTALL_PATH /ACG/acgdev/gcc-x86_64/qt-5.10.1/5.10.1/gcc_64/ CACHE PATH "Qt5 install path set for ACG environment" ) endif() if ( WIN32 ) diff --git a/OpenFlipper b/OpenFlipper index baa3af2da..f6c8e0fdc 160000 --- a/OpenFlipper +++ b/OpenFlipper @@ -1 +1 @@ -Subproject commit baa3af2da15e6badbfb935eb351f191822620267 +Subproject commit f6c8e0fdce3049611c68672dde6e82978b590b0b -- GitLab