diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2018-03-09 11:48:27 +0100 |
|---|---|---|
| committer | Rene Engelhard <rene@debian.org> | 2018-03-10 15:36:05 +0100 |
| commit | 81dc2f68dffb9e58e99d5deddb1124f6ec047a25 (patch) | |
| tree | 3fa2f24301077daded08bdee4830d1c01f02237e | |
| parent | a6e53e567f0e10b254807cbf5fe2a0bc65cbad50 (diff) | |
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/51004
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Rene Engelhard <rene@debian.org>
Tested-by: Rene Engelhard <rene@debian.org>
| -rw-r--r-- | configure.ac | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index b5f63a5a5f40..fa758edd8c24 100644 --- a/configure.ac +++ b/configure.ac @@ -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" |