diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-25 16:12:11 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-25 16:12:11 +0200 |
| commit | c7cdf3aac7ef9571ce0c0cf25a2c8455c7604451 (patch) | |
| tree | ff17379a7643d47224a500714d825d561172a282 /configure | |
| parent | 3f64156e918a8cf5da1b68191a280f0daf3d954b (diff) | |
| parent | 1e6630b54ce9a005c2cffac4dac95641838e8231 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/corelib/mimetypes/qmimeprovider.cpp
src/corelib/mimetypes/qmimetype.cpp
Change-Id: Ib483ddb6bfc380e7c8f195feca535703814c3872
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -6840,7 +6840,7 @@ case "$QMAKE_CONF_COMPILER" in # Clang COMPILER_VERSION=`${QMAKE_CONF_COMPILER} -v 2>&1 | sed -n -E ' /^Apple (clang|LLVM) version /{s///; s/^([0-9]*)\.([0-9]*).*$/QT_APPLE_CLANG_MAJOR_VERSION=\1; QT_APPLE_CLANG_MINOR_VERSION=\2/;p;q;} -/^clang version /{s///; s/^([0-9]*)\.([0-9]*).*$/QT_CLANG_MAJOR_VERSION=\1; QT_CLANG_MINOR_VERSION=\2/;p;q;}'` +/^(FreeBSD )?clang version /{s///; s/^([0-9]*)\.([0-9]*).*$/QT_CLANG_MAJOR_VERSION=\1; QT_CLANG_MINOR_VERSION=\2/;p;q;}'` eval "$COMPILER_VERSION" ;; *icpc) |