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

- Removed some QT4 references

- Moved to 4.1 version
parent 69c657d5
Pipeline #9072 passed with stages
in 46 minutes
......@@ -6,7 +6,7 @@ set -e
# Expected Settings via environment variables:
# COMPILER= gcc/clang
# LANGUAGE= C++98 / C++11
# QTVERSION= QT4/QT5
# QTVERSION= QT5
# BUILDTYPE= Debug / Release
......
......@@ -54,7 +54,7 @@ if [ "$QTVERSION" == "QT5.11.2" ]; then
elif [ "$QTVERSION" == "QT5.9.0" ]; then
echo "Using QT5.9.0";
BUILDPATH="$BUILDPATH-qt5.9.0"
OPTIONS="$OPTIONS -DFORCE_QT4=FALSE -DQWT6_INCLUDE_DIR=~/sw/qwt-6.1.3-qt5.9.0/include -DQWT6_LIBRARY_DIR=~/sw/qwt-6.1.3-qt5.9.0/lib -DQWT6_LIBRARY=~/sw/qwt-6.1.3-qt5.9.0/lib/libqwt.so -DQT5_INSTALL_PATH=~/sw/Qt/5.9/gcc_64"
OPTIONS="$OPTIONS -DQWT6_INCLUDE_DIR=~/sw/qwt-6.1.3-qt5.9.0/include -DQWT6_LIBRARY_DIR=~/sw/qwt-6.1.3-qt5.9.0/lib -DQWT6_LIBRARY=~/sw/qwt-6.1.3-qt5.9.0/lib/libqwt.so -DQT5_INSTALL_PATH=~/sw/Qt/5.9/gcc_64"
fi
if [ "$PYTHON" == "no" ]; then
......
......@@ -6,7 +6,7 @@ set -e
# Expected Settings via environment variables:
# COMPILER= gcc/clang
# LANGUAGE= C++98 / C++11
# QTVERSION= QT4/QT5
# QTVERSION= QT5
# BUILDTYPE= Debug / Release
#include ci options script
......@@ -55,4 +55,4 @@ export LD_LIBRARY_PATH=$(pwd)/Build/systemlib:$LD_LIBRARY_PATH
cd tests
bash run_tests.sh
cd ..
\ No newline at end of file
cd ..
Subproject commit 87544470cb073f91512e82793ff51df00afaf4c2
Subproject commit e35e0232fff9ebf7b88ac05d4d38e9c480107f2b
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