Merge branch '5.8' into dev

Conflicts:
	configure.json

Change-Id: I658a02de96b45b382f0f6c383964501b794b5eb6

4 files changed, 52 insertions, 7 deletions

diff --git a/tools/qmake/config.tests/alsa/alsa.pro b/tools/qmake/config.tests/alsa/alsa.pro
new file mode 100644
index 000000000..7322b6fb8
--- /dev/null
+++ b/tools/qmake/config.tests/alsa/alsa.pro
@@ -0,0 +1,2 @@
+SOURCES = alsatest.cpp
+
diff --git a/tools/qmake/config.tests/alsa/alsatest.cpp b/tools/qmake/config.tests/alsa/alsatest.cpp
new file mode 100644
index 000000000..ea511cd21
--- /dev/null
+++ b/tools/qmake/config.tests/alsa/alsatest.cpp
@@ -0,0 +1,37 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <alsa/asoundlib.h>
+#if SND_LIB_VERSION < 0x1000a  // 1.0.10
+#error "Alsa version found too old, require >= 1.0.10"
+#endif
+
+int main(int argc,char **argv)
+{
+}
+
diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf
index bb4c56cae..43a5f2757 100644
--- a/tools/qmake/mkspecs/features/configure.prf
+++ b/tools/qmake/mkspecs/features/configure.prf
@@ -20,13 +20,20 @@ defineTest(runConfigure) {
         qtCompileTest($$test)
     }
 
+    isQtMinimum(5, 8) {
+        include($$QTWEBENGINE_OUT_ROOT/qtwebengine-config.pri)
+        QT_FOR_CONFIG += webengine-private
+        qtConfig(proprietary-codecs): WEBENGINE_CONFIG += use_proprietary_codecs
+        qtConfig(spellchecker): WEBENGINE_CONFIG += use_spellchecker
+    }
+
     linux {
         QT_FOR_CONFIG += gui-private
         !config_khr:skipBuild("khronos development headers appear to be missing (mesa/libegl1-mesa-dev)")
 
         REQUIRED_PACKAGES = dbus-1 fontconfig
         !cross_compile: qtConfig(xcb): REQUIRED_PACKAGES += libdrm xcomposite xcursor xi xrandr xscrnsaver xtst
-        contains(QT_CONFIG, pulseaudio): REQUIRED_PACKAGES += libpulse
+        qtConfig(pulseaudio): REQUIRED_PACKAGES += libpulse
         qtConfig(system-png): REQUIRED_PACKAGES += libpng
         qtConfig(system-harfbuzz) {
              packagesExist("\'harfbuzz >= 1.2.0\'"): WEBENGINE_CONFIG += use_system_harfbuzz
@@ -81,12 +88,6 @@ defineTest(runConfigure) {
     !cross_compile {
         WEBENGINE_CONFIG += enable_pdf
     }
-    isQtMinimum(5, 8) {
-        include($$QTWEBENGINE_OUT_ROOT/qtwebengine-config.pri)
-        QT_FOR_CONFIG += webengine-private
-        qtConfig(proprietary-codecs): WEBENGINE_CONFIG += use_proprietary_codecs
-        qtConfig(spellchecker): WEBENGINE_CONFIG += use_spellchecker
-    }
 
     isEmpty(skipBuildReason): {
         cache(CONFIG, add, $$list(webengine_successfully_configured))
diff --git a/tools/scripts/take_snapshot.py b/tools/scripts/take_snapshot.py
index 7f52ec476..78b8066ca 100755
--- a/tools/scripts/take_snapshot.py
+++ b/tools/scripts/take_snapshot.py
@@ -184,12 +184,14 @@ def isInChromiumBlacklist(file_path):
         or file_path.startswith('third_party/instrumented_libraries')
         or file_path.startswith('third_party/jsr-305/src')
         or file_path.startswith('third_party/junit')
+        or file_path.startswith('third_party/lcov')
         or file_path.startswith('third_party/libphonenumber')
         or file_path.startswith('third_party/libaddressinput/src/testdata')
         or file_path.startswith('third_party/libaddressinput/src/common/src/test')
         or file_path.startswith('third_party/libc++')
         or file_path.startswith('third_party/liblouis')
         or file_path.startswith('third_party/lighttpd')
+        or file_path.startswith('third_party/logilab')
         or file_path.startswith('third_party/markdown')
         or file_path.startswith('third_party/mingw-w64')
         or file_path.startswith('third_party/nacl_sdk_binaries')
@@ -201,8 +203,11 @@ def isInChromiumBlacklist(file_path):
         or file_path.startswith('third_party/pefile')
         or file_path.startswith('third_party/perl')
         or file_path.startswith('third_party/psyco_win32')
+        or file_path.startswith('third_party/pylint')
         or file_path.startswith('third_party/scons-2.0.1')
         or file_path.startswith('third_party/sfntly/src/cpp/data/fonts')
+        or file_path.startswith('third_party/speech-dispatcher')
+        or file_path.startswith('third_party/talloc')
         or file_path.startswith('third_party/trace-viewer')
         or file_path.startswith('third_party/undoview')
         or file_path.startswith('third_party/webgl')