|
|
|
@ -641,7 +641,7 @@ echo
|
|
|
|
if [ -z $APPVEYOR ]; then
|
|
|
|
if [ -z $APPVEYOR ]; then
|
|
|
|
printf "Qt 5.7.0... "
|
|
|
|
printf "Qt 5.7.0... "
|
|
|
|
else
|
|
|
|
else
|
|
|
|
printf "Qt 5.10 AppVeyor... "
|
|
|
|
printf "Qt 5.13 AppVeyor... "
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if [ $BITS -eq 64 ]; then
|
|
|
|
if [ $BITS -eq 64 ]; then
|
|
|
|
@ -679,7 +679,7 @@ fi
|
|
|
|
add_qt_platform_dlls "$(pwd)/plugins/platforms/qwindows${SUFFIX}.dll"
|
|
|
|
add_qt_platform_dlls "$(pwd)/plugins/platforms/qwindows${SUFFIX}.dll"
|
|
|
|
echo Done.
|
|
|
|
echo Done.
|
|
|
|
else
|
|
|
|
else
|
|
|
|
QT_SDK="C:/Qt/5.10/msvc${MSVC_DISPLAY_YEAR}${SUFFIX}"
|
|
|
|
QT_SDK="C:/Qt/5.13/msvc${MSVC_DISPLAY_YEAR}${SUFFIX}"
|
|
|
|
add_cmake_opts -DDESIRED_QT_VERSION=5 \
|
|
|
|
add_cmake_opts -DDESIRED_QT_VERSION=5 \
|
|
|
|
-DQT_QMAKE_EXECUTABLE="${QT_SDK}/bin/qmake.exe" \
|
|
|
|
-DQT_QMAKE_EXECUTABLE="${QT_SDK}/bin/qmake.exe" \
|
|
|
|
-DCMAKE_PREFIX_PATH="$QT_SDK"
|
|
|
|
-DCMAKE_PREFIX_PATH="$QT_SDK"
|
|
|
|
|
Bret Curtis
5 years ago