Kaydet (Commit) 81dc2f68 authored tarafından Jan-Marek Glogowski's avatar Jan-Marek Glogowski Kaydeden (comit) Rene Engelhard

The minimal supported Qt5 version is 5.6

The gtk3_kde5 file picker needs Qt 5.6 for the use of
QFileDialog::setSupportedSchemes and QList::constLast.

So just require this Qt5 version generally.

Change-Id: I1ae5673da17d84d11a9dd4e60da3cea17fad38e2
Reviewed-on: https://gerrit.libreoffice.org/51004Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarRene Engelhard <rene@debian.org>
Tested-by: 's avatarRene Engelhard <rene@debian.org>
üst a6e53e56
......@@ -10956,10 +10956,17 @@ then
if test "$QMAKE5" = "no"; then
AC_MSG_ERROR([Qmake not found. Please specify the root of your Qt5 installation by exporting QT5DIR before running "configure".])
else
qmake5_test_ver="`$QMAKE5 -v 2>&1 | sed -n -e '/^Using Qt version 5\./p'`"
qmake5_test_ver="`$QMAKE5 -v 2>&1 | $SED -n -e 's/^Using Qt version \(5\.[[0-9.]]\+\).*$/\1/p'`"
if test -z "$qmake5_test_ver"; then
AC_MSG_ERROR([Wrong qmake for Qt5 found. Please specify the root of your Qt5 installation by exporting QT5DIR before running "configure".])
fi
qmake5_minor_version="`echo $qmake5_test_ver | cut -d. -f2`"
qt5_minimal_minor="6"
if test "$qmake5_minor_version" -lt "$qt5_minimal_minor"; then
AC_MSG_ERROR([The minimal supported Qt5 version is 5.${qt5_minimal_minor}, but your 'qmake -v' reports Qt5 version $qmake5_test_ver.])
else
AC_MSG_NOTICE([Detected Qt5 version: $qmake5_test_ver])
fi
fi
qt5_incdirs="`$QMAKE5 -query QT_INSTALL_HEADERS` $qt5_incdirs"
......
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