diff --git a/CI/Windows.bat b/CI/Windows.bat
index 903c74e8..4cca462a 100644
--- a/CI/Windows.bat
+++ b/CI/Windows.bat
@@ -25,12 +25,12 @@ IF "%BUILD_PLATFORM%" == "VS2015" (
 
     IF "%ARCHITECTURE%" == "x64" (
       set QT_INSTALL_PATH=E:\Qt\Qt5.6.0-vs2015-%STRING_ARCH%\5.6\msvc2015_64
-      set QT_BASE_CONFIG=-DQT5_INSTALL_PATH=E:\Qt\Qt5.6.0-vs2015-%STRING_ARCH%\5.6\msvc2015_64
+      set QT_BASE_CONFIG=-DQT_INSTALL_PATH=E:\Qt\Qt5.6.0-vs2015-%STRING_ARCH%\5.6\msvc2015_64 -DQT_VERSION=5
     )
 
     IF "%ARCHITECTURE%" == "x32" (
       set QT_INSTALL_PATH=E:\Qt\Qt5.6.0-vs2015-%STRING_ARCH%\5.6\msvc2015
-      set QT_BASE_CONFIG=-DQT5_INSTALL_PATH=E:\Qt\Qt5.6.0-vs2015-%STRING_ARCH%\5.6\msvc2015
+      set QT_BASE_CONFIG=-DQT_INSTALL_PATH=E:\Qt\Qt5.6.0-vs2015-%STRING_ARCH%\5.6\msvc2015 -DQT_VERSION=5
     )
 
 ) 
@@ -43,7 +43,7 @@ IF "%BUILD_PLATFORM%" == "VS2017" (
 
     IF "%ARCHITECTURE%" == "x64" (
       set QT_INSTALL_PATH=E:\Qt\Qt5.10.1\5.10.1\msvc2017_64
-      set QT_BASE_CONFIG=-DQT5_INSTALL_PATH=E:\Qt\Qt5.10.1\5.10.1\msvc2017_64
+      set QT_BASE_CONFIG=-DQT_INSTALL_PATH=E:\Qt\Qt5.10.1\5.10.1\msvc2017_64 -DQT_VERSION=5
     )
 
 ) 
@@ -57,7 +57,7 @@ IF "%BUILD_PLATFORM%" == "VS2019" (
 
     IF "%ARCHITECTURE%" == "x64" (
       set QT_INSTALL_PATH=E:\Qt\5.15.2\msvc2019_64
-      set QT_BASE_CONFIG=-DQT5_INSTALL_PATH=E:\Qt\5.15.2\msvc2019_64
+      set QT_BASE_CONFIG=-DQT_INSTALL_PATH=E:\Qt\5.15.2\msvc2019_64 -DQT_VERSION=5
     )
 
 )
diff --git a/CI/ci-linux-prepare.sh b/CI/ci-linux-prepare.sh
index ff35c196..a73ff7d0 100755
--- a/CI/ci-linux-prepare.sh
+++ b/CI/ci-linux-prepare.sh
@@ -42,27 +42,27 @@ fi
 if [ "$QTVERSION" == "qt5.13.0" ]; then
   echo "Using QT5.13.0";
   BUILDPATH="$BUILDPATH-qt5.13.0"
-  OPTIONS="$OPTIONS -DQT5_INSTALL_PATH=~/sw/Qt/5.13.0/gcc_64"
+  OPTIONS="$OPTIONS -DQT_INSTALL_PATH=~/sw/Qt/5.13.0/gcc_64 -DQT_VERSION=5"
 elif [ "$QTVERSION" == "qt5.12.2" ]; then
   echo "Using QT5.12.2";
   BUILDPATH="$BUILDPATH-qt5.12.2"
-  OPTIONS="$OPTIONS -DQT5_INSTALL_PATH=~/sw/Qt/5.12.2/gcc_64"
+  OPTIONS="$OPTIONS -DQT_INSTALL_PATH=~/sw/Qt/5.12.2/gcc_64 -DQT_VERSION=5"
 elif [ "$QTVERSION" == "qt5.11.2" ]; then
   echo "Using QT5.11.2";
   BUILDPATH="$BUILDPATH-qt5.11.2"
-  OPTIONS="$OPTIONS -DQT5_INSTALL_PATH=~/sw/Qt/5.11.2/gcc_64"
+  OPTIONS="$OPTIONS -DQT_INSTALL_PATH=~/sw/Qt/5.11.2/gcc_64 -DQT_VERSION=5"
 elif [ "$QTVERSION" == "qt5.9.0" ]; then
   echo "Using QT5.9.0";
   BUILDPATH="$BUILDPATH-qt5.9.0"
-  OPTIONS="$OPTIONS -DQT5_INSTALL_PATH=~/sw/Qt/5.9/gcc_64"
+  OPTIONS="$OPTIONS -DQT_INSTALL_PATH=~/sw/Qt/5.9/gcc_64 -DQT_VERSION=5"
 elif [ "$QTVERSION" == "qt5.13.2" ]; then
   echo "Using QT5.13.2";
   BUILDPATH="$BUILDPATH-qt5.13.2"
-  OPTIONS="$OPTIONS -DQT5_INSTALL_PATH=~/sw/Qt/5.13.2/gcc_64"
+  OPTIONS="$OPTIONS -DQT_INSTALL_PATH=~/sw/Qt/5.13.2/gcc_64 -DQT_VERSION=5"
 elif [ "$QTVERSION" == "qt5.15.1" ]; then
   echo "Using QT5.15.1";
   BUILDPATH="$BUILDPATH-qt5.15.1"
-  OPTIONS="$OPTIONS -DQT5_INSTALL_PATH=~/sw/Qt/5.15.1/gcc_64"
+  OPTIONS="$OPTIONS -DQT_INSTALL_PATH=~/sw/Qt/5.15.1/gcc_64 -DQT_VERSION=5"
 fi
 
 #=====================================